Changeset: 67aed30eec9b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67aed30eec9b
Modified Files:
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_resource.c
Branch: Jan2014
Log Message:
Add (void) casts to ATOMIC instructions where we don't use the result.
GCC 4.1.2 in strict mode complains otherwise.
diffs (121 lines):
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -219,17 +219,17 @@ gdk_export ATOMIC_FLAG volatile GDKlockl
gdk_export ATOMIC_TYPE volatile GDKlockcnt;
gdk_export ATOMIC_TYPE volatile GDKlockcontentioncnt;
gdk_export ATOMIC_TYPE volatile GDKlocksleepcnt;
-#define _DBG_LOCK_COUNT_0(l, n) ATOMIC_INC(GDKlockcnt, dummy, n)
+#define _DBG_LOCK_COUNT_0(l, n) (void) ATOMIC_INC(GDKlockcnt,
dummy, n)
#define _DBG_LOCK_LOCKER(l, n) ((l)->locker = (n))
#define _DBG_LOCK_CONTENTION(l, n) \
do { \
TEMDEBUG fprintf(stderr, "#lock %s contention in %s\n",
(l)->name, n); \
- ATOMIC_INC(GDKlockcontentioncnt, dummy, n); \
+ (void) ATOMIC_INC(GDKlockcontentioncnt, dummy, n);
\
} while (0)
#define _DBG_LOCK_SLEEP(l, n) \
do { \
if (_spincnt == 1024) \
- ATOMIC_INC(GDKlocksleepcnt, dummy, n); \
+ (void) ATOMIC_INC(GDKlocksleepcnt, dummy, n); \
} while (0)
#define _DBG_LOCK_COUNT_1(l) \
do { \
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -461,24 +461,24 @@ GDKvm_cursize(void)
do { \
int _idx; \
\
- ATOMIC_ADD(GDK_mallocedbytes_estimate, _memdelta, mbyteslock,
"heapinc"); \
+ (void) ATOMIC_ADD(GDK_mallocedbytes_estimate, _memdelta,
mbyteslock, "heapinc"); \
GDKmallidx(_idx, _memdelta); \
- ATOMIC_INC(GDK_nmallocs[_idx], mbyteslock, "heapinc"); \
+ (void) ATOMIC_INC(GDK_nmallocs[_idx], mbyteslock, "heapinc");
\
} while (0)
#define heapdec(memdelta) \
do { \
ssize_t _memdelta = (ssize_t) (memdelta); \
int _idx; \
\
- ATOMIC_SUB(GDK_mallocedbytes_estimate, _memdelta, mbyteslock,
"heapdec"); \
+ (void) ATOMIC_SUB(GDK_mallocedbytes_estimate, _memdelta,
mbyteslock, "heapdec"); \
GDKmallidx(_idx, _memdelta); \
- ATOMIC_DEC(GDK_nmallocs[_idx], mbyteslock, "heapdec"); \
+ (void) ATOMIC_DEC(GDK_nmallocs[_idx], mbyteslock, "heapdec");
\
} while (0)
#else
#define heapinc(_memdelta) \
- ATOMIC_ADD(GDK_mallocedbytes_estimate, _memdelta, mbyteslock, "heapinc")
+ (void) ATOMIC_ADD(GDK_mallocedbytes_estimate, _memdelta, mbyteslock,
"heapinc")
#define heapdec(_memdelta) \
- ATOMIC_SUB(GDK_mallocedbytes_estimate, _memdelta, mbyteslock, "heapdec")
+ (void) ATOMIC_SUB(GDK_mallocedbytes_estimate, _memdelta, mbyteslock,
"heapdec")
#endif
#ifdef GDK_VM_KEEPHISTO
@@ -488,8 +488,8 @@ GDKvm_cursize(void)
int _idx; \
\
GDKmallidx(_idx, _vmdelta); \
- ATOMIC_INC(GDK_vm_nallocs[_idx], mbyteslock, fcn); \
- 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,14 +497,14 @@ GDKvm_cursize(void)
int _idx; \
\
GDKmallidx(_idx, _vmdelta); \
- ATOMIC_DEC(GDK_vm_nallocs[_idx], mbyteslock, fcn); \
- 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) \
- ATOMIC_ADD(GDK_vm_cursize, (ssize_t) SEG_SIZE((vmdelta), MT_VMUNITLOG),
mbyteslock, fcn)
+ (void) ATOMIC_ADD(GDK_vm_cursize, (ssize_t) SEG_SIZE((vmdelta),
MT_VMUNITLOG), mbyteslock, fcn)
#define memdec(vmdelta, fcn) \
- ATOMIC_SUB(GDK_vm_cursize, (ssize_t) SEG_SIZE((vmdelta), MT_VMUNITLOG),
mbyteslock, fcn)
+ (void) ATOMIC_SUB(GDK_vm_cursize, (ssize_t) SEG_SIZE((vmdelta),
MT_VMUNITLOG), mbyteslock, fcn)
#endif
#ifndef STATIC_CODE_ANALYSIS
diff --git a/monetdb5/mal/mal_recycle.c b/monetdb5/mal/mal_recycle.c
--- a/monetdb5/mal/mal_recycle.c
+++ b/monetdb5/mal/mal_recycle.c
@@ -869,7 +869,7 @@ RECYCLEentry(Client cntxt, MalBlkPtr mb,
{
int i=0;
- ATOMIC_INC(statements, statementsLock, "RECYCLEentry");
+ (void) ATOMIC_INC(statements, statementsLock, "RECYCLEentry");
if ( !RECYCLEinterest(p) ) /* don't scan RecyclerPool for
non-monitored instructions */
return 0;
if ( recycleBlk == NULL ){
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -202,7 +202,7 @@ MALresourceFairness(lng usec)
if ( clk > DELAYUNIT ) {
PARDEBUG mnstr_printf(GDKstdout, "#delay initial "LLFMT"n",
clk);
- ATOMIC_DEC(running, runningLock, "MALresourceFairness");
+ (void) ATOMIC_DEC(running, runningLock, "MALresourceFairness");
/* always keep one running to avoid all waiting */
while (clk > 0 && running >= 2 && delayed < MAX_DELAYS) {
/* speed up wake up when we have memory */
@@ -220,7 +220,7 @@ MALresourceFairness(lng usec)
} else break;
clk -= DELAYUNIT;
}
- ATOMIC_INC(running, runningLock, "MALresourceFairness");
+ (void) ATOMIC_INC(running, runningLock, "MALresourceFairness");
}
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
