Changeset: 5bc737e65268 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bc737e65268
Modified Files:
common/options/monet_options.c
gdk/gdk_utils.c
Branch: cmake-monetdblite
Log Message:
Get BBPlock even if no threads are killed during GDKreset. A BBPunlock is
called by a subsequent GDKinit call.
Also removed unused monet_prompt property.
diffs (45 lines):
diff --git a/common/options/monet_options.c b/common/options/monet_options.c
--- a/common/options/monet_options.c
+++ b/common/options/monet_options.c
@@ -208,16 +208,11 @@ mo_builtin_settings(opt **Set)
if (Set == NULL)
return 0;
-#ifdef HAVE_EMBEDDED
-#define N_OPTIONS 2 /*MUST MATCH # OPTIONS BELOW */
-#else
-#define N_OPTIONS 7
-#endif
+#define N_OPTIONS 7 /*MUST MATCH # OPTIONS BELOW */
set = malloc(sizeof(opt) * N_OPTIONS);
if (set == NULL)
return 0;
-#ifndef HAVE_EMBEDDED
set[i].kind = opt_builtin;
set[i].name = strdup("gdk_dbpath");
set[i].value = strdup(LOCALSTATEDIR DIR_SEP_STR "monetdb5" DIR_SEP_STR
@@ -243,11 +238,6 @@ mo_builtin_settings(opt **Set)
set[i].name = strdup("sql_optimizer");
set[i].value = strdup("default_pipe");
i++;
-#endif
- set[i].kind = opt_builtin;
- set[i].name = strdup("monet_prompt");
- set[i].value = strdup(">");
- i++;
set[i].kind = opt_builtin;
set[i].name = strdup("sql_debug");
set[i].value = strdup("0");
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -800,6 +800,8 @@ GDKreset(int status)
if (!killed) {
/* we can't clean up after killing threads */
BBPexit();
+ } else {
+ BBPlock();
}
GDKlog(GET_GDKLOCK(PERSISTENT), GDKLOGOFF);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
