Changeset: 66a1f8ce6a41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66a1f8ce6a41
Modified Files:
clients/R/MonetDB.R/R/control.R
gdk/gdk_utils.c
monetdb5/mal/mal.c
monetdb5/mal/mal_module.c
tools/embedded/rpackage/configure
Branch: embedded
Log Message:
mc
diffs (85 lines):
diff --git a/clients/R/MonetDB.R/R/control.R b/clients/R/MonetDB.R/R/control.R
--- a/clients/R/MonetDB.R/R/control.R
+++ b/clients/R/MonetDB.R/R/control.R
@@ -68,10 +68,10 @@ monetdb.server.start <-
}
# oh the humanity
-monetdb.server.stop <- function(correct.pid, wait=TRUE ){
+monetdb.server.stop <- function(correct.pid, wait=TRUE){
.Deprecated("monetdb.server.shutdown")
- if (getOption('monetdb.debug.control', F)) {
- message('Killing process ', correct.pid)
+ if (length(correct.pid) != 1) {
+ stop("Need single pid, got ", correct.pid)
}
correct.pid <- as.integer(correct.pid)
if (.Platform$OS.type == "windows")
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1289,6 +1289,7 @@ GDKexit(int status)
TEMDEBUG GDKlockstatistics(1);
#endif
#ifdef HAVE_EMBEDDED
+ GDKatomcnt = TYPE_str + 1;
return;
#else
MT_global_exit(status);
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -31,6 +31,7 @@ int have_hge;
#include "mal_profiler.h"
#include "mal_private.h"
+
MT_Lock mal_contextLock MT_LOCK_INITIALIZER("mal_contextLock");
MT_Lock mal_namespaceLock MT_LOCK_INITIALIZER("mal_namespaceLock");
MT_Lock mal_remoteLock MT_LOCK_INITIALIZER("mal_remoteLock");
@@ -142,6 +143,7 @@ void mal_exit(void){
stopProfiler();
RECYCLEdrop(mal_clients); /* remove any left over intermediates */
unloadLibraries();
+
#if 0
/* skip this to solve random crashes, needs work */
freeModuleList(mal_clients->nspace);
@@ -173,6 +175,12 @@ void mal_exit(void){
fprintf(stderr, "!%s", err);
free(err);
}
+#ifdef HAVE_EMBEDDED
+ //freeModuleList(mal_clients->nspace);
+ freeModuleList(NULL);
+ finishNamespace();
MTIMEreset();
+
+#endif
GDKexit(0); /* properly end GDK */
}
diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c
--- a/monetdb5/mal/mal_module.c
+++ b/monetdb5/mal/mal_module.c
@@ -161,6 +161,9 @@ void freeModule(Module m)
}
void freeModuleList(Module s){
+ if (s == NULL) {
+ s = mal_scope;
+ }
Module t=s;
while(s){
t= s->outer;
diff --git a/tools/embedded/rpackage/configure
b/tools/embedded/rpackage/configure
--- a/tools/embedded/rpackage/configure
+++ b/tools/embedded/rpackage/configure
@@ -6,7 +6,7 @@ CFLAGS="-I$R_INCLUDE_DIR" ./configure --
--disable-jdbc --disable-merocontrol --disable-odbc --disable-console
--disable-microhttpd \
--without-perl --without-python2 --without-python3 --without-rubygem
--without-unixodbc \
--without-samtools --without-sphinxclient --without-geos --without-samtools
--without-readline \
---enable-optimize --enable-silent-rules --disable-assert --disable-strict
+--enable-optimize --enable-debug --enable-silent-rules --disable-assert
--disable-strict
# Dirty hack, normally R would call make, but we need to also do a make
install to get the libs in place.
# So we do it ourselves instead and then render the MonetDB makefile inert.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
