Changeset: 3ad44f0591f4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3ad44f0591f4
Modified Files:
monetdb5/mal/mal.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_runtime.c
Branch: sql_profiler
Log Message:
Get rid of HIGHWATERMARK related logic.
diffs (55 lines):
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -158,7 +158,6 @@ typedef struct {
/* inline statistics */
lng clock; /* when the last call
was started */
lng ticks; /* total micro seconds
spent in last call */
- int calls; /* number of calls made
to this instruction */
lng totticks; /* total time spent on this
instruction. */
lng wbytes; /* number of bytes
produced in last instruction */
/* the core admin */
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -38,12 +38,7 @@ static const char *myname = 0; // avoid
* each key:value pair or as a single line.
* The current stethoscope implementation requires the first option and
* also the term rendering to be set to ''
- *
- * When the MAL block contains a BARRIER block we may end up with tons
- * of profiler events. To avoid this, we stop emitting the events
- * when we reached the HIGHWATERMARK. Leaving a message in the log.
*/
-#define HIGHWATERMARK 5
int malProfileMode = 0; /* global flag to indicate profiling mode */
static oid malprofileruser; /* keep track on who has claimed the channel */
@@ -240,16 +235,6 @@ prepareMalEvent(Client cntxt, MalBlkPtr
bool ok;
const char *algo = MT_thread_getalgorithm();
- /* ignore generation of events for instructions that are called too
often
- * they may appear when BARRIER blocks are executed
- * The default parameter should be sufficient for most practical cases.
- */
- if( pci->calls > HIGHWATERMARK){
- if( pci->calls == 10000 || pci->calls == 100000 || pci->calls
== 1000000 || pci->calls == 10000000)
- TRC_WARNING(MAL_SERVER, "Too many calls: %d\n",
pci->calls);
- return NULL;
- }
-
/* The stream of events can be complete read by the DBA,
* all other users can only see events assigned to their account
*/
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -414,7 +414,6 @@ runtimeProfileExit(Client cntxt, MalBlkP
pci->clock = ticks;
pci->ticks = ticks - prof->ticks;
pci->totticks += pci->ticks;
- pci->calls++;
if(malProfileMode > 0 )
profilerEvent((struct MalEvent) {cntxt, mb, stk, pci},
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
