Changeset: 17546403dadb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/17546403dadb
Modified Files:
common/utils/matomic.h
monetdb5/mal/mal_dataflow.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: default
Log Message:
Get rid of ATOMIC_PTR_DESTROY. There is no implementation that needs this.
diffs (258 lines):
diff --git a/common/utils/matomic.h b/common/utils/matomic.h
--- a/common/utils/matomic.h
+++ b/common/utils/matomic.h
@@ -36,7 +36,6 @@
*
* Some of these are also available for pointers:
* ATOMIC_PTR_INIT
- * ATOMIC_PTR_DESTROY
* ATOMIC_PTR_GET
* ATOMIC_PTR_SET
* ATOMIC_PTR_XCG
@@ -130,7 +129,6 @@ typedef volatile atomic_address ATOMIC_P
typedef void *_Atomic volatile ATOMIC_PTR_TYPE;
#endif
#define ATOMIC_PTR_INIT(var, val) atomic_init(var, val)
-#define ATOMIC_PTR_DESTROY(var) ((void) 0)
#define ATOMIC_PTR_VAR_INIT(val) ATOMIC_VAR_INIT(val)
#define ATOMIC_PTR_GET(var) (*(var))
#define ATOMIC_PTR_SET(var, val) (*(var) = (void *) (val))
@@ -239,7 +237,6 @@ ATOMIC_CAS(ATOMIC_TYPE *var, ATOMIC_BASE
typedef PVOID volatile ATOMIC_PTR_TYPE;
#define ATOMIC_PTR_INIT(var, val) (*(var) = (val))
-#define ATOMIC_PTR_DESTROY(var) ((void) 0)
#define ATOMIC_PTR_VAR_INIT(val) (val)
#define ATOMIC_PTR_GET(var) (*(var))
#define ATOMIC_PTR_SET(var, val) _InterlockedExchangePointer(var,
(PVOID) (val))
@@ -288,7 +285,6 @@ typedef volatile ATOMIC_BASE_TYPE ATOMIC
typedef void *volatile ATOMIC_PTR_TYPE;
#define ATOMIC_PTR_INIT(var, val) (*(var) = (val))
#define ATOMIC_PTR_VAR_INIT(val) (val)
-#define ATOMIC_PTR_DESTROY(var) ((void) 0)
#define ATOMIC_PTR_GET(var) __atomic_load_n(var, __ATOMIC_SEQ_CST)
#define ATOMIC_PTR_SET(var, val) __atomic_store_n(var, (val),
__ATOMIC_SEQ_CST)
#define ATOMIC_PTR_XCG(var, val) __atomic_exchange_n(var, (val),
__ATOMIC_SEQ_CST)
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -494,7 +494,6 @@ DFLOWinitialize(void)
MT_sema_init(&t->s, 0, "DFLOWsema"); /* placeholder name */
if (MT_create_thread(&t->id, DFLOWworker, t,
MT_THR_JOINABLE,
"DFLOWworkerXXXX") < 0) {
- ATOMIC_PTR_DESTROY(&t->cntxt);
MT_sema_destroy(&t->s);
GDKfree(t);
} else {
@@ -756,7 +755,6 @@ finish_worker(struct worker *t)
MT_lock_unset(&dataflowLock);
MT_join_thread(t->id);
MT_sema_destroy(&t->s);
- ATOMIC_PTR_DESTROY(&t->cntxt);
GDKfree(t);
MT_lock_set(&dataflowLock);
}
@@ -835,7 +833,6 @@ runMALdataflow(Client cntxt, MalBlkPtr m
MT_sema_init(&t->s, 0, "DFLOWsema"); /* placeholder
name */
if (MT_create_thread(&t->id, DFLOWworker, t,
MT_THR_JOINABLE, "DFLOWworkerXXXX") < 0) {
- ATOMIC_PTR_DESTROY(&t->cntxt);
MT_sema_destroy(&t->s);
GDKfree(t);
t = NULL;
@@ -905,7 +902,6 @@ runMALdataflow(Client cntxt, MalBlkPtr m
GDKfree(flow->nodes);
q_destroy(flow->done);
MT_lock_destroy(&flow->flowlock);
- ATOMIC_PTR_DESTROY(&flow->error);
GDKfree(flow);
/* we created one worker, now tell one worker to exit again */
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
@@ -141,7 +141,6 @@ tc_gc_seg( sql_store Store, sql_change *
if (s->ts <= oldest) {
while(s) {
segment *n = s->prev;
- ATOMIC_PTR_DESTROY(&s->next);
_DELETE(s);
s = n;
}
@@ -453,7 +452,6 @@ merge_segments(storage *s, sql_trans *tr
if (cur == s->segs->t)
s->segs->t = seg;
if (commit_ts == oldest) {
- ATOMIC_PTR_DESTROY(&cur->next);
_DELETE(cur);
} else
mark4destroy(cur, change,
commit_ts);
@@ -2549,7 +2547,6 @@ destroy_segments(segments *s)
segment *seg = s->h;
while(seg) {
segment *n = ATOMIC_PTR_GET(&seg->next);
- ATOMIC_PTR_DESTROY(&seg->next);
_DELETE(seg);
seg = n;
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -177,7 +177,6 @@ idx_destroy(sqlstore *store, sql_idx * i
if (ATOMIC_PTR_GET(&i->data))
store->storage_api.destroy_idx(store, i);
- ATOMIC_PTR_DESTROY(&i->data);
_DELETE(i->base.name);
_DELETE(i);
}
@@ -209,7 +208,6 @@ column_destroy(sqlstore *store, sql_colu
return;
if (ATOMIC_PTR_GET(&c->data))
store->storage_api.destroy_col(store, c);
- ATOMIC_PTR_DESTROY(&c->data);
_DELETE(c->min);
_DELETE(c->max);
_DELETE(c->def);
@@ -233,7 +231,6 @@ table_destroy(sqlstore *store, sql_table
return;
if (isTable(t))
store->storage_api.destroy_del(store, t);
- ATOMIC_PTR_DESTROY(&t->data);
/* cleanup its parts */
list_destroy2(t->members, store);
ol_destroy(t->idxs, store);
@@ -776,7 +773,6 @@ load_table(sql_trans *tr, sql_schema *s,
if (isTable(t)) {
if (store->storage_api.create_del(tr, t) != LOG_OK) {
TRC_ERROR(SQL_STORE, "Load table '%s' is missing
'deletes'", t->base.name);
- ATOMIC_PTR_DESTROY(&t->data);
return NULL;
}
}
@@ -3053,7 +3049,6 @@ column_dup(sql_trans *tr, sql_column *oc
if (isTable(c->t)) {
if (isTempTable(c->t)) {
if ((res = store->storage_api.create_col(tr, c))) {
- ATOMIC_PTR_DESTROY(&c->data);
return res;
}
} else {
@@ -3146,7 +3141,6 @@ idx_dup(sql_trans *tr, sql_idx * i, sql_
if (isTable(i->t)) {
if (isTempTable(i->t)) {
if ((res = store->storage_api.create_idx(tr, ni))) {
- ATOMIC_PTR_DESTROY(&ni->data);
return res;
}
} else {
@@ -3160,7 +3154,6 @@ idx_dup(sql_trans *tr, sql_idx * i, sql_
list_append(ni->columns, kc_dup(okc, t));
}
if (isGlobal(t) && (res = os_add(t->s->idxs, tr, ni->base.name,
dup_base(&ni->base)))) {
- ATOMIC_PTR_DESTROY(&ni->data);
return res;
}
*ires = ni;
@@ -3330,7 +3323,6 @@ table_dup(sql_trans *tr, sql_table *ot,
cleanup:
if (res) {
- ATOMIC_PTR_DESTROY(&t->data);
t = NULL;
}
*tres = t;
@@ -3598,12 +3590,10 @@ sql_trans_copy_idx( sql_trans *tr, sql_t
if (isDeclaredTable(i->t))
if (!isDeclaredTable(t) && isTable(ni->t) &&
idx_has_column(ni->type))
if ((res = store->storage_api.create_idx(tr, ni))) {
- ATOMIC_PTR_DESTROY(&ni->data);
return res;
}
if (!isDeclaredTable(t))
if ((res = store->table_api.table_insert(tr, sysidx,
&ni->base.id, &t->base.id, &ni->type, &ni->base.name))) {
- ATOMIC_PTR_DESTROY(&ni->data);
return res;
}
@@ -3735,7 +3725,6 @@ sql_trans_copy_column( sql_trans *tr, sq
if (isDeclaredTable(c->t))
if (isTable(t))
if ((res = store->storage_api.create_col(tr, col))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
@@ -3746,16 +3735,13 @@ sql_trans_copy_column( sql_trans *tr, sq
&digits, &col->type.scale, &t->base.id,
(col->def) ? &col->def : &strnil,
&col->null, &col->colnr,
(col->storage_type) ?
&col->storage_type : &strnil))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
if (c->type.type->s) { /* column depends on type */
if ((res = sql_trans_create_dependency(tr,
c->type.type->base.id, col->base.id, TYPE_DEPENDENCY))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
if (!isNew(c->type.type) && (res =
sql_trans_add_dependency(tr, c->type.type->base.id, ddl))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
}
@@ -5926,7 +5912,6 @@ sql_trans_create_table(sql_table **tres,
if (isTable(t))
if ((res = store->storage_api.create_del(tr, t))) {
- ATOMIC_PTR_DESTROY(&t->data);
return res;
}
if (isPartitionedByExpressionTable(t)) {
@@ -5940,7 +5925,6 @@ sql_trans_create_table(sql_table **tres,
char *strnil = (char*)ATOMnilptr(TYPE_str);
if ((res = store->table_api.table_insert(tr, systable,
&t->base.id, &t->base.name, &s->base.id,
(t->query) ? &t->query : &strnil, &t->type, &t->system, &ca, &t->access))) {
- ATOMIC_PTR_DESTROY(&t->data);
return res;
}
}
@@ -6200,7 +6184,6 @@ sql_trans_create_column(sql_column **rco
if (isTable(col->t))
if ((res = store->storage_api.create_col(tr, col))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
if (!isDeclaredTable(t)) {
@@ -6208,18 +6191,15 @@ sql_trans_create_column(sql_column **rco
int digits = type_digits(&col->type);
if ((res = store->table_api.table_insert(tr, syscolumn,
&col->base.id, &col->base.name, &col->type.type->base.name, &digits,
&col->type.scale,
&t->base.id, (col->def) ? &col->def : &strnil, &col->null, &col->colnr,
(col->storage_type) ? &col->storage_type : &strnil))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
}
if (tpe->type->s) {/* column depends on type */
if ((res = sql_trans_create_dependency(tr, tpe->type->base.id,
col->base.id, TYPE_DEPENDENCY))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
if (!isNew(tpe->type) && (res = sql_trans_add_dependency(tr,
tpe->type->base.id, ddl))) {
- ATOMIC_PTR_DESTROY(&col->data);
return res;
}
}
@@ -6903,12 +6883,10 @@ sql_trans_create_idx(sql_idx **i, sql_tr
ATOMIC_PTR_INIT(&ni->data, NULL);
if (!isDeclaredTable(t) && isTable(ni->t) && idx_has_column(ni->type))
if ((res = store->storage_api.create_idx(tr, ni))) {
- ATOMIC_PTR_DESTROY(&ni->data);
return res;
}
if (!isDeclaredTable(t))
if ((res = store->table_api.table_insert(tr, sysidx,
&ni->base.id, &t->base.id, &ni->type, &ni->base.name))) {
- ATOMIC_PTR_DESTROY(&ni->data);
return res;
}
*i = ni;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
