Changeset: b8673fc5734e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8673fc5734e
Modified Files:
gdk/gdk_bbp.c
Branch: default
Log Message:
Add test that BBPsize is in BBP.dir; make clear what can be removed in future.
diffs (37 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1171,7 +1171,6 @@ BBPheader(FILE *fp)
char buf[BUFSIZ];
int sz, ptrsize, oidsize, intsize;
unsigned bbpversion;
- char *s;
if (fgets(buf, sizeof(buf), fp) == NULL) {
GDKfatal("BBPinit: BBP.dir is empty");
@@ -1212,14 +1211,22 @@ BBPheader(FILE *fp)
if (fgets(buf, sizeof(buf), fp) == NULL) {
GDKfatal("BBPinit: short BBP");
}
- /* when removing GDKLIBRARY_TALIGN, also remove the strstr
- * call and just sscanf from buf */
+#ifdef GDKLIBRARY_TALIGN
+ char *s;
if ((s = strstr(buf, "BBPsize")) != NULL) {
- sscanf(s, "BBPsize=%d", &sz);
+ if (sscanf(s, "BBPsize=%d", &sz) != 1)
+ GDKfatal("BBPinit: no BBPsize value found\n");
sz = (int) (sz * BATMARGIN);
if (sz > (bat) ATOMIC_GET(BBPsize, BBPsizeLock))
ATOMIC_SET(BBPsize, sz, BBPsizeLock);
}
+#else
+ if (sscanf(buf, "BBPsize=%d", &sz) != 1)
+ GDKfatal("BBPinit: no BBPsize value found\n");
+ sz = (int) (sz * BATMARGIN);
+ if (sz > (bat) ATOMIC_GET(BBPsize, BBPsizeLock))
+ ATOMIC_SET(BBPsize, sz, BBPsizeLock);
+#endif
return bbpversion;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
