Changeset: 87fc27ff3ef1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87fc27ff3ef1
Modified Files:
clients/mapiclient/tomograph.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_pipes.c
Branch: Feb2013
Log Message:
Minor fixes
Tomograph rendering support
Incremental pack enabled as it improves sf100 and sf10(a little)
diffs (73 lines):
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -781,12 +781,12 @@ static void showcolormap(char *filename,
scale = "sec";
}
- fprintf(f, "set object %d rectangle from %d, %d to %d,
%d fillcolor rgb \"%s\" fillstyle solid 0.6\n",
- object++, (k % 3) * w, h - 40, (int)
((k % 3) * w + 0.15 * w), h - 5, colors[i].col);
+ fprintf(f, "set object %d rectangle from %f, %f to %f,
%f fillcolor rgb \"%s\" fillstyle solid 0.6\n",
+ object++, (double) (k % 3) * w,
(double) h - 40, (double) ((k % 3) * w + 0.15 * w), (double) h - 5,
colors[i].col);
fprintf(f, "set label %d \"%s.%s \" at %d,%d\n",
object++, colors[i].mod, colors[i].fcn,
(int) ((k % 3) * w + 0.2 * w), h - 15);
- fprintf(f, "set label %d \"%d calls %3.2f %s\" at
%d,%d\n",
- object++, colors[i].freq, tu, scale,
(int) ((k % 3) * w + 0.2 * w), h - 35);
+ fprintf(f, "set label %d \"%d calls %3.2f %s\" at
%f,%f\n",
+ object++, colors[i].freq, tu, scale,
(double) ((k % 3) * w + 0.2 * w), (double) h - 35);
if (k % 3 == 2)
h -= 45;
k++;
@@ -961,7 +961,7 @@ static void createTomogram(void)
fprintf(gnudata, "set rmarg 10\n");
fprintf(gnudata, "set size 1,0.4\n");
fprintf(gnudata, "set origin 0.0,0.4\n");
- fprintf(gnudata, "set xrange [%ld:%ld]\n", startrange, lastclktick -
starttime);
+ fprintf(gnudata, "set xrange [%f:%f]\n", (double) startrange, (double)
lastclktick - starttime);
/* detect all different threads and assign them a row */
for (i = 0; i < topbox; i++)
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -169,7 +169,7 @@ OPTdataflowImplementation(Client cntxt,
int i,j,k, var, cnt, start=1,entries=0, actions=0;
int flowblock= 0, dumbcopy=0;
InstrPtr *sink, *old, q;
- int limit, slimit, size, top = 0;
+ int limit, slimit, top = 0;
Lifespan span;
char *init;
int *usage;
@@ -197,7 +197,7 @@ OPTdataflowImplementation(Client cntxt,
GDKfree(init);
return 0;
}
- sink= (InstrPtr*) GDKzalloc(size = mb->vsize * sizeof(InstrPtr));
+ sink= (InstrPtr*) GDKzalloc(mb->vsize * sizeof(InstrPtr));
if ( sink == NULL){
GDKfree(span);
GDKfree(init);
diff --git a/monetdb5/optimizer/opt_matpack.c b/monetdb5/optimizer/opt_matpack.c
--- a/monetdb5/optimizer/opt_matpack.c
+++ b/monetdb5/optimizer/opt_matpack.c
@@ -63,7 +63,5 @@ OPTmatpackImplementation(Client cntxt, M
pushInstruction(mb,p);
}
GDKfree(old);
- DEBUGoptimizers
- mnstr_printf(cntxt->fdout,"#opt_matpack: %d statements
marked\n", actions);
return actions;
}
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -79,7 +79,7 @@ struct PIPELINES {
"optimizer.reorder();"
"optimizer.deadcode();"
"optimizer.reduce();"
- //"optimizer.matpack();"
+ "optimizer.matpack();"
"optimizer.dataflow();"
"optimizer.history();"
"optimizer.multiplex();"
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
