Changeset: 229302b73a46 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=229302b73a46
Modified Files:
NT/monetdb_config.h.in
gdk/gdk_atomic.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_imprints.c
gdk/gdk_search.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_tm.c
gdk/gdk_utils.c
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_statistics.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/common/sql_list.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_planner.c
sql/server/rel_select.c
sql/storage/sql_catalog.c
sql/storage/store.c
Branch: default
Log Message:
Cleanup: remove function name for debug purposes from macros.
We now use the __func__ (or __FUNCTION__ on old Visual Studio) symbol
to get at the function name.
diffs (truncated from 4986 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -57,6 +57,12 @@
#include <assert.h>
+#if _MSC_VER <= 1800
+/* From Visual Studio 2013, the compiler undetstands __func__, before
+ * that we need __FUNCTION__ */
+#define __func__ __FUNCTION__
+#endif
+
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
#define ALREADY_HAVE_WINDOWS_TYPE 1
diff --git a/gdk/gdk_atomic.h b/gdk/gdk_atomic.h
--- a/gdk/gdk_atomic.h
+++ b/gdk/gdk_atomic.h
@@ -47,19 +47,19 @@
#define ATOMIC_TYPE AO_t
-#define ATOMIC_GET(var, lck, fcn) AO_load_full(&var)
-#define ATOMIC_SET(var, val, lck, fcn) AO_store_full(&var, (val))
-#define ATOMIC_ADD(var, val, lck, fcn) AO_fetch_and_add(&var, (val))
-#define ATOMIC_SUB(var, val, lck, fcn) AO_fetch_and_add(&var, -(val))
-#define ATOMIC_INC(var, lck, fcn) (AO_fetch_and_add1(&var) + 1)
-#define ATOMIC_DEC(var, lck, fcn) (AO_fetch_and_sub1(&var) - 1)
+#define ATOMIC_GET(var, lck) AO_load_full(&var)
+#define ATOMIC_SET(var, val, lck) AO_store_full(&var, (val))
+#define ATOMIC_ADD(var, val, lck) AO_fetch_and_add(&var, (val))
+#define ATOMIC_SUB(var, val, lck) AO_fetch_and_add(&var, -(val))
+#define ATOMIC_INC(var, lck) (AO_fetch_and_add1(&var) + 1)
+#define ATOMIC_DEC(var, lck) (AO_fetch_and_sub1(&var) - 1)
-#define ATOMIC_INIT(lck, fcn) ((void) 0)
+#define ATOMIC_INIT(lck) ((void) 0)
#define ATOMIC_FLAG AO_TS_t
#define ATOMIC_FLAG_INIT { AO_TS_INITIALIZER }
-#define ATOMIC_CLEAR(var, lck, fcn) AO_CLEAR(&var)
-#define ATOMIC_TAS(var, lck, fcn) (AO_test_and_set_full(&var) !=
AO_TS_CLEAR)
+#define ATOMIC_CLEAR(var, lck) AO_CLEAR(&var)
+#define ATOMIC_TAS(var, lck) (AO_test_and_set_full(&var) != AO_TS_CLEAR)
#else
@@ -71,12 +71,12 @@
#define ATOMIC_TYPE lng
-#define ATOMIC_GET(var, lck, fcn) var
-#define ATOMIC_SET(var, val, lck, fcn) _InterlockedExchange64(&var, (val))
-#define ATOMIC_ADD(var, val, lck, fcn) _InterlockedExchangeAdd64(&var, val)
-#define ATOMIC_SUB(var, val, lck, fcn) _InterlockedExchangeAdd64(&var, -(val))
-#define ATOMIC_INC(var, lck, fcn) _InterlockedIncrement64(&var)
-#define ATOMIC_DEC(var, lck, fcn) _InterlockedDecrement64(&var)
+#define ATOMIC_GET(var, lck) var
+#define ATOMIC_SET(var, val, lck) _InterlockedExchange64(&var, (val))
+#define ATOMIC_ADD(var, val, lck) _InterlockedExchangeAdd64(&var, val)
+#define ATOMIC_SUB(var, val, lck) _InterlockedExchangeAdd64(&var, -(val))
+#define ATOMIC_INC(var, lck) _InterlockedIncrement64(&var)
+#define ATOMIC_DEC(var, lck) _InterlockedDecrement64(&var)
#pragma intrinsic(_InterlockedExchange64)
#pragma intrinsic(_InterlockedExchangeAdd64)
@@ -88,12 +88,12 @@
#define ATOMIC_TYPE int
-#define ATOMIC_GET(var, lck, fcn) var
-#define ATOMIC_SET(var, val, lck, fcn) _InterlockedExchange(&var, (val))
-#define ATOMIC_ADD(var, val, lck, fcn) _InterlockedExchangeAdd(&var, (val))
-#define ATOMIC_SUB(var, val, lck, fcn) _InterlockedExchangeAdd(&var, -(val))
-#define ATOMIC_INC(var, lck, fcn) _InterlockedIncrement(&var)
-#define ATOMIC_DEC(var, lck, fcn) _InterlockedDecrement(&var)
+#define ATOMIC_GET(var, lck) var
+#define ATOMIC_SET(var, val, lck) _InterlockedExchange(&var, (val))
+#define ATOMIC_ADD(var, val, lck) _InterlockedExchangeAdd(&var, (val))
+#define ATOMIC_SUB(var, val, lck) _InterlockedExchangeAdd(&var, -(val))
+#define ATOMIC_INC(var, lck) _InterlockedIncrement(&var)
+#define ATOMIC_DEC(var, lck) _InterlockedDecrement(&var)
#pragma intrinsic(_InterlockedExchange)
#pragma intrinsic(_InterlockedExchangeAdd)
@@ -102,12 +102,12 @@
#endif
-#define ATOMIC_INIT(lck, fcn) ((void) 0)
+#define ATOMIC_INIT(lck) ((void) 0)
#define ATOMIC_FLAG int
#define ATOMIC_FLAG_INIT { 0 }
-#define ATOMIC_CLEAR(var, lck, fcn) _InterlockedExchange(&var, 0)
-#define ATOMIC_TAS(var, lck, fcn) _InterlockedCompareExchange(&var, 1, 0)
+#define ATOMIC_CLEAR(var, lck) _InterlockedExchange(&var, 0)
+#define ATOMIC_TAS(var, lck) _InterlockedCompareExchange(&var, 1, 0)
#pragma intrinsic(_InterlockedCompareExchange)
#elif (defined(__GNUC__) || defined(__INTEL_COMPILER)) && !(defined(__sun__)
&& SIZEOF_SIZE_T == SIZEOF_LNG) && !defined(_MSC_VER) &&
!defined(NO_ATOMIC_INSTRUCTIONS)
@@ -121,36 +121,36 @@
#ifdef __ATOMIC_SEQ_CST
/* the new way of doing this according to GCC */
-#define ATOMIC_GET(var, lck, fcn) __atomic_load_n(&var, __ATOMIC_SEQ_CST)
-#define ATOMIC_SET(var, val, lck, fcn) __atomic_store_n(&var, (val),
__ATOMIC_SEQ_CST)
-#define ATOMIC_ADD(var, val, lck, fcn) __atomic_fetch_add(&var, (val),
__ATOMIC_SEQ_CST)
-#define ATOMIC_SUB(var, val, lck, fcn) __atomic_fetch_sub(&var, (val),
__ATOMIC_SEQ_CST)
-#define ATOMIC_INC(var, lck, fcn) __atomic_add_fetch(&var, 1,
__ATOMIC_SEQ_CST)
-#define ATOMIC_DEC(var, lck, fcn) __atomic_sub_fetch(&var, 1,
__ATOMIC_SEQ_CST)
+#define ATOMIC_GET(var, lck) __atomic_load_n(&var, __ATOMIC_SEQ_CST)
+#define ATOMIC_SET(var, val, lck) __atomic_store_n(&var, (val),
__ATOMIC_SEQ_CST)
+#define ATOMIC_ADD(var, val, lck) __atomic_fetch_add(&var, (val),
__ATOMIC_SEQ_CST)
+#define ATOMIC_SUB(var, val, lck) __atomic_fetch_sub(&var, (val),
__ATOMIC_SEQ_CST)
+#define ATOMIC_INC(var, lck) __atomic_add_fetch(&var, 1,
__ATOMIC_SEQ_CST)
+#define ATOMIC_DEC(var, lck) __atomic_sub_fetch(&var, 1,
__ATOMIC_SEQ_CST)
#define ATOMIC_FLAG char
#define ATOMIC_FLAG_INIT { 0 }
-#define ATOMIC_CLEAR(var, lck, fcn) __atomic_clear(&var, __ATOMIC_SEQ_CST)
-#define ATOMIC_TAS(var, lck, fcn) __atomic_test_and_set(&var,
__ATOMIC_SEQ_CST)
+#define ATOMIC_CLEAR(var, lck) __atomic_clear(&var, __ATOMIC_SEQ_CST)
+#define ATOMIC_TAS(var, lck) __atomic_test_and_set(&var,
__ATOMIC_SEQ_CST)
#else
/* the old way of doing this, (still?) needed for Intel compiler on Linux */
-#define ATOMIC_GET(var, lck, fcn) var
-#define ATOMIC_SET(var, val, lck, fcn) (var = (val))
-#define ATOMIC_ADD(var, val, lck, fcn) __sync_fetch_and_add(&var, (val))
-#define ATOMIC_SUB(var, val, lck, fcn) __sync_fetch_and_sub(&var, (val))
-#define ATOMIC_INC(var, lck, fcn) __sync_add_and_fetch(&var, 1)
-#define ATOMIC_DEC(var, lck, fcn) __sync_sub_and_fetch(&var, 1)
+#define ATOMIC_GET(var, lck) var
+#define ATOMIC_SET(var, val, lck) (var = (val))
+#define ATOMIC_ADD(var, val, lck) __sync_fetch_and_add(&var, (val))
+#define ATOMIC_SUB(var, val, lck) __sync_fetch_and_sub(&var, (val))
+#define ATOMIC_INC(var, lck) __sync_add_and_fetch(&var, 1)
+#define ATOMIC_DEC(var, lck) __sync_sub_and_fetch(&var, 1)
#define ATOMIC_FLAG int
#define ATOMIC_FLAG_INIT { 0 }
-#define ATOMIC_CLEAR(var, lck, fcn) __sync_lock_release(&var)
-#define ATOMIC_TAS(var, lck, fcn) __sync_lock_test_and_set(&var, 1)
+#define ATOMIC_CLEAR(var, lck) __sync_lock_release(&var)
+#define ATOMIC_TAS(var, lck) __sync_lock_test_and_set(&var, 1)
#endif
-#define ATOMIC_INIT(lck, fcn) ((void) 0)
+#define ATOMIC_INIT(lck) ((void) 0)
#else
@@ -169,7 +169,7 @@ static inline ATOMIC_TYPE
pthread_mutex_unlock(lck);
return old;
}
-#define ATOMIC_GET(var, lck, fcn) __ATOMIC_GET(&var, &(lck).lock)
+#define ATOMIC_GET(var, lck) __ATOMIC_GET(&var, &(lck).lock)
static inline ATOMIC_TYPE
__ATOMIC_SET(volatile ATOMIC_TYPE *var, ATOMIC_TYPE val, pthread_mutex_t *lck)
@@ -181,7 +181,7 @@ static inline ATOMIC_TYPE
pthread_mutex_unlock(lck);
return new;
}
-#define ATOMIC_SET(var, val, lck, fcn) __ATOMIC_SET(&var, (val), &(lck).lock)
+#define ATOMIC_SET(var, val, lck) __ATOMIC_SET(&var, (val), &(lck).lock)
static inline ATOMIC_TYPE
__ATOMIC_ADD(volatile ATOMIC_TYPE *var, ATOMIC_TYPE val, pthread_mutex_t *lck)
@@ -193,7 +193,7 @@ static inline ATOMIC_TYPE
pthread_mutex_unlock(lck);
return old;
}
-#define ATOMIC_ADD(var, val, lck, fcn) __ATOMIC_ADD(&var, (val), &(lck).lock)
+#define ATOMIC_ADD(var, val, lck) __ATOMIC_ADD(&var, (val), &(lck).lock)
static inline ATOMIC_TYPE
__ATOMIC_SUB(volatile ATOMIC_TYPE *var, ATOMIC_TYPE val, pthread_mutex_t *lck)
@@ -205,7 +205,7 @@ static inline ATOMIC_TYPE
pthread_mutex_unlock(lck);
return old;
}
-#define ATOMIC_SUB(var, val, lck, fcn) __ATOMIC_SUB(&var, (val), &(lck).lock)
+#define ATOMIC_SUB(var, val, lck) __ATOMIC_SUB(&var, (val), &(lck).lock)
static inline ATOMIC_TYPE
__ATOMIC_INC(volatile ATOMIC_TYPE *var, pthread_mutex_t *lck)
@@ -216,7 +216,7 @@ static inline ATOMIC_TYPE
pthread_mutex_unlock(lck);
return new;
}
-#define ATOMIC_INC(var, lck, fcn) __ATOMIC_INC(&var, &(lck).lock)
+#define ATOMIC_INC(var, lck) __ATOMIC_INC(&var, &(lck).lock)
static inline ATOMIC_TYPE
__ATOMIC_DEC(volatile ATOMIC_TYPE *var, pthread_mutex_t *lck)
@@ -227,11 +227,11 @@ static inline ATOMIC_TYPE
pthread_mutex_unlock(lck);
return new;
}
-#define ATOMIC_DEC(var, lck, fcn) __ATOMIC_DEC(&var, &(lck).lock)
+#define ATOMIC_DEC(var, lck) __ATOMIC_DEC(&var, &(lck).lock)
-#define USE_PTHREAD_LOCKS /* must use pthread locks */
-#define ATOMIC_LOCK /* must use locks for atomic access */
-#define ATOMIC_INIT(lck, fcn) MT_lock_init(&(lck), fcn)
+#define USE_PTHREAD_LOCKS /* must use pthread locks */
+#define ATOMIC_LOCK /* must use locks for atomic access */
+#define ATOMIC_INIT(lck) MT_lock_init(&(lck), #lck)
#define ATOMIC_FLAG int
#define ATOMIC_FLAG_INIT {0}
@@ -245,7 +245,7 @@ static inline ATOMIC_FLAG
pthread_mutex_unlock(lck);
return orig;
}
-#define ATOMIC_TAS(var, lck, fcn) __ATOMIC_TAS(&var, &(lck).lock)
+#define ATOMIC_TAS(var, lck) __ATOMIC_TAS(&var, &(lck).lock)
static inline void
__ATOMIC_CLEAR(volatile ATOMIC_FLAG *var, pthread_mutex_t *lck)
@@ -254,7 +254,7 @@ static inline void
*var = 0;
pthread_mutex_unlock(lck);
}
-#define ATOMIC_CLEAR(var, lck, fcn) __ATOMIC_CLEAR(&var,
&(lck).lock)
+#define ATOMIC_CLEAR(var, lck) __ATOMIC_CLEAR(&var, &(lck).lock)
#endif
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -166,7 +166,7 @@ ATOMallocate(const char *id)
{
int t;
- MT_lock_set(&GDKthreadLock, "ATOMallocate");
+ MT_lock_set(&GDKthreadLock);
t = ATOMindex(id);
if (t < 0) {
@@ -185,7 +185,7 @@ ATOMallocate(const char *id)
BATatoms[t].linear = 1; /* default */
BATatoms[t].storage = t; /* default */
}
- MT_lock_unset(&GDKthreadLock, "ATOMallocate");
+ MT_lock_unset(&GDKthreadLock);
return t;
}
@@ -1752,7 +1752,7 @@ int
OIDinit(void)
{
#ifdef NEED_MT_LOCK_INIT
- ATOMIC_INIT(GDKoidLock, "GDKoidLock");
+ ATOMIC_INIT(GDKoidLock);
#endif
GDKflushed = 0;
GDKoid = OIDrand();
@@ -1767,14 +1767,14 @@ OIDinit(void)
oid
OIDbase(oid o)
{
- ATOMIC_SET(GDKoid, (ATOMIC_TYPE) o, GDKoidLock, "OIDbase");
+ ATOMIC_SET(GDKoid, (ATOMIC_TYPE) o, GDKoidLock);
return o;
}
static oid
OIDseed(oid o)
{
- oid t, p = (oid) ATOMIC_GET(GDKoid, GDKoidLock, "OIDseed");
+ oid t, p = (oid) ATOMIC_GET(GDKoid, GDKoidLock);
t = OIDrand();
if (o > t)
@@ -1814,14 +1814,14 @@ OIDwrite(FILE *f)
int ret = 0;
ATOMIC_TYPE o;
- MT_lock_set(&MT_system_lock, "OIDwrite");
- o = ATOMIC_GET(GDKoid, GDKoidLock, "OIDwrite");
+ MT_lock_set(&MT_system_lock);
+ o = ATOMIC_GET(GDKoid, GDKoidLock);
if (o) {
GDKflushed = (oid) o;
if (fprintf(f, OIDFMT "@0", GDKflushed) < 0 || ferror(f))
ret = -1;
}
- MT_lock_unset(&MT_system_lock, "OIDwrite");
+ MT_lock_unset(&MT_system_lock);
return ret;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
