MonetDB: default - Fix some debug statements.

[Sjoerd Mullender]

Changeset: 1c5a4e1f759d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c5a4e1f759d
Modified Files:
        gdk/gdk_batop.c
        monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:

Fix some debug statements.


diffs (46 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -845,9 +845,7 @@ BATdel(BAT *b, BAT *d)
 gdk_return
 BATreplace(BAT *b, BAT *p, BAT *n, bool force)
 {
-       lng t0 = 0;
-
-       ALGODEBUG t0 = GDKusec();
+       lng t0 = GDKusec();
 
        if (b == NULL || b->ttype == TYPE_void || p == NULL || n == NULL) {
                return GDK_SUCCEED;
@@ -1170,11 +1168,10 @@ BATreplace(BAT *b, BAT *p, BAT *n, bool 
                        }
                }
        }
-       ALGODEBUG fprintf(stderr,
-                         "#%s: BATreplace(" ALGOBATFMT "," ALGOBATFMT "," 
ALGOBATFMT ") " LLFMT " usec\n",
-                         MT_thread_getname(),
-                         ALGOBATPAR(b), ALGOBATPAR(p), ALGOBATPAR(n),
-                         GDKusec() - t0);
+       TRC_DEBUG(ALGO,
+                 "BATreplace(" ALGOBATFMT "," ALGOBATFMT "," ALGOBATFMT ") " 
LLFMT " usec\n",
+                 ALGOBATPAR(b), ALGOBATPAR(p), ALGOBATPAR(n),
+                 GDKusec() - t0);
        return GDK_SUCCEED;
 }
 
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -921,8 +921,10 @@ SERVERlisten(int port, const char *usock
                throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting 
thread failed");
        }
 
-       gethostname(host, sizeof(host));
-       TRC_DEBUG_ENDIF(MAL_SERVER, "Ready to accept connections on: %s:%d\n", 
host, port);
+       TRC_DEBUG_IF(MAL_SERVER) {
+               gethostname(host, sizeof(host));
+               TRC_DEBUG_ENDIF(MAL_SERVER, "Ready to accept connections on: 
%s:%d\n", host, port);
+       }
        
        /* seed the randomiser such that our challenges aren't
         * predictable... */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list