MonetDB: gdk_tracer - make sure we include gdk_tracer in time (i...

[Niels Nes]

Changeset: 3889af9a3021 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3889af9a3021
Modified Files:
        gdk/gdk.h
        gdk/gdk_tracer.h
Branch: gdk_tracer
Log Message:

make sure we include gdk_tracer in time (ie before using its macro's)
properly export the functions of the gdk_tracer interface


diffs (94 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2017,6 +2017,8 @@ gdk_export str GDKstrdup(const char *s)
 gdk_export str GDKstrndup(const char *s, size_t n)
        __attribute__((__warn_unused_result__));
 
+#include "gdk_tracer.h"
+
 #if !defined(NDEBUG) && !defined(STATIC_CODE_ANALYSIS)
 /* In debugging mode, replace GDKmalloc and other functions with a
  * version that optionally prints calling information.
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -47,7 +47,8 @@
 #define AS_STR(x) #x
 #define STR(x) AS_STR(x)
 
-#define __FILENAME__ (__builtin_strrchr(__FILE__, DIR_SEP) ? 
__builtin_strrchr(__FILE__, DIR_SEP) + 1 : __FILE__)
+//#define __FILENAME__ (__builtin_strrchr(__FILE__, DIR_SEP) ? 
__builtin_strrchr(__FILE__, DIR_SEP) + 1 : __FILE__)
+#define __FILENAME__ __FILE__
 
 #define GENERATE_ENUM(ENUM) ENUM,
 #define GENERATE_STRING(STRING) #STRING,
@@ -221,7 +222,7 @@ static const char *COMPONENT_STR[] = {
 /*
  * Logging macros 
  */
-extern LOG_LEVEL LVL_PER_COMPONENT[];
+gdk_export LOG_LEVEL LVL_PER_COMPONENT[];
 
 // If the LOG_LEVEL of the message is one of the following: CRITICAL, ERROR or 
WARNING 
 // it is logged no matter the component. In any other case the component is 
taken into account
@@ -377,45 +378,45 @@ gdk_tracer;
  * LOG_LEVEL, COMPONENT and LAYER enum respectively.
  */
 // Returns the timestamp in the form of datetime
-char* GDKtracer_get_timestamp(char* fmt);
+gdk_export char* GDKtracer_get_timestamp(char* fmt);
 
 
-gdk_return GDKtracer_init(void);
+gdk_export gdk_return GDKtracer_init(void);
 
 
-gdk_return GDKtracer_stop(void);
+gdk_export gdk_return GDKtracer_stop(void);
 
 
-gdk_return GDKtracer_set_component_level(int *comp, int *lvl);
+gdk_export gdk_return GDKtracer_set_component_level(int *comp, int *lvl);
 
 
-gdk_return GDKtracer_reset_component_level(int *comp);
+gdk_export gdk_return GDKtracer_reset_component_level(int *comp);
 
 
-gdk_return GDKtracer_set_layer_level(int *layer, int *lvl);
+gdk_export gdk_return GDKtracer_set_layer_level(int *layer, int *lvl);
 
 
-gdk_return GDKtracer_reset_layer_level(int *layer);
+gdk_export gdk_return GDKtracer_reset_layer_level(int *layer);
 
 
-gdk_return GDKtracer_set_flush_level(int *lvl);
+gdk_export gdk_return GDKtracer_set_flush_level(int *lvl);
 
 
-gdk_return GDKtracer_reset_flush_level(void);
+gdk_export gdk_return GDKtracer_reset_flush_level(void);
 
 
-gdk_return GDKtracer_set_adapter(int *adapter);
+gdk_export gdk_return GDKtracer_set_adapter(int *adapter);
 
 
-gdk_return GDKtracer_reset_adapter(void);
+gdk_export gdk_return GDKtracer_reset_adapter(void);
 
 
-gdk_return GDKtracer_log(LOG_LEVEL level, char *fmt, ...) __attribute__ 
((format (printf, 2, 3)));
+gdk_export gdk_return GDKtracer_log(LOG_LEVEL level, char *fmt, ...) 
__attribute__ ((format (printf, 2, 3)));
 
 
-gdk_return GDKtracer_flush_buffer(void);
+gdk_export gdk_return GDKtracer_flush_buffer(void);
 
 
-gdk_return GDKtracer_show_info(void);
+gdk_export gdk_return GDKtracer_show_info(void);
 
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list