Changeset: 82f3ee3847d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=82f3ee3847d4
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_private.h
gdk/gdk_utils.c
Branch: Feb2013
Log Message:
GDKunloadLock and GDKunloadCond are only used in one file.
diffs (98 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -236,7 +236,25 @@ BBP_getpid(void)
return x;
}
+#define BBP_unload_inc(bid, nme) \
+ do { \
+ MT_lock_set(&GDKunloadLock, nme); \
+ BBPunloadCnt++; \
+ MT_lock_unset(&GDKunloadLock, nme); \
+ } while (0)
+
+#define BBP_unload_dec(bid, nme) \
+ do { \
+ MT_lock_set(&GDKunloadLock, nme); \
+ if (--BBPunloadCnt == 0) \
+ MT_cond_signal(&GDKunloadCond, nme); \
+ assert(BBPunloadCnt >= 0); \
+ MT_lock_unset(&GDKunloadLock, nme); \
+ } while (0)
+
static int BBPunloadCnt = 0;
+static MT_Lock GDKunloadLock;
+static MT_Cond GDKunloadCond;
void
BBPlock(const char *nme)
@@ -972,6 +990,9 @@ BBPinit(void)
int oidsize;
oid BBPoid;
+ MT_lock_init(&GDKunloadLock, "GDKunloadLock");
+ MT_cond_init(&GDKunloadCond, "GDKunloadCond");
+
/* first move everything from SUBDIR to BAKDIR (its parent) */
if (BBPrecover_subdir() < 0)
GDKfatal("BBPinit: cannot properly process %s.", SUBDIR);
diff --git a/gdk/gdk_bbp.h b/gdk/gdk_bbp.h
--- a/gdk/gdk_bbp.h
+++ b/gdk/gdk_bbp.h
@@ -80,21 +80,6 @@ gdk_export void BBPshare(bat b);
#define BBP_status_off(bid, flags, nme)
\
BBP_status_set(bid, BBP_status(bid) & ~(flags), nme);
-#define BBP_unload_inc(bid, nme) \
- do { \
- MT_lock_set(&GDKunloadLock, nme); \
- BBPunloadCnt++; \
- MT_lock_unset(&GDKunloadLock, nme); \
- } while (0)
-
-#define BBP_unload_dec(bid, nme) \
- do { \
- MT_lock_set(&GDKunloadLock, nme); \
- if (--BBPunloadCnt == 0) \
- MT_cond_signal(&GDKunloadCond, nme); \
- assert(BBPunloadCnt >= 0); \
- MT_lock_unset(&GDKunloadLock, nme); \
- } while (0)
#define BBPswappable(b) ((b) && (b)->batCacheid && BBP_refs((b)->batCacheid)
== 0)
#define BBPtrimmable(b) (BBPswappable(b) && isVIEW(b) == 0 &&
(BBP_status((b)->batCacheid)&BBPWAITING) == 0)
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -134,8 +134,6 @@ extern int GDKrecovery;
extern int GDKsilent; /* should GDK shut up? */
extern MT_Lock GDKthreadLock;
extern MT_Lock GDKtmLock;
-extern MT_Cond GDKunloadCond;
-extern MT_Lock GDKunloadLock;
extern MT_Lock MT_system_lock;
#define ATOMappendpriv(t, h) \
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1016,8 +1016,6 @@ GDKinit(opt *set, int setlen)
}
MT_lock_init(&GDKnameLock, "GDKnameLock");
MT_lock_init(&GDKthreadLock, "GDKthreadLock");
- MT_lock_init(&GDKunloadLock, "GDKunloadLock");
- MT_cond_init(&GDKunloadCond, "GDKunloadCond");
MT_lock_init(&GDKtmLock, "GDKtmLock");
ATOMIC_INIT(mbyteslock, "mbyteslock");
errno = 0;
@@ -1216,9 +1214,7 @@ batlock_t GDKbatLock[BBP_BATMASK + 1];
bbplock_t GDKbbpLock[BBP_THREADMASK + 1];
MT_Lock GDKnameLock;
MT_Lock GDKthreadLock;
-MT_Lock GDKunloadLock;
MT_Lock GDKtmLock;
-MT_Cond GDKunloadCond;
/*
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
