MonetDB: default - Merge with Jun2016 branch.

[Sjoerd Mullender]

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

Merge with Jun2016 branch.


diffs (62 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
@@ -693,24 +693,16 @@ TRACEcreate(const char *hnme, const char
        char buf[BUFSIZ];
 
        snprintf(buf, BUFSIZ, "trace_%s_%s", hnme, tnme);
-       b = BATdescriptor(BBPindex(buf));
-       if (b) {
-               BBPincref(b->batCacheid, TRUE);
-               return b;
-       }
 
-       b = COLnew(0, tt, 1 << 16, PERSISTENT);
+       b = COLnew(0, tt, 1 << 16, TRANSIENT);
        if (b == NULL)
                return NULL;
-
-       BATmode(b, PERSISTENT);
        BBPrename(b->batCacheid, buf);
-       BATcommit(b);
        return b;
 }
 
 
-#define CLEANUPprofile(X)  if (X) { BBPdecref((X)->batCacheid, TRUE); 
(X)->batPersistence = TRANSIENT; } (X) = NULL;
+#define CLEANUPprofile(X)  if (X) { BBPunfix((X)->batCacheid); } (X) = NULL;
 
 static void
 _cleanupProfiler(void)
@@ -786,19 +778,7 @@ clearTrace(void)
                return;     /* not initialized */
        }
        /* drop all trace tables */
-       BBPclear(TRACE_id_event->batCacheid);
-       BBPclear(TRACE_id_time->batCacheid);
-       BBPclear(TRACE_id_pc->batCacheid);
-       BBPclear(TRACE_id_thread->batCacheid);
-       BBPclear(TRACE_id_ticks->batCacheid);
-       BBPclear(TRACE_id_rssMB->batCacheid);
-       BBPclear(TRACE_id_tmpspace->batCacheid);
-       BBPclear(TRACE_id_inblock->batCacheid);
-       BBPclear(TRACE_id_oublock->batCacheid);
-       BBPclear(TRACE_id_minflt->batCacheid);
-       BBPclear(TRACE_id_majflt->batCacheid);
-       BBPclear(TRACE_id_nvcsw->batCacheid);
-       BBPclear(TRACE_id_stmt->batCacheid);
+       _cleanupProfiler();
        TRACE_init = 0;
        MT_lock_unset(&mal_contextLock);
        initTrace();
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -281,6 +281,7 @@ main(int argc, char **av)
        _CrtSetReportMode(_CRT_ERROR, 0);
        _CrtSetReportMode(_CRT_ASSERT, 0);
        _set_invalid_parameter_handler(mserver_invalid_parameter_handler);
+       _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
        if (setlocale(LC_CTYPE, "") == NULL) {
                GDKfatal("cannot set locale\n");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list