Changeset: 33575f580a86 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33575f580a86
Added Files:
common/utils/matomic.h
Removed Files:
gdk/gdk_atomic.h
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
common/utils/Makefile.ag
debian/libmonetdb-dev.install
gdk/Makefile.ag
gdk/gdk_system.h
gdk/gdk_utils.c
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
monetdb5/extras/mal_optimizer_template/Makefile.ag
monetdb5/extras/rapi/Makefile.ag
monetdb5/mal/mal_resource.h
monetdb5/modules/kernel/Makefile.ag
sql/backends/monet5/UDF/capi/Makefile.ag
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/udf/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/common/Makefile.ag
sql/server/Makefile.ag
sql/storage/Makefile.ag
sql/storage/bat/Makefile.ag
Branch: default
Log Message:
Rename gdk_atomic.h to matomic.h and move to common/utils.
diffs (284 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -221,6 +221,7 @@ functionality of MonetDB.
%defattr(-,root,root)
%dir %{_includedir}/monetdb
%{_includedir}/monetdb/gdk*.h
+%{_includedir}/monetdb/matomic.h
%{_includedir}/monetdb/monet*.h
%{_libdir}/libbat.so
%{_libdir}/pkgconfig/monetdb-gdk.pc
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -170,6 +170,7 @@ def main():
id = comp(extend, id, 16,
sorted([r'include\monetdb\%s' % x for x in filter(lambda x:
(x.startswith('gdk') or x.startswith('monet') or x.startswith('mal')) and
x.endswith('.h'), os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))]
+
[r'include\monetdb\mapi.h',
+ r'include\monetdb\matomic.h',
r'include\monetdb\stream.h',
r'include\monetdb\stream_socket.h']),
vital = 'no')
diff --git a/common/utils/Makefile.ag b/common/utils/Makefile.ag
--- a/common/utils/Makefile.ag
+++ b/common/utils/Makefile.ag
@@ -10,6 +10,14 @@ MTSAFE
INCLUDES = ../.. $(openssl_CFLAGS)
+EXTRA_DIST = matomic.h
+
+headers_h = {
+ DIR = includedir/monetdb
+ HEADERS = h
+ SOURCES = matomic.h
+}
+
lib_mutils = {
NOINST
SOURCES = mutils.h mutils.c prompt.c mprompt.h revision.c
diff --git a/gdk/gdk_atomic.h b/common/utils/matomic.h
rename from gdk/gdk_atomic.h
rename to common/utils/matomic.h
--- a/gdk/gdk_atomic.h
+++ b/common/utils/matomic.h
@@ -49,8 +49,8 @@
* using the ATOMIC_FLAG_INIT macro.
*/
-#ifndef _GDK_ATOMIC_H_
-#define _GDK_ATOMIC_H_
+#ifndef _MATOMIC_H_
+#define _MATOMIC_H_
/* define this if you don't want to use atomic instructions */
/* #define NO_ATOMIC_INSTRUCTIONS */
@@ -461,4 +461,4 @@ ATOMIC_CLEAR(ATOMIC_FLAG *var)
#endif
-#endif /* _GDK_ATOMIC_H_ */
+#endif /* _MATOMIC_H_ */
diff --git a/debian/libmonetdb-dev.install b/debian/libmonetdb-dev.install
--- a/debian/libmonetdb-dev.install
+++ b/debian/libmonetdb-dev.install
@@ -1,4 +1,5 @@
debian/tmp/usr/lib/x86_64-linux-gnu/libbat.so usr/lib/x86_64-linux-gnu
debian/tmp/usr/include/monetdb/gdk*.h usr/include/monetdb
+debian/tmp/usr/include/monetdb/matomic.h usr/include/monetdb
debian/tmp/usr/include/monetdb/monet*.h usr/include/monetdb
debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-gdk.pc
usr/lib/x86_64-linux-gnu/pkgconfig
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -16,7 +16,7 @@ lib_gdk = {
gdk_calc.c gdk_calc.h gdk_calc_compare.h gdk_calc_private.h \
gdk_ssort.c gdk_ssort_impl.h \
gdk_aggr.c \
- gdk.h gdk_cand.h gdk_atomic.h gdk_batop.c \
+ gdk.h gdk_cand.h gdk_batop.c \
gdk_search.c gdk_hash.c gdk_hash.h gdk_tm.c \
gdk_orderidx.c \
gdk_align.c gdk_bbp.c gdk_bbp.h \
@@ -55,7 +55,6 @@ headers_h = {
SOURCES = \
gdk.h \
gdk_analytic.h \
- gdk_atomic.h \
gdk_atoms.h \
gdk_bbp.h \
gdk_calc.h \
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -157,7 +157,7 @@ gdk_export int MT_join_thread(MT_Id t);
/*
* @- MT Lock API
*/
-#include "gdk_atomic.h"
+#include "matomic.h"
/* in non-debug builds, we don't keep lock statistics */
#ifndef NDEBUG
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -290,7 +290,7 @@ size_t GDK_vm_maxsize = GDK_VM_MAXSIZE;
* the compiler) for both the GNU C compiler and Microsoft Visual
* Studio. By doing this, we avoid locking overhead. There is also a
* fall-back for other compilers. */
-#include "gdk_atomic.h"
+#include "matomic.h"
static ATOMIC_TYPE GDK_mallocedbytes_estimate = ATOMIC_VAR_INIT(0);
#ifndef NDEBUG
static volatile lng GDK_malloc_success_count = -1;
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -5,7 +5,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
MTSAFE
-INCLUDES = ../../common/options ../../common/stream ../../gdk $(GEOS_INCS)
$(proj_CFLAGS)
+INCLUDES = ../../common/options ../../common/stream ../../common/utils
../../gdk $(GEOS_INCS) $(proj_CFLAGS)
lib_geom = {
NOINST
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -7,6 +7,7 @@
MTSAFE
INCLUDES = ../lib \
../../gdk \
+ ../../common/utils \
../../common/stream \
../../common/options \
../../monetdb5/mal \
diff --git a/monetdb5/extras/mal_optimizer_template/Makefile.ag
b/monetdb5/extras/mal_optimizer_template/Makefile.ag
--- a/monetdb5/extras/mal_optimizer_template/Makefile.ag
+++ b/monetdb5/extras/mal_optimizer_template/Makefile.ag
@@ -9,7 +9,8 @@ INCLUDES = \
../../mal \
../../../gdk \
../../../common/stream \
- ../../../common/options
+ ../../../common/options \
+ ../../../common/utils
MTSAFE
diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag
--- a/monetdb5/extras/rapi/Makefile.ag
+++ b/monetdb5/extras/rapi/Makefile.ag
@@ -7,6 +7,7 @@
INCLUDES = \
../../../common/options \
../../../common/stream \
+ ../../../common/utils \
../../../gdk \
../../mal \
../../modules/kernel \
diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h
--- a/monetdb5/mal/mal_resource.h
+++ b/monetdb5/mal/mal_resource.h
@@ -10,7 +10,7 @@
#define _MAL_RESOURCE_H
#include "mal_interpreter.h"
-#include "gdk_atomic.h"
+#include "matomic.h"
#define TIMESLICE (3 * 60 * 1000 * 1000) /* usec , 3 minute high priority */
#define DELAYUNIT 2 /* ms delay in parallel processing decisions */
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -8,6 +8,7 @@ INCLUDES = ../../mal \
../atoms \
../../../common/options \
../../../common/stream \
+ ../../../common/utils \
../../../gdk
MTSAFE
diff --git a/sql/backends/monet5/UDF/capi/Makefile.ag
b/sql/backends/monet5/UDF/capi/Makefile.ag
--- a/sql/backends/monet5/UDF/capi/Makefile.ag
+++ b/sql/backends/monet5/UDF/capi/Makefile.ag
@@ -7,6 +7,7 @@
INCLUDES = \
../../../../../clients/mapilib \
../../../../../common/options \
+ ../../../../../common/utils \
../../../../../common/stream \
../../../../../monetdb5/modules/atoms \
../../../../../monetdb5/modules/mal \
diff --git a/sql/backends/monet5/UDF/pyapi/Makefile.ag
b/sql/backends/monet5/UDF/pyapi/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi/Makefile.ag
@@ -7,6 +7,7 @@
INCLUDES = \
../../../../../clients/mapilib \
../../../../../common/options \
+ ../../../../../common/utils \
../../../../../common/stream \
../../../../../monetdb5/modules/atoms \
../../../../../monetdb5/modules/mal \
diff --git a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
@@ -7,6 +7,7 @@
INCLUDES = \
../../../../../clients/mapilib \
../../../../../common/options \
+ ../../../../../common/utils \
../../../../../common/stream \
../../../../../monetdb5/modules/atoms \
../../../../../monetdb5/modules/mal \
diff --git a/sql/backends/monet5/UDF/udf/Makefile.ag
b/sql/backends/monet5/UDF/udf/Makefile.ag
--- a/sql/backends/monet5/UDF/udf/Makefile.ag
+++ b/sql/backends/monet5/UDF/udf/Makefile.ag
@@ -15,6 +15,7 @@ INCLUDES = ../.. \
../../../../../monetdb5/modules/mal \
../../../../../monetdb5/optimizer \
../../../../../common/options \
+ ../../../../../common/utils \
../../../../../common/stream \
../../../../../gdk
diff --git a/sql/backends/monet5/vaults/bam/Makefile.ag
b/sql/backends/monet5/vaults/bam/Makefile.ag
--- a/sql/backends/monet5/vaults/bam/Makefile.ag
+++ b/sql/backends/monet5/vaults/bam/Makefile.ag
@@ -17,6 +17,7 @@ INCLUDES = .. \
../../../../../monetdb5/optimizer \
../../../../../common/options \
../../../../../common/stream \
+ ../../../../../common/utils \
../../../../../gdk \
../../../../../tools/merovingian \
../../../../../tools/merovingian/daemon \
diff --git a/sql/common/Makefile.ag b/sql/common/Makefile.ag
--- a/sql/common/Makefile.ag
+++ b/sql/common/Makefile.ag
@@ -9,6 +9,7 @@
INCLUDES = .. ../include ../storage \
../../common/options \
../../common/stream \
+ ../../common/utils \
../../monetdb5/mal \
../../gdk
diff --git a/sql/server/Makefile.ag b/sql/server/Makefile.ag
--- a/sql/server/Makefile.ag
+++ b/sql/server/Makefile.ag
@@ -14,6 +14,7 @@ INCLUDES = ../include ../common ../stora
../../clients/mapilib \
../../common/options \
../../common/stream \
+ ../../common/utils \
../../gdk
AM_YFLAGS = -d -p sql -r all
diff --git a/sql/storage/Makefile.ag b/sql/storage/Makefile.ag
--- a/sql/storage/Makefile.ag
+++ b/sql/storage/Makefile.ag
@@ -13,6 +13,7 @@ SUBDIRS = bat
INCLUDES = ../include ../common \
../../common/options \
../../common/stream \
+ ../../common/utils \
../../gdk
lib_store = {
diff --git a/sql/storage/bat/Makefile.ag b/sql/storage/bat/Makefile.ag
--- a/sql/storage/bat/Makefile.ag
+++ b/sql/storage/bat/Makefile.ag
@@ -9,6 +9,7 @@
INCLUDES = .. ../../include ../../common \
../../../common/options \
../../../common/stream \
+ ../../../common/utils \
../../../gdk \
../../../monetdb5/modules/atoms \
../../../monetdb5/modules/kernel \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
