Changeset: 2489a4260ace for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2489a4260ace
Modified Files:
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_search.c
Branch: default
Log Message:
Remove superfluous masking.
The macro already does the masking with BBP_BATMASK/BBP_THREADMASK.
No reason to do that twice.
diffs (106 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1917,11 +1917,11 @@ BUNlocate(BAT *b, const void *x, const v
v = BATmirror(v);
}
if (v->H->hash) {
- MT_lock_set(&GDKhashLock(ABS(b->batCacheid) &
BBP_BATMASK), "BUNlocate");
+ MT_lock_set(&GDKhashLock(ABS(b->batCacheid)),
"BUNlocate");
if (b->H->hash == NULL) { /* give it to
the parent */
b->H->hash = v->H->hash;
}
- MT_lock_unset(&GDKhashLock(ABS(b->batCacheid) &
BBP_BATMASK), "BUNlocate");
+ MT_lock_unset(&GDKhashLock(ABS(b->batCacheid)),
"BUNlocate");
}
BBPreclaim(v);
v = NULL;
@@ -2777,7 +2777,7 @@ BATmode(BAT *b, int mode)
} else if (b->batPersistence == PERSISTENT) {
BBPdecref(bid, TRUE);
}
- MT_lock_set(&GDKswapLock(bid & BBP_BATMASK), "BATmode");
+ MT_lock_set(&GDKswapLock(bid), "BATmode");
if (mode == PERSISTENT) {
if (!(BBP_status(bid) & BBPDELETED))
BBP_status_on(bid, BBPNEW, "BATmode");
@@ -2799,7 +2799,7 @@ BATmode(BAT *b, int mode)
}
}
b->batPersistence = mode;
- MT_lock_unset(&GDKswapLock(bid & BBP_BATMASK), "BATmode");
+ MT_lock_unset(&GDKswapLock(bid), "BATmode");
}
return b;
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -299,8 +299,8 @@ BBPinithash(void)
BBP_insert(-i);
}
} else {
- BBP_next(i) = BBP_free(i & BBP_THREADMASK);
- BBP_free(i & BBP_THREADMASK) = i;
+ BBP_next(i) = BBP_free(i);
+ BBP_free(i) = i;
}
}
}
@@ -3126,7 +3126,7 @@ BBPcold(bat i)
MT_Id pid = BBP_getpid();
int lock = locked_by ? pid != locked_by : 1;
- MT_lock_set(&GDKtrimLock(pid & BBP_THREADMASK), "BBPcold");
+ MT_lock_set(&GDKtrimLock(pid), "BBPcold");
if (lock)
MT_lock_set(&GDKswapLock(i), "BBPcold");
/* make very cold and insert on top of trim list */
@@ -3139,7 +3139,7 @@ BBPcold(bat i)
}
if (lock)
MT_lock_unset(&GDKswapLock(i), "BBPcold");
- MT_lock_unset(&GDKtrimLock(pid & BBP_THREADMASK), "BBPcold");
+ MT_lock_unset(&GDKtrimLock(pid), "BBPcold");
}
}
diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c
--- a/gdk/gdk_search.c
+++ b/gdk/gdk_search.c
@@ -177,7 +177,7 @@ BAThash(BAT *b, BUN masksize)
o = NULL;
}
}
- MT_lock_set(&GDKhashLock(ABS(b->batCacheid) & BBP_BATMASK), "BAThash");
+ MT_lock_set(&GDKhashLock(ABS(b->batCacheid)), "BAThash");
if (b->H->hash == NULL) {
unsigned int tpe = ATOMstorage(b->htype);
BUN cnt = BATcount(b);
@@ -196,7 +196,7 @@ BAThash(BAT *b, BUN masksize)
if (b->htype == TYPE_void) {
if (b->hseqbase == oid_nil) {
- MT_lock_unset(&GDKhashLock(ABS(b->batCacheid) &
BBP_BATMASK), "BAThash");
+ MT_lock_unset(&GDKhashLock(ABS(b->batCacheid)),
"BAThash");
ALGODEBUG fprintf(stderr, "#BAThash: cannot
create hash-table on void-NIL column.\n");
return NULL;
}
@@ -246,7 +246,7 @@ BAThash(BAT *b, BUN masksize)
if (hp == NULL ||
hp->filename == NULL ||
(h = HASHnew(hp, ATOMtype(b->htype),
BATcapacity(b), mask)) == NULL) {
- MT_lock_unset(&GDKhashLock(ABS(b->batCacheid) &
BBP_BATMASK), "BAThash");
+ MT_lock_unset(&GDKhashLock(ABS(b->batCacheid)),
"BAThash");
if (hp != NULL) {
GDKfree(hp->filename);
GDKfree(hp);
@@ -313,7 +313,7 @@ BAThash(BAT *b, BUN masksize)
}
b->H->hash = h;
}
- MT_lock_unset(&GDKhashLock(ABS(b->batCacheid) & BBP_BATMASK),
"BAThash");
+ MT_lock_unset(&GDKhashLock(ABS(b->batCacheid)), "BAThash");
if (o != NULL) {
o->H->hash = b->H->hash;
BBPunfix(b->batCacheid);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
