MonetDB: mlogger - Removed Tracer -> msqldump.c

[Thodoris Zois]

Changeset: 57cb3028b652 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57cb3028b652
Modified Files:
        clients/mapiclient/Makefile.ag
        clients/mapiclient/msqldump.c
        gdk/Makefile.ag
        monetdb5/modules/mal/Makefile.ag
Branch: mlogger
Log Message:

Removed Tracer -> msqldump.c


diffs (83 lines):

diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -27,7 +27,6 @@ bin_msqldump = {
        LIBS = libmcutil ../../common/utils/libmutils \
                ../mapilib/libmapi \
                ../../common/stream/libstream \
-               ../../gdk/libgdktracer \
                $(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS) 
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
 }
 
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -26,7 +26,6 @@
 #include "mprompt.h"
 #include "mutils.h"            /* mercurial_revision */
 #include "dotmonetdb.h"
-#include "gdk_tracer.h"
 
 static _Noreturn void usage(const char *prog, int xit);
 
@@ -173,7 +172,7 @@ main(int argc, char **argv)
        if (dbname)
                free(dbname);
        if (mid == NULL) {
-               Trace(M_CRITICAL, "failed to allocate Mapi structure\n");
+               fprintf(stderr, "failed to allocate Mapi structure\n");
                exit(2);
        }
        if (mapi_error(mid)) {
@@ -184,14 +183,14 @@ main(int argc, char **argv)
                const char *motd = mapi_get_motd(mid);
 
                if (motd)
-                       Trace(M_INFO, "%s", motd);
+                       fprintf(stderr, "%s", motd);
        }
        mapi_trace(mid, trace);
        mapi_cache_limit(mid, 10000);
 
        out = file_wastream(stdout, "stdout");
        if (out == NULL) {
-               Trace(M_CRITICAL, "failed to allocate stream\n");
+               fprintf(stderr, "failed to allocate stream\n");
                exit(2);
        }
        if (!quiet) {
@@ -237,7 +236,7 @@ main(int argc, char **argv)
 
        mapi_destroy(mid);
        if (mnstr_errnr(out)) {
-               Trace(M_ERROR, "%s: %s", argv[0], mnstr_error(out));
+               fprintf(stderr, "%s: %s", argv[0], mnstr_error(out));
                return 1;
        }
 
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -41,10 +41,10 @@ lib_gdk = {
                gdk_firstn.c \
                gdk_analytic_bounds.c \
                gdk_analytic_func.c gdk_analytic.h \
+               gdk_tracer.c gdk_tracer.h
                libbat.rc
        LIBS = ../common/options/libmoptions \
                ../common/utils/libmutils \
-               libgdktracer \
                WIN32?../common/stream/libstream \
                WIN32?$(MATH_LIBS) \
                WIN32?$(SOCKET_LIBS) \
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -49,7 +49,6 @@ lib_mal = {
                json_util.c json_util.h \
                calc.c batcalc.c \
                tracer.c tracer.h \
-       LIBS = ../../../gdk/libgdktracer
 }
 
 headers_mal = {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list