Changeset: a860e78c6ec8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a860e78c6ec8
Modified Files:
common/utils/matomic.h
gdk/gdk_bat.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_rtree.c
gdk/gdk_strimps.c
gdk/gdk_system.c
gdk/gdk_system.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_instruction.c
sql/storage/bat/bat_storage.c
sql/storage/objectset.c
sql/storage/store.c
Branch: default
Log Message:
Get rid of ATOMIC_DESTROY. All versions were just ((void)0).
diffs (232 lines):
diff --git a/common/utils/matomic.h b/common/utils/matomic.h
--- a/common/utils/matomic.h
+++ b/common/utils/matomic.h
@@ -18,7 +18,6 @@
* The following operations are defined:
* ATOMIC_VAR_INIT -- initializer for the variable (not necessarily atomic!);
* ATOMIC_INIT -- initialize the variable (not necessarily atomic!);
- * ATOMIC_DESTROY -- destroy the variable
* ATOMIC_GET -- return the value of a variable;
* ATOMIC_SET -- set the value of a variable;
* ATOMIC_XCG -- set the value of a variable, return original value;
@@ -114,7 +113,6 @@ typedef unsigned long ATOMIC_BASE_TYPE;
#endif
#define ATOMIC_INIT(var, val) atomic_init(var, (ATOMIC_BASE_TYPE) (val))
-#define ATOMIC_DESTROY(var) ((void) 0)
#define ATOMIC_GET(var) ((ATOMIC_BASE_TYPE) *(var))
#define ATOMIC_SET(var, val) (*(var) = (ATOMIC_BASE_TYPE) (val))
#define ATOMIC_XCG(var, val) atomic_exchange(var, (ATOMIC_BASE_TYPE) (val))
@@ -173,7 +171,6 @@ typedef __declspec(align(8)) volatile AT
#define ATOMIC_VAR_INIT(val) (val)
#define ATOMIC_INIT(var, val) (*(var) = (val))
-#define ATOMIC_DESTROY(var) ((void) 0)
#if SIZEOF_SIZE_T == 8
@@ -276,7 +273,6 @@ typedef volatile ATOMIC_BASE_TYPE ATOMIC
#define ATOMIC_VAR_INIT(val) (val)
#define ATOMIC_INIT(var, val) (*(var) = (val))
-#define ATOMIC_DESTROY(var) ((void) 0)
#define ATOMIC_GET(var) ((ATOMIC_BASE_TYPE)
__atomic_load_n(var, __ATOMIC_SEQ_CST))
#define ATOMIC_SET(var, val) __atomic_store_n(var, (ATOMIC_BASE_TYPE) (val),
__ATOMIC_SEQ_CST)
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -708,7 +708,6 @@ void
BATdestroy(BAT *b)
{
if (b->tvheap) {
- ATOMIC_DESTROY(&b->tvheap->refs);
GDKfree(b->tvheap);
}
PROPdestroy_nolock(b);
@@ -716,7 +715,6 @@ BATdestroy(BAT *b)
MT_lock_destroy(&b->batIdxLock);
MT_rwlock_destroy(&b->thashlock);
if (b->theap) {
- ATOMIC_DESTROY(&b->theap->refs);
GDKfree(b->theap);
}
if (b->oldtail) {
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -697,7 +697,6 @@ HEAPdecref(Heap *h, bool remove)
//printf("dec ref(%d) %p %d\n", (int)h->refs, h, h->parentid);
switch (refs & HEAPREFS) {
case 0:
- ATOMIC_DESTROY(&h->refs);
HEAPfree(h, (bool) (refs & HEAPREMOVE));
GDKfree(h);
break;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -837,7 +837,6 @@ IMPSdecref(Imprints *imprints, bool remo
ATOMIC_OR(&imprints->imprints.refs, HEAPREMOVE);
ATOMIC_BASE_TYPE refs = ATOMIC_DEC(&imprints->imprints.refs);
if ((refs & HEAPREFS) == 0) {
- ATOMIC_DESTROY(&imprints->imprints.refs);
HEAPfree(&imprints->imprints, (bool) (refs & HEAPREMOVE));
GDKfree(imprints);
}
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2319,8 +2319,6 @@ log_load(const char *fn, const char *log
logbat_destroy(lg->seqs_id);
logbat_destroy(lg->seqs_val);
logbat_destroy(lg->dseqs);
- ATOMIC_DESTROY(&lg->current->refcount);
- ATOMIC_DESTROY(&lg->nr_flushers);
MT_lock_destroy(&lg->lock);
MT_lock_destroy(&lg->rotation_lock);
GDKfree(lg->fn);
@@ -2462,10 +2460,6 @@ log_destroy(logger *lg)
log_close_output(lg);
for (logged_range * p = lg->pending; p; p = lg->pending) {
lg->pending = p->next;
- ATOMIC_DESTROY(&p->refcount);
- ATOMIC_DESTROY(&p->last_ts);
- ATOMIC_DESTROY(&p->flushed_ts);
- ATOMIC_DESTROY(&p->drops);
GDKfree(p);
}
if (LOG_DISABLED(lg)) {
@@ -2500,7 +2494,6 @@ log_destroy(logger *lg)
MT_lock_destroy(&lg->lock);
MT_lock_destroy(&lg->rotation_lock);
MT_lock_destroy(&lg->flush_lock);
- ATOMIC_DESTROY(&lg->nr_flushers);
GDKfree(lg->fn);
GDKfree(lg->dir);
GDKfree(lg->rbuf);
diff --git a/gdk/gdk_rtree.c b/gdk/gdk_rtree.c
--- a/gdk/gdk_rtree.c
+++ b/gdk/gdk_rtree.c
@@ -61,7 +61,6 @@ RTREEdecref(BAT *b)
ATOMIC_BASE_TYPE refs = ATOMIC_DEC(&b->trtree->refs);
//If RTree is marked for destruction and there are no refs, destroy the
RTree
if (b->trtree->destroy && refs == 0) {
- ATOMIC_DESTROY(&b->trtree->refs);
rtree_destroy(b->trtree->rtree);
b->trtree->rtree = NULL;
GDKfree(b->trtree);
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -994,7 +994,6 @@ STRMPdecref(Strimps *strimps, bool remov
TRC_DEBUG(ACCELERATOR, "Decrement ref count of %s to " BUNFMT "\n",
strimps->strimps.filename, (BUN) (refs & HEAPREFS));
if ((refs & HEAPREFS) == 0) {
- ATOMIC_DESTROY(&strimps->strimps.refs);
HEAPfree(&strimps->strimps, (bool) (refs & HEAPREMOVE));
GDKfree(strimps->masks);
GDKfree(strimps);
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -320,7 +320,6 @@ rm_mtthread(struct mtthread *t)
;
if (*pt)
*pt = t->next;
- ATOMIC_DESTROY(&t->exited);
free(t);
thread_unlock();
}
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -323,8 +323,6 @@ gdk_export char *GDKgetbuf(void);
else if (GDKlocklist == (l)) \
GDKlocklist = (l)->next; \
ATOMIC_CLEAR(&GDKlocklistlock); \
- ATOMIC_DESTROY(&(l)->contention); \
- ATOMIC_DESTROY(&(l)->sleep); \
} while (0)
#else
@@ -575,7 +573,6 @@ typedef struct MT_RWLock {
#define MT_rwlock_destroy(l) \
do { \
pthread_mutex_destroy(&(l)->lock); \
- ATOMIC_DESTROY(&(l)->readers); \
} while (0)
#define MT_rwlock_rdlock(l) \
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -61,11 +61,6 @@ void
mal_client_reset(void)
{
if (mal_clients) {
- for (int i = 0; i < MAL_MAXCLIENTS; i++) {
- ATOMIC_DESTROY(&mal_clients[i].lastprint);
- ATOMIC_DESTROY(&mal_clients[i].workers);
- ATOMIC_DESTROY(&mal_clients[i].qryctx.datasize);
- }
GDKfree(mal_clients);
mal_clients = NULL;
}
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -289,7 +289,6 @@ freeMalBlk(MalBlkPtr mb)
mb->inlineProp = 0;
mb->unsafeProp = 0;
freeException(mb->errors);
- ATOMIC_DESTROY(&mb->workers);
GDKfree(mb);
}
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1969,7 +1969,6 @@ destroy_delta(sql_delta *b, bool recursi
temp_destroy(b->cs.bid);
if (b->cs.ebid)
temp_destroy(b->cs.ebid);
- ATOMIC_DESTROY(&b->cs.refcnt);
b->cs.bid = b->cs.ebid = b->cs.uibid = b->cs.uvbid = 0;
_DELETE(b);
}
@@ -2596,7 +2595,6 @@ destroy_storage(storage *bat)
temp_destroy(bat->cs.uvbid);
if (bat->cs.bid)
temp_destroy(bat->cs.bid);
- ATOMIC_DESTROY(&bat->cs.refcnt);
bat->cs.bid = bat->cs.uibid = bat->cs.uvbid = 0;
_DELETE(bat);
}
diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -686,7 +686,6 @@ os_destroy(objectset *os, sql_store stor
if (ATOMIC_DEC(&os->refcnt) > 0)
return;
MT_rwlock_destroy(&os->rw_lock);
- ATOMIC_DESTROY(&os->refcnt);
versionhead* n=os->id_based_h;
while(n) {
objectversion *ov = n->ov;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2305,12 +2305,6 @@ store_exit(sqlstore *store)
MT_lock_unset(&store->flush);
MT_lock_unset(&store->lock);
sa_destroy(sa);
- ATOMIC_DESTROY(&store->nr_active);
- ATOMIC_DESTROY(&store->lastactive);
- ATOMIC_DESTROY(&store->timestamp);
- ATOMIC_DESTROY(&store->transaction);
- ATOMIC_DESTROY(&store->function_counter);
- ATOMIC_DESTROY(&store->oldest);
MT_lock_destroy(&store->lock);
MT_lock_destroy(&store->commit);
MT_lock_destroy(&store->flush);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
