MonetDB: mlogger - Control GDKstalker at user level (SQL)

[Thodoris Zois]

Changeset: 95a086b09be3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95a086b09be3
Modified Files:
        gdk/Makefile.ag
        gdk/gdk_stalker.c
        monetdb5/modules/mal/Makefile.ag
        monetdb5/modules/mal/mal_init.mal
        sql/scripts/Makefile.ag
Branch: mlogger
Log Message:

Control GDKstalker at user level (SQL)


diffs (104 lines):

diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -51,6 +51,10 @@ lib_gdk = {
                WIN32?$(KVM_LIBS)
 }
 
+lib_gdkstalker = {
+       SOURCES = gdk_stalker.c gdk_stalker.h
+}
+
 headers_h = {
        DIR = includedir/monetdb
        HEADERS = h
diff --git a/gdk/gdk_stalker.c b/gdk/gdk_stalker.c
--- a/gdk/gdk_stalker.c
+++ b/gdk/gdk_stalker.c
@@ -129,6 +129,7 @@ gdk_return GDKstalker_set_log_level(LOG_
     }
 
     ATOMIC_SET(&CUR_LOG_LEVEL, level);
+    GDKstalker_log(M_DEBUG, 1, "%s", "CHANGED_LEVEL_TO_DEBUG");
 
     return GDK_SUCCEED;
 }
@@ -144,6 +145,7 @@ gdk_return GDKstalker_reset_log_level(vo
         return GDK_FAIL;
 
     ATOMIC_SET(&CUR_LOG_LEVEL, M_NONE);
+    GDKstalker_log(M_DEBUG, 1, "%s", "RESET_LOG_LEVEL");
 
     return GDK_SUCCEED;
 }
@@ -155,6 +157,7 @@ gdk_return GDKstalker_set_flush_level(LO
         return GDK_SUCCEED;
     
     ATOMIC_SET(&CUR_FLUSH_LEVEL, level);
+    GDKstalker_log(M_DEBUG, 1, "%s", "CHANGED_FLUSH_LEVEL_TO_DEBUG");
 
     return GDK_SUCCEED;
 }
@@ -166,6 +169,7 @@ gdk_return GDKstalker_reset_flush_level(
         return GDK_SUCCEED;
 
     ATOMIC_SET(&CUR_FLUSH_LEVEL, M_ERROR);
+    GDKstalker_log(M_DEBUG, 1, "%s", "RESET_FLUSH_LEVEL");
 
     return GDK_SUCCEED;
 }
@@ -276,6 +280,8 @@ gdk_return GDKstalker_log(LOG_LEVEL leve
 
 gdk_return GDKstalker_flush_buffer()
 {
+    GDKstalker_log(M_DEBUG, 1, "%s", "FLUSHING_BUFFER_CALL");
+
     // Select a stalker
     gdk_stalker *fl_stalker;
     pthread_mutex_t mutex;
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
@@ -48,6 +48,7 @@ lib_mal = {
                sample.c sample.h \
                json_util.c json_util.h \
                calc.c batcalc.c
+       LIBS = ../../../gdk/libgdkstalker
 }
 
 headers_mal = {
@@ -62,7 +63,8 @@ headers_mal = {
                mal_mapi.mal remote.mal  \
                txtsim.mal \
                tokenizer.mal sample.mal json_util.mal \
-               batmtime.mal querylog.mal sysmon.mal
+               batmtime.mal querylog.mal sysmon.mal \
+               stalker.mal
 }
 
 headers_auto = {
diff --git a/monetdb5/modules/mal/mal_init.mal 
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -89,6 +89,8 @@ include mal_mapi;
 include oltp;
 include wlc;
 
+include stalker;
+
 # Any extensions (MAL scripts) that should be automatically loaded upon
 # startup can be placed in the autoload directory.  One typically finds
 # the SQL module in here, but it can also be used to load custom scripts.
diff --git a/sql/scripts/Makefile.ag b/sql/scripts/Makefile.ag
--- a/sql/scripts/Makefile.ag
+++ b/sql/scripts/Makefile.ag
@@ -35,7 +35,8 @@ headers_sql = {
                60_wlcr.sql \
                75_storagemodel.sql \
                80_statistics.sql \
-               99_system.sql
+               99_system.sql \
+               100_stalker.sql
 }
 
 headers_hge = {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list