Changeset: 65a387eae665 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a387eae665
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_tm.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/bbp.c
Branch: Jun2016
Log Message:
Removed unused function argument.
diffs (truncated from 342 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -187,7 +187,7 @@ int BBPincref(bat b, int logical);
bat BBPindex(const char *nme);
void BBPkeepref(bat i);
bat BBPlimit;
-void BBPlock(const char *s);
+void BBPlock(void);
str BBPlogical(bat b, str buf);
int BBPout;
str BBPphysical(bat b, str buf);
@@ -198,7 +198,7 @@ void BBPresetfarms(void);
gdk_return BBPsave(BAT *b);
void BBPshare(bat b);
gdk_return BBPsync(int cnt, bat *subcommit);
-void BBPunlock(const char *s);
+void BBPunlock(void);
gdk_return BUNappend(BAT *b, const void *right, bit force);
gdk_return BUNdelete(BAT *b, oid o);
BUN BUNfnd(BAT *b, const void *right);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1748,11 +1748,11 @@ gdk_export int BBPcurstamp(void);
#define BBPRENAME_ILLEGAL (-2)
#define BBPRENAME_LONG (-3)
-gdk_export void BBPlock(const char *s);
+gdk_export void BBPlock(void);
gdk_export void BBPhot(bat b);
gdk_export void BBPcold(bat b);
-gdk_export void BBPunlock(const char *s);
+gdk_export void BBPunlock(void);
gdk_export str BBPlogical(bat b, str buf);
gdk_export str BBPphysical(bat b, str buf);
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -262,12 +262,11 @@ static int BBPunloadCnt = 0;
static MT_Lock GDKunloadLock MT_LOCK_INITIALIZER("GDKunloadLock");
void
-BBPlock(const char *nme)
+BBPlock(void)
{
int i;
/* wait for all pending unloads to finish */
- (void) nme;
MT_lock_set(&GDKunloadLock);
while (BBPunloadCnt > 0) {
MT_lock_unset(&GDKunloadLock);
@@ -288,11 +287,10 @@ BBPlock(const char *nme)
}
void
-BBPunlock(const char *nme)
+BBPunlock(void)
{
int i;
- (void) nme;
for (i = BBP_BATMASK; i >= 0; i--)
MT_lock_unset(&GDKswapLock(i));
for (i = BBP_THREADMASK; i >= 0; i--)
@@ -1297,7 +1295,7 @@ void
BBPresetfarms(void)
{
BBPexit();
- BBPunlock("BBPexit");
+ BBPunlock();
BBPsize = 0;
if (BBPfarms[0].dirname != NULL) {
GDKfree((void*) BBPfarms[0].dirname);
@@ -1434,7 +1432,7 @@ BBPexit(void)
bat i;
int skipped;
- BBPlock("BBPexit"); /* stop all threads ever touching more
descriptors */
+ BBPlock(); /* stop all threads ever touching more descriptors */
/* free all memory (just for leak-checking in Purify) */
do {
@@ -4263,7 +4261,7 @@ BBPatom_drop(int atom)
const char *nme = ATOMname(atom);
int unknown = ATOMunknown_add(nme);
- BBPlock("BBPatom_drop");
+ BBPlock();
for (i = 0; i < (bat) ATOMIC_GET(BBPsize, BBPsizeLock); i++) {
if (BBPvalid(i)) {
BATstore *b = BBP_desc(i);
@@ -4277,7 +4275,7 @@ BBPatom_drop(int atom)
b->B.ttype = unknown;
}
}
- BBPunlock("BBPatom_drop");
+ BBPunlock();
}
void
@@ -4286,7 +4284,7 @@ BBPatom_load(int atom)
const char *nme;
int i, unknown;
- BBPlock("BBPatom_load");
+ BBPlock();
nme = ATOMname(atom);
unknown = ATOMunknown_find(nme);
ATOMunknown_del(unknown);
@@ -4303,7 +4301,7 @@ BBPatom_load(int atom)
b->B.ttype = atom;
}
}
- BBPunlock("BBPatom_load");
+ BBPunlock();
}
#endif
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -134,13 +134,13 @@ TMcommit(void)
gdk_return ret = GDK_FAIL;
/* commit with the BBP globally locked */
- BBPlock("TMcommit");
+ BBPlock();
if (prelude(getBBPsize(), NULL) == GDK_SUCCEED &&
BBPsync(getBBPsize(), NULL) == GDK_SUCCEED) {
epilogue(getBBPsize(), NULL);
ret = GDK_SUCCEED;
}
- BBPunlock("TMcommit");
+ BBPunlock();
return ret;
}
@@ -240,7 +240,7 @@ TMabort(void)
{
int i;
- BBPlock("TMabort");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++) {
if (BBP_status(i) & BBPNEW) {
BAT *b = BBPquickdesc(i, FALSE);
@@ -292,6 +292,6 @@ TMabort(void)
}
BBP_status_off(i, BBPDELETED | BBPSWAPPED | BBPNEW, "TMabort");
}
- BBPunlock("TMabort");
+ BBPunlock();
GDKclrerr();
}
diff --git a/monetdb5/modules/kernel/status.c b/monetdb5/modules/kernel/status.c
--- a/monetdb5/modules/kernel/status.c
+++ b/monetdb5/modules/kernel/status.c
@@ -290,7 +290,7 @@ SYSmem_usage(bat *ret, bat *ret2, const
}
BATseqbase(b,0);
BATseqbase(bn,0);
- BBPlock("SYSmem_usage");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++) {
BAT *c = BBPquickdesc(i,0);
str s;
@@ -381,7 +381,7 @@ SYSmem_usage(bat *ret, bat *ret2, const
BUNappend(bn, "_tot/swapmem", FALSE);
BUNappend(b, &tot, FALSE);
- BBPunlock("SYSmem_usage");
+ BBPunlock();
if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
*ret = bn->batCacheid;
BBPkeepref(bn->batCacheid);
@@ -408,7 +408,7 @@ SYSvm_usage(bat *ret, bat *ret2, const l
}
BATseqbase(b,0);
BATseqbase(bn,0);
- BBPlock("SYSvm_usage");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++) {
BAT *c;
str s;
@@ -463,7 +463,7 @@ SYSvm_usage(bat *ret, bat *ret2, const l
BUNappend(bn, "_tot/vm", FALSE);
BUNappend(b, &sz, FALSE);
- BBPunlock("SYSvm_usage");
+ BBPunlock();
if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
*ret = bn->batCacheid;
BBPkeepref(bn->batCacheid);
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -95,7 +95,7 @@ CMDbbpNames(bat *ret)
throw(MAL, "catalog.bbpNames", MAL_MALLOC_FAIL);
BATseqbase(b,0);
- BBPlock("CMDbbpNames");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid) {
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i)) ) {
@@ -104,7 +104,7 @@ CMDbbpNames(bat *ret)
BUNappend(b, BBP_logical(-i), FALSE);
}
}
- BBPunlock("CMDbbpNames");
+ BBPunlock();
if (!(b->batDirty&2)) BATsetaccess(b, BAT_READ);
pseudo(ret,b,"bbp","name");
return MAL_SUCCEED;
@@ -176,7 +176,7 @@ CMDbbpLocation(bat *ret)
throw(MAL, "catalog.bbpLocation", MAL_MALLOC_FAIL);
BATseqbase(b,0);
- BBPlock("CMDbbpLocation");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid) {
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
@@ -184,7 +184,7 @@ CMDbbpLocation(bat *ret)
BUNappend(b, buf, FALSE);
}
}
- BBPunlock("CMDbbpLocation");
+ BBPunlock();
if (!(b->batDirty&2)) BATsetaccess(b, BAT_READ);
pseudo(ret,b,"bbp","location");
return MAL_SUCCEED;
@@ -203,7 +203,7 @@ CMDbbpHeat(bat *ret)
throw(MAL, "catalog.bbpHeat", MAL_MALLOC_FAIL);
BATseqbase(b,0);
- BBPlock("CMDbbpHeat");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid) {
if (BBP_cache(i) && !monet_modulesilent) {
@@ -216,7 +216,7 @@ CMDbbpHeat(bat *ret)
BUNappend(b, &zero, FALSE);
}
}
- BBPunlock("CMDbbpHeat");
+ BBPunlock();
if (!(b->batDirty&2)) BATsetaccess(b, BAT_READ);
pseudo(ret,b,"bbp","heat");
return MAL_SUCCEED;
@@ -236,7 +236,7 @@ CMDbbpDirty(bat *ret)
throw(MAL, "catalog.bbpDirty", MAL_MALLOC_FAIL);
BATseqbase(b,0);
- BBPlock("CMDbbpDirty");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
@@ -244,7 +244,7 @@ CMDbbpDirty(bat *ret)
BUNappend(b, bn ? BATdirty(bn) ? "dirty" :
DELTAdirty(bn) ? "diffs" : "clean" : (BBP_status(i) & BBPSWAPPED) ? "diffs" :
"clean", FALSE);
}
- BBPunlock("CMDbbpDirty");
+ BBPunlock();
if (!(b->batDirty&2)) BATsetaccess(b, BAT_READ);
pseudo(ret,b,"bbp","status");
return MAL_SUCCEED;
@@ -264,7 +264,7 @@ CMDbbpStatus(bat *ret)
throw(MAL, "catalog.bbpStatus", MAL_MALLOC_FAIL);
BATseqbase(b,0);
- BBPlock("CMDbbpStatus");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
@@ -272,7 +272,7 @@ CMDbbpStatus(bat *ret)
BUNappend(b, loc, FALSE);
}
- BBPunlock("CMDbbpStatus");
+ BBPunlock();
if (!(b->batDirty&2)) BATsetaccess(b, BAT_READ);
pseudo(ret,b,"bbp","status");
return MAL_SUCCEED;
@@ -289,7 +289,7 @@ CMDbbpKind(bat *ret)
throw(MAL, "catalog.bbpKind", MAL_MALLOC_FAIL);
BATseqbase(b,0);
- BBPlock("CMDbbpKind");
+ BBPlock();
for (i = 1; i < getBBPsize(); i++)
if (i != b->batCacheid)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
@@ -302,7 +302,7 @@ CMDbbpKind(bat *ret)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
