Changeset: 42edcbe99e29 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42edcbe99e29
Modified Files:
NT/rules.msc
monetdb5/mal/mal_interpreter.mx
monetdb5/modules/mal/tablet_mk.c
monetdb5/modules/mal/tablet_si.c
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 653 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -24,7 +24,7 @@ prefix = $(MAKEDIR)
!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
-all: "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h inttypes.h .monetdb
update_winconfig_conds_py
+all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h
unistd.h inttypes.h .monetdb
$(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
install: targetdirs all
@@ -38,7 +38,7 @@ install: targetdirs all
$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
-monetdb_config.h: "$(srcdir)\NT\monetdb_config.h.in"
+monetdb_config.h: "$(TOPDIR)\winconfig_conds.py"
"$(srcdir)\NT\monetdb_config.h.in"
$(CONFIGURE) "$(srcdir)\NT\monetdb_config.h.in" > monetdb_config.h
unistd.h:
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -257,41 +257,41 @@ FILTERPREF=/c:
# These should cover all AM_CONDITIONALS defined in configure.ag, i.e.,
# `grep AM_CONDITIONAL configure.ag | sed
's|^AM_CONDITIONAL(\([^,]*\),.*$|\1|' | sort -u`
create_winconfig_conds_new_py:
- $(ECHO) > "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) # > "$(TOPDIR)\winconfig_conds_new.py"
!IFDEF BITS32
- $(ECHO) "BITS32_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) BITS32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "BITS32_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) BITS32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF BITS64
- $(ECHO) "BITS64_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) BITS64_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "BITS64_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF CROSS_COMPILING
- $(ECHO) "CROSS_COMPILING_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) CROSS_COMPILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "CROSS_COMPILING_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) CROSS_COMPILING_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF DOCTOOLS
- $(ECHO) "DOCTOOLS_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) DOCTOOLS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "DOCTOOLS_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) DOCTOOLS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF ENABLE_CRACKERS
- $(ECHO) "ENABLE_CRACKERS_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) ENABLE_CRACKERS_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "ENABLE_CRACKERS_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) ENABLE_CRACKERS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF ENABLE_DATACELL
- $(ECHO) "ENABLE_DATACELL_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) ENABLE_DATACELL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "ENABLE_DATACELL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) ENABLE_DATACELL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_ANT
- $(ECHO) "HAVE_ANT_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_ANT_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_ANT_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_ANT_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_CFITSIO
$(ECHO) "HAVE_CFITSIO_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
@@ -299,51 +299,51 @@ create_winconfig_conds_new_py:
$(ECHO) "HAVE_CFITSIO_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_DEVELOPER
- $(ECHO) "HAVE_DEVELOPER_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_DEVELOPER_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_DEVELOPER_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_DEVELOPER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_GDK
- $(ECHO) "HAVE_GDK_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_GDK_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_GDK_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_GDK_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_GEOM
- $(ECHO) "HAVE_GEOM_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_GEOM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_GEOM_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_GEOM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_JAVA
- $(ECHO) "HAVE_JAVA_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVA_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!IFDEF HAVE_JAVAJDBC
- $(ECHO) "HAVE_JAVAJDBC_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVAJDBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_JAVAJDBC_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVAJDBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_JAVAMEROCONTROL
- $(ECHO) "HAVE_JAVAMEROCONTROL_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='#' >>
"$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_JAVAMEROCONTROL_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='' >>
"$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!ELSE
- $(ECHO) "HAVE_JAVA_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
- $(ECHO) "HAVE_JAVAJDBC_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
- $(ECHO) "HAVE_JAVAMEROCONTROL_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVA_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVAJDBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_JAVAMEROCONTROL_FALSE='' >>
"$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_LIBBZ2
- $(ECHO) "HAVE_LIBBZ2_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_LIBBZ2_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_LIBBZ2_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_LIBBZ2_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_LIBZ
- $(ECHO) "HAVE_LIBZ_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_LIBZ_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_LIBZ_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_LIBZ_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_MONETDB5
- $(ECHO) "HAVE_MONETDB5_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_MONETDB5_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_MONETDB5_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_MSEED
$(ECHO) "HAVE_MSEED_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
@@ -351,64 +351,64 @@ create_winconfig_conds_new_py:
$(ECHO) "HAVE_MSEED_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_ODBC
- $(ECHO) "HAVE_ODBC_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_ODBC_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_ODBC_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_PCRE
- $(ECHO) "HAVE_PCRE_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_PCRE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_PCRE_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_PCRE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_PERL
- $(ECHO) "HAVE_PERL_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_PERL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_PERL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_PERL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_PYTHON
- $(ECHO) "HAVE_PYTHON_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_PYTHON_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_PYTHON_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_PYTHON_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_RAPTOR
- $(ECHO) "HAVE_RAPTOR_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_RAPTOR_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_RAPTOR_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_RAPTOR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_RUBYGEM
- $(ECHO) "HAVE_RUBYGEM_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_RUBYGEM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_RUBYGEM_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_RUBYGEM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_SPHINXCLIENT
- $(ECHO) "HAVE_SPHINXCLIENT_FALSE='#'" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_SPHINXCLIENT_FALSE='#' >>
"$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_SPHINXCLIENT_FALSE=''" >>
"$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_SPHINXCLIENT_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_SQL
- $(ECHO) "HAVE_SQL_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_SQL_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_TESTING
- $(ECHO) "HAVE_TESTING_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_TESTING_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_TESTING_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF NATIVE_WIN32
- $(ECHO) "NATIVE_WIN32_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) NATIVE_WIN32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "NATIVE_WIN32_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) NATIVE_WIN32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF NOT_WIN32
- $(ECHO) "NOT_WIN32_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) NOT_WIN32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "NOT_WIN32_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) NOT_WIN32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF PROFILING
- $(ECHO) "PROFILING_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) PROFILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "PROFILING_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) PROFILING_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
update_winconfig_conds_py: create_winconfig_conds_new_py
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -1602,7 +1602,7 @@ GDKvmtrim(void *limit)
if (membits == 0) {
/* compute rounded down log2 of memsize / nr_threads */
- size_t s = GDK_mem_maxsize_max / GDKnr_threads;
+ size_t s = GDK_mem_maxsize_max / (GDKnr_threads?
GDKnr_threads:1);
while ((s >>= 1) > 0)
membits++;
membits = (MAX(0, membits - MT_MMAP_LOG)) / 4;
@@ -1779,7 +1779,7 @@ GDKinit(opt *set, int setlen)
GDKnr_threads = MT_check_nr_cores();
#ifdef NATIVE_WIN32
if (GDKnr_threads)
- GDK_mmap_minsize /= GDKnr_threads;
+ GDK_mmap_minsize /= (GDKnr_threads? GDKnr_threads: 1);
#else
GDK_mmap_minsize = 256 * 1024 * 1024;
#endif
diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx
--- a/monetdb5/mal/mal_interpreter.mx
+++ b/monetdb5/mal/mal_interpreter.mx
@@ -281,6 +281,7 @@ str runMAL(Client cntxt, MalBlkPtr mb, i
if (env) {
stk->stkdepth = stk->stksize + env->stkdepth;
stk->calldepth = env->calldepth + 1;
+ stk->up = env;
if (stk->calldepth > 256)
throw(MAL, "mal.interpreter",
MAL_CALLDEPTH_FAIL);
if ((unsigned)stk->stkdepth > THREAD_STACK_SIZE /
sizeof(mb->var[0]) / 4 && THRhighwater())
@@ -2083,6 +2084,7 @@ safeguardStack(Client cntxt, MalBlkPtr m
/*safeguardStack*/
nstk->stkdepth = nstk->stksize + stk->stkdepth;
nstk->calldepth = stk->calldepth + 1;
+ nstk->up = stk;
if (nstk->calldepth > 256)
throw(MAL, "mal.interpreter", MAL_CALLDEPTH_FAIL);
if ((unsigned)nstk->stkdepth > THREAD_STACK_SIZE / sizeof(mb->var[0]) /
4 && THRhighwater())
diff --git a/monetdb5/modules/kernel/Tests/vacuum.mal
b/monetdb5/modules/kernel/Tests/vacuum.mal
--- a/monetdb5/modules/kernel/Tests/vacuum.mal
+++ b/monetdb5/modules/kernel/Tests/vacuum.mal
@@ -3,9 +3,10 @@
b:= bat.new(:oid,:int);
c:= bat.new(:oid,:oid);
+k:= 0;
barrier (go,i):= language.newRange(0:lng);
- k:= mmath.rand();
- barrier t:= k < 1000000;
+ k:= k +1;
+ barrier t:= k <= 1000;
o:= calc.oid(i);
bat.append(c,o);
exit t;
diff --git a/monetdb5/modules/kernel/Tests/vacuum.stable.out
b/monetdb5/modules/kernel/Tests/vacuum.stable.out
--- a/monetdb5/modules/kernel/Tests/vacuum.stable.out
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
