Changeset: 473050ca02c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=473050ca02c7
Modified Files:
gdk/gdk_system.h
gdk/gdk_utils.c
Branch: Jan2014
Log Message:
Layout.
diffs (62 lines):
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -224,11 +224,11 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
#define _DBG_LOCK_CONTENTION(l, n) \
do { \
TEMDEBUG fprintf(stderr, "#lock %s contention in %s\n",
(l)->name, n); \
- (void) ATOMIC_INC(GDKlockcontentioncnt, dummy, n);
\
+ (void) ATOMIC_INC(GDKlockcontentioncnt, dummy, n); \
} while (0)
-#define _DBG_LOCK_SLEEP(l, n) \
- do { \
- if (_spincnt == 1024) \
+#define _DBG_LOCK_SLEEP(l, n) \
+ do { \
+ if (_spincnt == 1024) \
(void) ATOMIC_INC(GDKlocksleepcnt, dummy, n); \
} while (0)
#define _DBG_LOCK_COUNT_1(l) \
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -463,7 +463,7 @@ GDKvm_cursize(void)
\
(void) ATOMIC_ADD(GDK_mallocedbytes_estimate, _memdelta,
mbyteslock, "heapinc"); \
GDKmallidx(_idx, _memdelta); \
- (void) ATOMIC_INC(GDK_nmallocs[_idx], mbyteslock, "heapinc");
\
+ (void) ATOMIC_INC(GDK_nmallocs[_idx], mbyteslock, "heapinc"); \
} while (0)
#define heapdec(memdelta) \
do { \
@@ -472,7 +472,7 @@ GDKvm_cursize(void)
\
(void) ATOMIC_SUB(GDK_mallocedbytes_estimate, _memdelta,
mbyteslock, "heapdec"); \
GDKmallidx(_idx, _memdelta); \
- (void) ATOMIC_DEC(GDK_nmallocs[_idx], mbyteslock, "heapdec");
\
+ (void) ATOMIC_DEC(GDK_nmallocs[_idx], mbyteslock, "heapdec"); \
} while (0)
#else
#define heapinc(_memdelta) \
@@ -488,8 +488,8 @@ GDKvm_cursize(void)
int _idx; \
\
GDKmallidx(_idx, _vmdelta); \
- (void) ATOMIC_INC(GDK_vm_nallocs[_idx], mbyteslock, fcn);
\
- (void) ATOMIC_ADD(GDK_vm_cursize, _vmdelta, mbyteslock, fcn);
\
+ (void) ATOMIC_INC(GDK_vm_nallocs[_idx], mbyteslock, fcn); \
+ (void) ATOMIC_ADD(GDK_vm_cursize, _vmdelta, mbyteslock, fcn); \
} while (0)
#define memdec(vmdelta, fcn) \
do { \
@@ -497,8 +497,8 @@ GDKvm_cursize(void)
int _idx; \
\
GDKmallidx(_idx, _vmdelta); \
- (void) ATOMIC_DEC(GDK_vm_nallocs[_idx], mbyteslock, fcn);
\
- (void) ATOMIC_SUB(GDK_vm_cursize, _vmdelta, mbyteslock, fcn);
\
+ (void) ATOMIC_DEC(GDK_vm_nallocs[_idx], mbyteslock, fcn); \
+ (void) ATOMIC_SUB(GDK_vm_cursize, _vmdelta, mbyteslock, fcn); \
} while (0)
#else
#define meminc(vmdelta, fcn) \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
