Changeset: 6a974c82bc0c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a974c82bc0c Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/mal/Tests/tst275.stable.out Branch: profiler Log Message:
Approvals. diffs (205 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -31415,7 +31415,7 @@ command bbp.getName(b:bat[:oid,:any_1]): address CMDbbpName; comment Map a BAT into its internal name -command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],ht:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) +command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) address CMDbbp; comment bpp @@ -39913,6 +39913,12 @@ pattern optimizer.prelude():void address optimizer_prelude; comment Initialize the optimizer +pattern optimizer.profiler(mod:str,fcn:str):str +address OPTwrapper; +comment Collect properties for the profiler + +pattern optimizer.profiler():str +address OPTwrapper; pattern optimizer.querylog(mod:str,fcn:str):str address OPTwrapper; comment Collect SQL query statistics @@ -40024,16 +40030,12 @@ address CMDcpustats; comment Extract cpu statistics from the kernel command profiler.cleanup():void -address CMDcleanup; +address CMDcleanupTraces; comment Remove the temporary tables for profiling -command profiler.closeStream():void +command profiler.closestream():void address CMDcloseProfilerStream; -comment Stop sending the event records - -command profiler.dumpTrace():void -address CMDdumpTrace; -comment List the events collected +comment Stop offline proviling command profiler.getSystemTime():lng address CMDgetSystemTime; @@ -40059,37 +40061,25 @@ command profiler.noop():void address CMDnoopProfiler; comment Fetch any pending performance events -pattern profiler.openStream(host:str,port:int):void -address CMDsetProfilerStream; -comment Send the log events to a stream - -pattern profiler.openStream(fnme:str):void -address CMDsetProfilerFile; -comment Send the log events to a file, stdout or console - -pattern profiler.openStream():void +pattern profiler.openstream(mode:int):void address CMDopenProfilerStream; -comment Send the events to output stream - -command profiler.reset():void -address CMDclearTrace; -comment Clear the profiler traces - -command profiler.setHeartbeat(b:int):void +comment Start profiling the events, sent to output stream + +command profiler.setheartbeat(b:int):void address CMDsetHeartbeat; comment Set heart beat performance tracing +pattern profiler.setpoolsize(pool:int):void +address CMDsetProfilerPoolSize; +comment Re-initialize the profiler pool + pattern profiler.stop():void address CMDstopProfiler; -comment Stop performance tracing - -pattern profiler.stethoscope(b:int):void -address CMDstethoscope; -comment Start stethoscope profiling with heart beat - -pattern profiler.tomograph(b:int):void -address CMDtomograph; -comment Start tomograph profiler with heart beat +comment Stop offline performance profiling + +pattern profiler.start():void +address CMDstartProfiler; +comment Start offline performance profiling pattern querylog.call(tick1:timestamp,tick2:timestamp,arg:str,tuples:wrd,xtime:lng,rtime:lng,cpu:int,iowait:int):void address QLOGcall; diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -40460,7 +40460,7 @@ command bbp.getName(b:bat[:oid,:any_1]): address CMDbbpName; comment Map a BAT into its internal name -command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],ht:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) +command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) address CMDbbp; comment bpp @@ -50844,6 +50844,12 @@ pattern optimizer.prelude():void address optimizer_prelude; comment Initialize the optimizer +pattern optimizer.profiler(mod:str,fcn:str):str +address OPTwrapper; +comment Collect properties for the profiler + +pattern optimizer.profiler():str +address OPTwrapper; pattern optimizer.querylog(mod:str,fcn:str):str address OPTwrapper; comment Collect SQL query statistics @@ -50955,16 +50961,12 @@ address CMDcpustats; comment Extract cpu statistics from the kernel command profiler.cleanup():void -address CMDcleanup; +address CMDcleanupTraces; comment Remove the temporary tables for profiling -command profiler.closeStream():void +command profiler.closestream():void address CMDcloseProfilerStream; -comment Stop sending the event records - -command profiler.dumpTrace():void -address CMDdumpTrace; -comment List the events collected +comment Stop offline proviling command profiler.getSystemTime():lng address CMDgetSystemTime; @@ -50990,37 +50992,25 @@ command profiler.noop():void address CMDnoopProfiler; comment Fetch any pending performance events -pattern profiler.openStream(host:str,port:int):void -address CMDsetProfilerStream; -comment Send the log events to a stream - -pattern profiler.openStream(fnme:str):void -address CMDsetProfilerFile; -comment Send the log events to a file, stdout or console - -pattern profiler.openStream():void +pattern profiler.openstream(mode:int):void address CMDopenProfilerStream; -comment Send the events to output stream - -command profiler.reset():void -address CMDclearTrace; -comment Clear the profiler traces - -command profiler.setHeartbeat(b:int):void +comment Start profiling the events, sent to output stream + +command profiler.setheartbeat(b:int):void address CMDsetHeartbeat; comment Set heart beat performance tracing +pattern profiler.setpoolsize(pool:int):void +address CMDsetProfilerPoolSize; +comment Re-initialize the profiler pool + pattern profiler.stop():void address CMDstopProfiler; -comment Stop performance tracing - -pattern profiler.stethoscope(b:int):void -address CMDstethoscope; -comment Start stethoscope profiling with heart beat - -pattern profiler.tomograph(b:int):void -address CMDtomograph; -comment Start tomograph profiler with heart beat +comment Stop offline performance profiling + +pattern profiler.start():void +address CMDstartProfiler; +comment Start offline performance profiling pattern querylog.call(tick1:timestamp,tick2:timestamp,arg:str,tuples:wrd,xtime:lng,rtime:lng,cpu:int,iowait:int):void address QLOGcall; diff --git a/monetdb5/mal/Tests/tst275.stable.out b/monetdb5/mal/Tests/tst275.stable.out --- a/monetdb5/mal/Tests/tst275.stable.out +++ b/monetdb5/mal/Tests/tst275.stable.out @@ -48,9 +48,6 @@ function user.main():void; profiler.stop(); end user.main; #~BeginVariableOutput~# -#-------------------------------------------------# -# h t t # name -# oid str str # type #--------------------------# # t t t # name # void str str # type _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list