Changeset: fe0b9f9c28d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe0b9f9c28d3
Modified Files:
monetdb5/scheduler/Tests/query00.mal
monetdb5/scheduler/run_multicore.c
Branch: mutation
Log Message:
Minor fixes.
diffs (78 lines):
diff --git a/monetdb5/scheduler/Tests/query00.mal
b/monetdb5/scheduler/Tests/query00.mal
--- a/monetdb5/scheduler/Tests/query00.mal
+++ b/monetdb5/scheduler/Tests/query00.mal
@@ -1,16 +1,9 @@
-# example framework for a mutation based execution stack
+# example framework for a multicore based execution stack
# illustrate how it would appear after an optimizer call.
function initialize{unsafe}():bat[:oid,:lng];
b:= bat.new(:oid,:lng);
- INT_MAX := 2147483647;
- dbgmsk_restore := mdb.getDebug();
- dbgmsk_unset := 8+8388608;
- dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
- dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
- mdb.setDebug(dbgmsk_set);
-
r:= mmath.srand(0);
barrier i:= 0:lng;
k:= mmath.rand();
@@ -18,7 +11,6 @@ function initialize{unsafe}():bat[:oid,:
bat.append(b,l);
redo i:= iterator.next(1:lng,1000000:lng);
exit i;
- mdb.setDebug(dbgmsk_restore);
return b;
end initialize;
@@ -35,10 +27,18 @@ exit z;
io.printf("#%d\n",t2);
end query;
-b:= initialize();
-optimizer.mutation("user","query");
-user.query(b);
-user.query(b);
-user.query(b);
-user.query(b);
-user.query(b);
+optimizer.multicore("user","query");
+function testrun();
+ b:= initialize();
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+ user.query(b);
+end testrun;
+testrun();
diff --git a/monetdb5/scheduler/run_multicore.c
b/monetdb5/scheduler/run_multicore.c
--- a/monetdb5/scheduler/run_multicore.c
+++ b/monetdb5/scheduler/run_multicore.c
@@ -35,7 +35,7 @@
void
multicorePrint(Client cntxt, Mutant m)
{
- mnstr_printf(cntxt->fdout,"#mutant: %s %d calls %d runtime" LLFMT"\n",
m->comment,m->target, m->calls, m->runtime);
+ mnstr_printf(cntxt->fdout,"#mutant: %s %d \n", m->comment,m->target);
if ( m->next)
multicorePrint(cntxt, m->next);
}
@@ -50,8 +50,9 @@ RUNmulticore(Client cntxt, MalBlkPtr mb,
(void) cntxt;
+ mnstr_printf(cntxt->fdout,"#RUNmulticore calls %d \n", mb->calls);
// if called the first time, just execute the call
- if ( mb->calls == 0 || mb->runtime == 0){
+ if ( mb->calls == 0 ){
initProfiler(mb);
setFilterAll();
mutant = (Mutant) GDKzalloc(sizeof(struct MUTANT));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
