Changeset: 228e7b60eabe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=228e7b60eabe
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_tracer.c
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/modules/mal/Tests/tracer00.malC
monetdb5/modules/mal/tracer.c
monetdb5/modules/mal/tracer.h
monetdb5/modules/mal/tracer.mal
sql/scripts/81_tracer.sql
tools/mserver/mserver5.c
Branch: gdk_tracer
Log Message:
Removed define debug in GDKtracer, removed GDKtracerinfo() and added SQL call
to dump trace info on demand
diffs (171 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -286,7 +286,6 @@ ssize_t GDKstrFromStr(unsigned char *res
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
-void GDKtracerinfo(void);
size_t GDKuniqueid(size_t offset);
gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare)
__attribute__((__warn_unused_result__));
lng GDKusec(void);
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -17,8 +17,6 @@
#include "gdk.h"
#include "gdk_tracer.h"
-#define _GDKTRACER_DEBUG_
-
// We need to get rid of macros defined in gdk.h. Those are using GDKtracer in
order to produce
// messages. At the point malloc is called in gdk_tracer.c (in function
_GDKtracer_fill_tracer)
// a lock has already being acquired. Using the macro malloc in gdk.h a call
to GDKtracer
@@ -225,10 +223,6 @@ static gdk_return
}
}
-#ifdef _GDKTRACER_DEBUG_
- GDKtracer_show_info();
-#endif
-
return GDK_SUCCEED;
}
@@ -281,10 +275,6 @@ GDKtracer_set_component_level(int *comp,
LVL_PER_COMPONENT[*comp] = level;
-#ifdef _GDKTRACER_DEBUG_
- GDKtracer_show_info();
-#endif
-
return GDK_SUCCEED;
}
@@ -434,12 +424,13 @@ GDKtracer_log(LOG_LEVEL level, char *fmt
{
MT_lock_unset(&lock);
- GDK_TRACER_OSTREAM("Failed to write to the buffer
(bytes_written = %d)\n", bytes_written);
+ // GDK_TRACER_OSTREAM("Failed to write to the buffer
(bytes_written = %d)\n", bytes_written);
// Fallback logging mechanism
- // va_list va;
- // va_start(va, fmt);
- // GDK_TRACER_OSTREAM(fmt, va);
- // va_end(va);
+ GDK_TRACER_OSTREAM("FALLBACK MECHANISM\n");
+ va_list va;
+ va_start(va, fmt);
+ GDK_TRACER_OSTREAM(fmt, va);
+ va_end(va);
}
}
}
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1700,12 +1700,6 @@ GDKversion(void)
return (_gdk_version_string);
}
-void
-GDKtracerinfo(void)
-{
- GDKtracer_show_info();
-}
-
size_t
GDKmem_cursize(void)
{
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -19,8 +19,6 @@ gdk_export bool GDKgetenv_istrue(const c
gdk_export int GDKgetenv_int(const char *name, int def);
-gdk_export void GDKtracerinfo(void);
-
gdk_export gdk_return GDKsetenv(const char *name, const char *value);
gdk_export gdk_return GDKcopyenv(BAT **key, BAT **val, bool writable);
diff --git a/monetdb5/modules/mal/Tests/tracer00.malC
b/monetdb5/modules/mal/Tests/tracer00.malC
--- a/monetdb5/modules/mal/Tests/tracer00.malC
+++ b/monetdb5/modules/mal/Tests/tracer00.malC
@@ -126,3 +126,7 @@ logging.resetadapter();
# log & flush
logging.log();
logging.flush();
+
+
+# Show log levels etc
+logging.showinfo();
\ No newline at end of file
diff --git a/monetdb5/modules/mal/tracer.c b/monetdb5/modules/mal/tracer.c
--- a/monetdb5/modules/mal/tracer.c
+++ b/monetdb5/modules/mal/tracer.c
@@ -122,6 +122,14 @@ TRACERreset_adapter(void)
}
+str
+TRACERshowinfo(void)
+{
+ GDKtracer_show_info();
+ return MAL_SUCCEED;
+}
+
+
// Exposed only in MAL layer - for testing
str
TRACERlog(void)
diff --git a/monetdb5/modules/mal/tracer.h b/monetdb5/modules/mal/tracer.h
--- a/monetdb5/modules/mal/tracer.h
+++ b/monetdb5/modules/mal/tracer.h
@@ -26,6 +26,7 @@ mal_export str TRACERset_flush_level(voi
mal_export str TRACERreset_flush_level(void);
mal_export str TRACERset_adapter(void *ret, int *adapter);
mal_export str TRACERreset_adapter(void);
+mal_export str TRACERshowinfo(void);
// Exposed only in MAL layer - for testing
mal_export str TRACERlog(void);
diff --git a/monetdb5/modules/mal/tracer.mal b/monetdb5/modules/mal/tracer.mal
--- a/monetdb5/modules/mal/tracer.mal
+++ b/monetdb5/modules/mal/tracer.mal
@@ -42,6 +42,10 @@ command resetadapter()
address TRACERreset_adapter
comment "Reset the adapter";
+command showinfo()
+address TRACERshowinfo
+comment "Show logging levels per component and layers";
+
# Exposed only in MAL layer - for testing
command log()
address TRACERlog
diff --git a/sql/scripts/81_tracer.sql b/sql/scripts/81_tracer.sql
--- a/sql/scripts/81_tracer.sql
+++ b/sql/scripts/81_tracer.sql
@@ -41,3 +41,7 @@ CREATE PROCEDURE logging.setadapter(adap
-- Reset the adapter
CREATE PROCEDURE logging.resetadapter()
EXTERNAL NAME logging.resetadapter;
+
+-- Show log level per component and available layers
+CREATE PROCEDURE logging.showinfo()
+ EXTERNAL NAME logging.showinfo;
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -675,9 +675,6 @@ main(int argc, char **av)
return 0;
}
- /* show log level per component and available layers */
- /* This should only be generated upon explicit request GDKtracerinfo();
*/
-
emergencyBreakpoint();
if (!GDKinmemory() && (err = msab_registerStarted()) != NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
