MonetDB: default - Keep heartbeat thread running

[Martin Kersten]

Changeset: dbf64543b01e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbf64543b01e
Modified Files:
        monetdb5/mal/mal_profiler.c
Branch: default
Log Message:

Keep heartbeat thread running


diffs (32 lines):

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
@@ -1314,7 +1314,7 @@ static void profilerHeartbeat(void *dumm
        gettimeofday(&tv,NULL);
        prevclock = (time_t) tv.tv_sec;
 
-       while (hbdelay && eventstream){
+       while (eventstream){
                MT_sleep_ms(hbdelay);
 
                if (delayswitch > 0) {
@@ -1426,6 +1426,7 @@ static void profilerHeartbeat(void *dumm
        }
        if ( proc)
                (void) fclose(proc);
+       hbdelay = 0;
        THRdel(thr);
 }
 
@@ -1434,6 +1435,11 @@ void startHeartbeat(int delay){
 
        if ( delay < 0 )
                return;
+       if ( hbdelay ) {
+               /* thread already running */    
+               hbdelay = delay;
+               return;
+       }
        hbdelay = delay;
        MT_create_thread(&p, profilerHeartbeat, (void *) 0, MT_THR_JOINABLE);
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list