MonetDB: Jun2010 - add some more locks to secure startup of prof...

[Niels Nes]

Changeset: 2aef3c300042 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2aef3c300042
Modified Files:
        MonetDB5/src/mal/mal_profiler.mx
Branch: Jun2010
Log Message:

add some more locks to secure startup of profiler


diffs (35 lines):

diff -r 17210e4eb794 -r 2aef3c300042 MonetDB5/src/mal/mal_profiler.mx
--- a/MonetDB5/src/mal/mal_profiler.mx  Fri Aug 13 00:50:57 2010 +0200
+++ b/MonetDB5/src/mal/mal_profiler.mx  Fri Aug 13 14:01:50 2010 +0200
@@ -997,6 +997,7 @@
        t = BATnew(TYPE_str, TYPE_bat, 9);
        if (t == NULL)
                return NULL;
+       mal_set_lock(mal_profileLock, "profileLock");
        BUNins(t, "event", &TRACE_id_event->batCacheid, FALSE);
        BUNins(t, "clk", &TRACE_id_time->batCacheid, FALSE);
        BUNins(t, "pc", &TRACE_id_pc->batCacheid, FALSE);
@@ -1009,6 +1010,7 @@
        BUNins(t, "wbytes", &TRACE_id_wbytes->batCacheid, FALSE);
        BUNins(t, "type", &TRACE_id_type->batCacheid, FALSE);
        BUNins(t, "stmt", &TRACE_id_stmt->batCacheid, FALSE);
+       mal_unset_lock(mal_profileLock, "profileLock");
        return t;
 }
 
@@ -1045,6 +1047,7 @@
 {
        if (TRACE_init)
                return 0;       /* already initialized */
+       mal_set_lock(mal_profileLock, "profileLock");
        TRACE_id_event = TRACEcreate("id", "event", TYPE_int);
        TRACE_id_time = TRACEcreate("id", "time", TYPE_str);
        TRACE_id_ticks = TRACEcreate("id", "ticks", TYPE_lng);
@@ -1073,6 +1076,7 @@
                cleanupProfiler();
        else
                TRACE_init = 1;
+       mal_unset_lock(mal_profileLock, "profileLock");
        return TRACE_init ? 0 : -1;
 }
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list