Changeset: 5a3127ceb68b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a3127ceb68b Modified Files: clients/Tests/exports.stable.out Branch: default Log Message:
Approved after a8db8647c99e, 7fc299e39776, d2ffbb567850, b3ad7b2f063f, and 3bc00d3ae104. diffs (111 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1258,6 +1258,7 @@ str CMDbbptoStr(Client cntxt, MalBlkPtr str CMDbbptruncate(int *ret, int *bid, str *fnme); str CMDcalcavg(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcleanup(int *ret); str CMDclearEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1298,7 +1299,6 @@ str CMDgetDiskReads(lng *ret); str CMDgetDiskWrites(lng *ret); str CMDgetEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDgetFootprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDgetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDgetPageSize(int *ret); str CMDgetSystemTime(lng *ret); str CMDgetTrace(int *res, str *ev); @@ -1320,14 +1320,9 @@ str CMDsetAllProfiler(Client cntxt, MalB str CMDsetFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); str CMDsetFootprintFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDsetIOTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDsetMemoryFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDsetMemoryTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetNoneProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetProfilerFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDsetThreadTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDsetTimerTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetoid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDstartPointProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1603,16 +1598,9 @@ str MDBlist3(Client cntxt, MalBlkPtr mb, str MDBlist3Detail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBlistDetail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBlistMapi(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str MDBsetBigfoot(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MDBsetCatch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str MDBsetCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MDBsetDebug(int *ret, int *flg); str MDBsetDebugStr(int *ret, str *nme); -str MDBsetFlow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MDBsetIO(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MDBsetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MDBsetThread(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MDBsetTimer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBshowFlowGraph(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -2012,16 +2000,16 @@ sht PropertyIndex(str name); str PropertyName(sht idx); prop_op_t PropertyOperator(str s); str PropertyOperatorString(prop_op_t op); -str QLOGcall(int *ret, oid *idx, lng *tick1, lng *tick2, str *arg, wrd *tuples, lng *xtime, lng *rtime, int *cpu, int *iowait, lng *space); +str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void QLOGcalls(BAT **r); void QLOGcatalog(BAT **r); -str QLOGdefine(oid *ret, oid *idx, str *q, str *pipe, lng *optimize, str *usr, lng *tick, int *mal); -str QLOGdone(int *ret); -str QLOGinit(int *ret); -str QLOGinitThreshold(int *ret, int *threshold); +str QLOGdefine(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str QLOGdisable(int *ret); +str QLOGempty(int *ret); +str QLOGenable(int *ret); +str QLOGenableThreshold(int *ret, int *threshold); int QLOGisset(void); str QLOGissetFcn(int *ret); -str QLOGreset(int *ret); str QOTclrdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QOTdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QOTgetStatistics(int *ret, str *nme); @@ -2030,6 +2018,7 @@ str QOTshowFlowGraph(Client cntxt, MalBl str QOTshowPlan(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); void QOTstatisticsExit(void); void QOTupdateStatistics(str nme, int prop, lng val); +QueryQueue QRYqueue; str RECYCLEdumpQPatWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -2251,6 +2240,10 @@ str STRsubstring(str *ret, str *s, int * str STRsubstringTail(str *ret, str *s, int *start); str STRsuffix(str *ret, str *s, int *l); str STRtostr(str *res, str *src); +str SYSMONpause(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str SYSMONqueue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str SYSMONresume(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str SYSMONstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str SYScpuStatistics(int *ret, int *ret2); str SYSgdkEnv(int *ret, int *ret2); str SYSgdkThread(int *ret, int *ret2); @@ -2999,6 +2992,7 @@ str replicatorRef; void resetMalBlk(MalBlkPtr mb, int stop); void resetScenario(Client c); void resetVarName(MalBlkPtr mb, int i); +void resizeMalBlk(MalBlkPtr mb, int maxstmt, int maxvar); int resolveType(int dsttype, int srctype); str resultSetRef; int reusePolicy; @@ -3019,7 +3013,8 @@ str runScenario(Client c); int runonceProp; void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int stkpc, RuntimeProfile prof, int start); void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, RuntimeProfile prof); -void runtimeProfileInit(MalBlkPtr mb, RuntimeProfile prof, int initmemory); +void runtimeProfileFinish(Client cntxt, MalBlkPtr mb); +void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk); str safeguardStack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int safetyBarrier(InstrPtr p, InstrPtr q); int saveBox(Box box, int flag); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
