Changeset: a770c1ff8307 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a770c1ff8307
Modified Files:
gdk/gdk.h
gdk/gdk_system.h
gdk/gdk_tracer.h
Branch: Jul2021
Log Message:
Make LOCK_STATS viable again.
diffs (51 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -331,6 +331,8 @@
#include <limits.h> /* for *_MIN and *_MAX */
#include <float.h> /* for FLT_MAX and DBL_MAX */
+typedef enum { GDK_FAIL, GDK_SUCCEED } gdk_return;
+
#include "gdk_system.h"
#include "gdk_posix.h"
#include "stream.h"
@@ -524,8 +526,6 @@ typedef size_t BUN;
/*
* @- Checking and Error definitions:
*/
-typedef enum { GDK_FAIL, GDK_SUCCEED } gdk_return;
-
#define ATOMextern(t) (ATOMstorage(t) >= TYPE_str)
typedef enum {
@@ -1592,6 +1592,8 @@ gdk_export BAT *BBPquickdesc(bat b, bool
#include "gdk_tracer.h"
+gdk_export gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT
*log_level);
+
#define GDKerror(format, ...) \
GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
GDK, NULL, format, ##__VA_ARGS__)
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -179,6 +179,7 @@ gdk_export int MT_join_thread(MT_Id t);
#define USE_NATIVE_LOCKS 1
#ifdef LOCK_STATS
+#include "gdk_tracer.h"
#define _DBG_LOCK_COUNT_0(l) \
do { \
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -259,6 +259,4 @@ gdk_export void GDKtracer_log(const char
gdk_export gdk_return GDKtracer_flush_buffer(void);
-gdk_export gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT
*log_level);
-
#endif /* _GDK_TRACER_H_ */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
