Changeset: fe087f7aebed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe087f7aebed
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/mal/clients.c
Branch: default
Log Message:
Remove old performance timers
diffs (146 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -233,7 +233,6 @@ MCinitClientRecord(Client c, oid user, b
c->itrace = 0;
c->debugOptimizer = c->debugScheduler = 0;
c->flags = MCdefault;
- c->timer = 0;
c->memory = 0;
c->errbuf = 0;
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -90,7 +90,6 @@ typedef struct CLIENT {
* usage patterns.
*/
sht flags; /* resource tracing flags */
- lng timer; /* trace time in usec */
lng memory; /* memory claimed for keeping BATs */
BUN cnt; /* bat count */
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -382,8 +382,6 @@ runFactory(Client cntxt, MalBlkPtr mb, M
pl->stk->stkbot= mb->vtop; /* stack already initialized */
msg = runMAL(cntxt, mb, 0, pl->stk);
} else {
- if( cmd && cntxt->timer == 0)
- mdbStep(cntxt,mb,pl->stk,pl->pc);
msg = reenterMAL(cntxt, mb, pl->pc, -1, pl->stk);
}
/* propagate change in debugging status */
@@ -457,8 +455,6 @@ callFactory(Client cntxt, MalBlkPtr mb,
if( lhs->vtype == TYPE_bat )
BBPincref(lhs->val.bval, TRUE);
}
- if( flag && cntxt->timer == 0)
- mdbStep(cntxt,mb,pl->stk,pl->pc);
ret= reenterMAL(cntxt, mb, pl->pc, -1, pl->stk);
/* garbage collect the string arguments, these positions
will simply be overwritten the next time.
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -495,7 +495,6 @@ str runMALsequence(Client cntxt, MalBlkP
ValRecord backups[16];
ValPtr backup;
int garbages[16], *garbage;
- lng oldtimer = 0;
int stkpc = 0;
//MT_Lock *lock = NULL;
//int tid = 0;
@@ -526,8 +525,6 @@ str runMALsequence(Client cntxt, MalBlkP
while (stkpc < mb->stop && stkpc != stoppc) {
pci = getInstrPtr(mb, stkpc);
if (cntxt->itrace || mb->trap || stk->status) {
- lng t = 0;
-
if (stk->status == 'p'){
// execution is paused
while ( stk->status == 'p')
@@ -539,19 +536,12 @@ str runMALsequence(Client cntxt, MalBlkP
if (stk->cmd == 0)
stk->cmd = cntxt->itrace;
- if (oldtimer)
- t = GDKusec();
mdbStep(cntxt, mb, stk, stkpc);
if (stk->cmd == 'x' || cntxt->mode == FINISHING) {
stk->cmd = 0;
stkpc = mb->stop;
continue;
}
- if (oldtimer) {
- /* ignore debugger waiting time*/
- t = GDKusec() - t;
- oldtimer += t;
- }
}
runtimeProfileBegin(cntxt, mb, stk, stkpc, &runtimeProfile, 1);
@@ -647,22 +637,13 @@ str runMALsequence(Client cntxt, MalBlkP
else {
/* show call before entering the
factory */
if (cntxt->itrace || mb->trap) {
- lng t = 0;
-
if (stk->cmd == 0)
stk->cmd =
cntxt->itrace;
- if (oldtimer)
- t = GDKusec();
mdbStep(cntxt, pci->blk, stk,
0);
if (stk->cmd == 'x' ||
cntxt->mode == FINISHING) {
stk->cmd = 0;
stkpc = mb->stop;
}
- if (oldtimer) {
- /* ignore debugger
waiting time*/
- t = GDKusec() - t;
- oldtimer += t;
- }
}
ret = runFactory(cntxt, pci->blk, mb,
stk, pci);
}
@@ -718,8 +699,6 @@ str runMALsequence(Client cntxt, MalBlkP
case ENDsymbol:
if (getInstrPtr(mb, 0)->token == FACTORYsymbol)
ret = shutdownFactory(cntxt, mb);
- if (oldtimer)
- cntxt->timer = oldtimer;
runtimeProfileExit(cntxt, mb, stk, pci,
&runtimeProfile);
runtimeProfileFinish(cntxt, mb,
&runtimeProfile);
runtimeProfileExit(cntxt, mb, stk,
getInstrPtr(mb,0), &runtimeProfileFunction);
@@ -1114,8 +1093,6 @@ str runMALsequence(Client cntxt, MalBlkP
"Exception raised");
break;
case YIELDsymbol: /* to be defined */
- if (oldtimer)
- cntxt->timer = oldtimer;
if ( backup != backups) GDKfree(backup);
if ( garbage != garbages) GDKfree(garbage);
return yieldFactory(mb, pci, stkpc);
@@ -1140,8 +1117,6 @@ str runMALsequence(Client cntxt, MalBlkP
if (garbageControl(getInstrPtr(mb, 0)))
garbageCollector(cntxt, mb,
stk, TRUE);
/* reset the clock */
- if (oldtimer)
- cntxt->timer = oldtimer;
runtimeProfileExit(cntxt, mb, stk, pp,
&runtimeProfile);
runtimeProfileFinish(cntxt, mb,
&runtimeProfile);
runtimeProfileExit(cntxt, mb, stk,
getInstrPtr(mb,0), &runtimeProfileFunction);
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -159,9 +159,6 @@ CLTInfo(Client cntxt, MalBlkPtr mb, MalS
BUNappend(b, "scenario", FALSE);
BUNappend(bn, cntxt->scenario, FALSE);
- BUNappend(b, "timer", FALSE);
- BUNappend(bn, local_itoa((int) cntxt->timer), FALSE);
-
BUNappend(b, "trace", FALSE);
BUNappend(bn, local_itoa(cntxt->itrace), FALSE);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
