Changeset: 24da9e9049b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24da9e9049b2
Modified Files:
gdk/gdk_system.c
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/misc/msabaoth.c
monetdb5/modules/mal/tablet_si.mx
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/sensor.c
Branch: Aug2011
Log Message:
Use LLFMT to print lng.
diffs (232 lines):
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -132,7 +132,7 @@
int idx = MT_locktrace_hash(MT_locktrace_nme[i]);
if (my_cnt[idx])
- printf("%s %llu\n", MT_locktrace_nme[i],
my_cnt[idx]);
+ printf("%s " ULLFMT "\n", MT_locktrace_nme[i],
my_cnt[idx]);
my_cnt[idx] = 0;
}
MT_locktrace = 0;
diff --git a/monetdb5/extras/crackers/crackers_joins.mx
b/monetdb5/extras/crackers/crackers_joins.mx
--- a/monetdb5/extras/crackers/crackers_joins.mx
+++ b/monetdb5/extras/crackers/crackers_joins.mx
@@ -502,7 +502,7 @@
TJtotal+=CRKjoin(BATmirror(res), BATmirror(markedViewRight),
markedViewLeft);
}
/*
-printf("Join %lld, Cost %lld, Left "OIDFMT" Right "OIDFMT"\n",joinsDone,
TJtotal-temp, curPosLeft - prevPosLeft +1, curPosRight - prevPosRight +1);
+printf("Join " LLFMT ", Cost " LLFMT ", Left "OIDFMT" Right
"OIDFMT"\n",joinsDone, TJtotal-temp, curPosLeft - prevPosLeft +1, curPosRight -
prevPosRight +1);
*/
BBPunfix(markedViewRight->batCacheid);
BBPunfix(markedViewLeft->batCacheid);
@@ -851,7 +851,7 @@
BBPunfix(markedViewLeft->batCacheid);
}
#ifdef DEBUG_CRACKERS_JOIN
- printf("Join %lld, Cost %lld, Left "OIDFMT" Right "OIDFMT" ReuseHash:
%d \n",joinsDone, TJtotal-temp, curPosLeft - prevPosLeft +1, curPosRight -
prevPosRight +1, (existsHashTableLeft == FALSE && existsHashTableRight ==
TRUE)?1:0);
+ printf("Join " LLFMT ", Cost " LLFMT ", Left "OIDFMT" Right "OIDFMT"
ReuseHash: %d \n",joinsDone, TJtotal-temp, curPosLeft - prevPosLeft +1,
curPosRight - prevPosRight +1, (existsHashTableLeft == FALSE &&
existsHashTableRight == TRUE)?1:0);
printf("\n Res \n");
BATprint(res);
@:dumpIndex(Index Left)@
@@ -2058,7 +2058,7 @@
T2=GDKusec();
- printf("Total %lld Join %lld Rest %lld Joins %lld Crack %lld Pieces
%lld \n",
+ printf("Total " LLFMT " Join " LLFMT " Rest " LLFMT " Joins " LLFMT "
Crack " LLFMT " Pieces " LLFMT " \n",
T2-T1, TJtotal, ((T2-T1)-TJtotal)-TCtotal, joinsDone,
TCtotal, CrackerIndex[mapPosLeft].pieces + CrackerIndex[mapPosRight].pieces );
printf("result is "BUNFMT" \n", BATcount(res));
@
@@ -2193,7 +2193,7 @@
T2=GDKusec();
- printf("Total %lld Join %lld Rest %lld Joins %lld Crack %lld Pieces
%lld \n",
+ printf("Total " LLFMT " Join " LLFMT " Rest " LLFMT " Joins " LLFMT "
Crack " LLFMT " Pieces " LLFMT " \n",
T2-T1, TJtotal, ((T2-T1)-TJtotal)-TCtotal, joinsDone,
TCtotal, CrackerIndex[mapLpos].pieces + CrackerIndex[mapRpos].pieces );
return MAL_SUCCEED;
@@ -2311,8 +2311,8 @@
#ifdef DEBUG_CRACKERS_JOIN
printf(" leftVal %d rightVal %d \n", curValueLeft,
curValueRight);
- printf(" prevPosLeft %lld curPosLeft %lld \n",
prevPosLeft,curPosLeft);
- printf(" prevPosRight %lld curPosRight %lld \n",
prevPosRight,curPosRight);
+ printf(" prevPosLeft " LLFMT " curPosLeft " LLFMT " \n",
prevPosLeft,curPosLeft);
+ printf(" prevPosRight " LLFMT " curPosRight " LLFMT " \n",
prevPosRight,curPosRight);
#endif
if (curValueLeft < curValueRight ||
@@ -2399,8 +2399,8 @@
#ifdef DEBUG_CRACKERS_JOIN
printf(" leftVal %d rightVal %d \n", curValueLeft,
curValueRight);
- printf(" prevPosLeft %lld curPosLeft %lld \n",
prevPosLeft,curPosLeft);
- printf(" prevPosRight %lld curPosRight %lld \n",
prevPosRight,curPosRight);
+ printf(" prevPosLeft " LLFMT " curPosLeft " LLFMT " \n",
prevPosLeft,curPosLeft);
+ printf(" prevPosRight " LLFMT " curPosRight " LLFMT " \n",
prevPosRight,curPosRight);
#endif
if (curNodeLeft != NULL && curNodeRight == NULL){
@@ -2486,7 +2486,7 @@
T2=GDKusec();
- printf("Total %lld Join %lld Rest %lld Joins %lld Crack %lld Pieces
%lld \n",
+ printf("Total " LLFMT " Join " LLFMT " Rest " LLFMT " Joins " LLFMT "
Crack " LLFMT " Pieces " LLFMT " \n",
T2-T1, TJtotal, ((T2-T1)-TJtotal)-TCtotal, joinsDone,
TCtotal, CrackerIndex[mapLpos].pieces + CrackerIndex[mapRpos].pieces );
return MAL_SUCCEED;
@@ -2868,7 +2868,7 @@
T2=GDKusec();
- printf("Total %lld Join %lld Rest %lld Joins %lld Crack %lld Pieces
%lld \n",
+ printf("Total " LLFMT " Join " LLFMT " Rest " LLFMT " Joins " LLFMT "
Crack " LLFMT " Pieces " LLFMT " \n",
T2-T1, TJtotal, ((T2-T1)-TJtotal)-TCtotal, joinsDone,
TCtotal, CrackerIndex[mapLpos].pieces + CrackerIndex[mapRpos].pieces );
return MAL_SUCCEED;
@@ -3266,7 +3266,7 @@
T2=GDKusec();
- printf("Total %lld Join %lld Rest %lld Joins %lld Crack %lld Pieces
%lld \n",
+ printf("Total " LLFMT " Join " LLFMT " Rest " LLFMT " Joins " LLFMT "
Crack " LLFMT " Pieces " LLFMT " \n",
T2-T1, TJtotal, ((T2-T1)-TJtotal)-TCtotal, joinsDone,
TCtotal, CrackerIndex[mapLpos].pieces + CrackerIndex[mapRpos].pieces );
return MAL_SUCCEED;
@@ -3366,7 +3366,7 @@
(void) existsHashTableLeft;
(void) existsHashTableRight;
- printf("Sort time %lld \n",Tsort);
+ printf("Sort time " LLFMT " \n",Tsort);
return MAL_SUCCEED;
}
@@ -3917,7 +3917,7 @@
#ifdef TIMER_CRACKERS_JOIN
T2=GDKusec();
- printf("Total %lld Join %lld Rest %lld Joins %lld Crack %lld Pieces
%lld \n",
+ printf("Total " LLFMT " Join " LLFMT " Rest " LLFMT " Joins " LLFMT "
Crack " LLFMT " Pieces " LLFMT " \n",
T2-T1, TJtotal, ((T2-T1)-TJtotal)-TCtotal, joinsDone,
TCtotal, CrackerIndex[mapLpos].pieces + CrackerIndex[mapRpos].pieces );
#endif
diff --git a/monetdb5/extras/crackers/crackers_sortmerge.mx
b/monetdb5/extras/crackers/crackers_sortmerge.mx
--- a/monetdb5/extras/crackers/crackers_sortmerge.mx
+++ b/monetdb5/extras/crackers/crackers_sortmerge.mx
@@ -968,11 +968,11 @@
base = BUNfirst(c);
t1=GDKusec();
@:FullMerge(@1,@2,@3,@4)@
- printf("\n Merging %lld \n",GDKusec()-t1);
- printf("\n Slicing %lld \n",timeSlice);
- printf("\n Copying %lld \n",timeCopy);
- printf("\n Headmake %lld \n",timeHead);
- printf("\n Ordering %lld \n",timeSort);
+ printf("\n Merging " LLFMT " \n",GDKusec()-t1);
+ printf("\n Slicing " LLFMT " \n",timeSlice);
+ printf("\n Copying " LLFMT " \n",timeCopy);
+ printf("\n Headmake " LLFMT " \n",timeHead);
+ printf("\n Ordering " LLFMT " \n",timeSort);
goto done;
}
@@ -1211,8 +1211,8 @@
}
}
- printf("MergeTime %lld \n",MergeTime);
- printf(" pqTime %lld \n",pqTime);
+ printf("MergeTime " LLFMT " \n",MergeTime);
+ printf(" pqTime " LLFMT " \n",pqTime);
/*printf("Live slices are "OIDFMT" \n",i);*/
BBPunfix(br->batCacheid);
@@ -1431,7 +1431,7 @@
totalTuples=BATcount(br);
BBPunfix(bo->batCacheid);
- printf("sorting phase %lld \n",GDKusec()-timeStart);
+ printf("sorting phase " LLFMT " \n",GDKusec()-timeStart);
@:MergeExtSort(@1,@2,@3,@4)@
diff --git a/monetdb5/misc/msabaoth.c b/monetdb5/misc/msabaoth.c
--- a/monetdb5/misc/msabaoth.c
+++ b/monetdb5/misc/msabaoth.c
@@ -799,8 +799,8 @@
snprintf(buf, sizeof(buf), "sabdb:" SABDBVER ":"
"%s,%d,%d,%s,%s" ","
"%d,%d,%d,"
- "%lld,%lld,%lld,"
- "%lld,%lld,"
+ "" LLFMT "," LLFMT "," LLFMT ","
+ "" LLFMT "," LLFMT ","
"%d,%f,%f",
db->path, db->locked, (int)(db->state), scens, conns,
dbu.startcntr, dbu.stopcntr, dbu.crashcntr,
diff --git a/monetdb5/modules/mal/tablet_si.mx
b/monetdb5/modules/mal/tablet_si.mx
--- a/monetdb5/modules/mal/tablet_si.mx
+++ b/monetdb5/modules/mal/tablet_si.mx
@@ -1559,7 +1559,7 @@
/* restore system setting */
GDK_vm_trim = vmtrim;
- printf("Total Load Time: %lld \n",GDKusec()-startTime);
+ printf("Total Load Time: " LLFMT " \n",GDKusec()-startTime);
return res < 0 ? BUN_NONE : cnt;
}
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -293,7 +293,7 @@
for ( bskt = 0; bskt < bsktLimit; bskt++)
if ( baskets[bskt].name){
- mnstr_printf(GDKout, "#baskets[%2d] %s columns %d threshold %d
window=[%d,%d] time window=[%lld,%lld] beat %lld milliseconds events " BUNFMT
"\n",
+ mnstr_printf(GDKout, "#baskets[%2d] %s columns %d threshold %d
window=[%d,%d] time window=[" LLFMT "," LLFMT "] beat " LLFMT " milliseconds
events " BUNFMT "\n",
bskt,
baskets[bskt].name,
baskets[bskt].colcount,
diff --git a/sql/backends/monet5/datacell/opt_datacell.c
b/sql/backends/monet5/datacell/opt_datacell.c
--- a/sql/backends/monet5/datacell/opt_datacell.c
+++ b/sql/backends/monet5/datacell/opt_datacell.c
@@ -300,7 +300,7 @@
printFunction(cntxt->fdout, mb, 0, LIST_MAL_STMT | LIST_MAPI);
}
DEBUGoptimizers
- mnstr_printf(cntxt->fdout, "#opt_reduce: %lld ms\n", t);
+ mnstr_printf(cntxt->fdout, "#opt_reduce: " LLFMT " ms\n", t);
QOTupdateStatistics("datacell", actions, t);
addtoMalBlkHistory(mb, "datacell");
return msg;
diff --git a/sql/backends/monet5/datacell/petrinet.c
b/sql/backends/monet5/datacell/petrinet.c
--- a/sql/backends/monet5/datacell/petrinet.c
+++ b/sql/backends/monet5/datacell/petrinet.c
@@ -260,7 +260,7 @@
int i, k;
mnstr_printf(PNout,"#scheduler status %s\n", statusnames[status]);
for (i = 0; i < pnettop; i++) {
- mnstr_printf(PNout, "#[%d]\t%s %s delay %d cycles %d events %d
time %lld ms\n",
+ mnstr_printf(PNout, "#[%d]\t%s %s delay %d cycles %d events %d
time " LLFMT " ms\n",
i, pnet[i].name, statusnames[pnet[i].status],
pnet[i].delay, pnet[i].cycles, pnet[i].events, pnet[i].time/1000);
if ( pnet[i].error)
mnstr_printf(PNout,"#%s\n", pnet[i].error);
diff --git a/sql/backends/monet5/datacell/sensor.c
b/sql/backends/monet5/datacell/sensor.c
--- a/sql/backends/monet5/datacell/sensor.c
+++ b/sql/backends/monet5/datacell/sensor.c
@@ -516,7 +516,7 @@
if (timestamp) {
currenttsmp = GDKusec();
- snprintf(tuple + tlen, maxtuple - tlen,
"%s%lld", (autoincrement?separator[protocol]:""), currenttsmp);
+ snprintf(tuple + tlen, maxtuple - tlen, "%s"
LLFMT "", (autoincrement?separator[protocol]:""), currenttsmp);
tlen += (int)strlen(tuple + tlen);
if (tlen >= maxtuple) {
mnstr_printf(SEout, "Buffer not large
enough to handle request.\n");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
