Changeset: ed85a9c7f949 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed85a9c7f949
Modified Files:
clients/src/odbc/driver/monetdb-odbc.pc.in
Branch: sciql
Log Message:
Merge with head
diffs (truncated from 1618 to 300 lines):
diff -r 4175e2bd6cfa -r ed85a9c7f949 .hgtags
--- a/.hgtags Wed Nov 03 17:49:30 2010 +0100
+++ b/.hgtags Fri Nov 05 12:49:50 2010 +0100
@@ -426,3 +426,5 @@
931928c216bc600a35580fa19f73daac66bd3571 Jun2010_5
f0df8bc4610227ef4d0b54b21f978c0c3cb3f31f Oct2010_root
ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
+ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
+5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB/MonetDB.spec Fri Nov 05 12:49:50 2010 +0100
@@ -110,6 +110,9 @@
%{_libdir}/libbat.so
%changelog
+* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101105
+- Rebuilt.
+
* Fri Oct 29 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101029
- Rebuilt.
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB/debian/changelog Fri Nov 05 12:49:50 2010 +0100
@@ -1,3 +1,9 @@
+monetdb (1.40.1-20101105) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Fri, 05 Nov 2010 09:32:11 +0100
+
monetdb (1.40.1-20101029) unstable; urgency=low
* Rebuilt.
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB/debian/libmonetdb-dev.install
--- a/MonetDB/debian/libmonetdb-dev.install Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB/debian/libmonetdb-dev.install Fri Nov 05 12:49:50 2010 +0100
@@ -5,3 +5,4 @@
debian/tmp/usr/lib/libbat.so usr/lib
debian/tmp/usr/lib/libmutils.so usr/lib
debian/tmp/usr/lib/libstream.so usr/lib
+debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB/src/gdk/gdk_utils.mx
--- a/MonetDB/src/gdk/gdk_utils.mx Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB/src/gdk/gdk_utils.mx Fri Nov 05 12:49:50 2010 +0100
@@ -92,6 +92,8 @@
#define VALGRIND_FREELIKE_BLOCK(addr, rzB)
#endif
+static int GDKstopped = 1;
+
@}
@+ Monet configuration file
Parse a possible MonetDB.conf file (either in the default location
@@ -1487,6 +1489,7 @@
#ifdef HAVE_POSIX_FADVISE
static str highload_name[] = { "idle", "low", "medium", "high", "extreme" };
+static MT_Id GDKvmtrim_id;
static int membits = 0;
static void
GDKvmtrim(void *limit)
@@ -1503,7 +1506,13 @@
}
do {
stream *fp = NULL;
- MT_sleep_ms(highload ? 500 : 5000);
+ int t;
+ /* sleep using catnaps so we can exit in a timely fashion */
+ for (t = highload ? 500 : 5000; t > 0; t -= 50) {
+ MT_sleep_ms(50);
+ if (GDKstopped)
+ return;
+ }
/* check for runtime overruling */
if (GDK_vm_trim == 0) {
highload = 0;
@@ -1678,11 +1687,8 @@
#endif
#ifdef HAVE_POSIX_FADVISE
- if (!GDKembedded && GDK_vm_trim) {
- MT_Id t;
-
- MT_create_thread(&t, GDKvmtrim, &GDK_mem_maxsize,
MT_THR_DETACHED);
- }
+ if (!GDKembedded && GDK_vm_trim)
+ MT_create_thread(&GDKvmtrim_id, GDKvmtrim, &GDK_mem_maxsize,
MT_THR_JOINABLE);
#endif
return 1;
@@ -1693,11 +1699,9 @@
the transient BATs should be removed.
The buffer pool manager takes care of this.
@h
-gdk_export int GDKstopped;
gdk_export int GDKnr_threads;
@c
-int GDKstopped = 1;
int GDKnr_threads = 0;
@h
@@ -1710,7 +1714,11 @@
{
gdk_set_lock(GDKthreadLock, "GDKexit");
if (GDKstopped == 0) {
- GDKstopped++; /* shouldn't there be a lock here? */
+ GDKstopped = 1; /* shouldn't there be a lock here? */
+#ifdef HAVE_POSIX_FADVISE
+ if (!GDKembedded && GDK_vm_trim)
+ MT_join_thread(GDKvmtrim_id);
+#endif
GDKnrofthreads = 0;
gdk_unset_lock(GDKthreadLock, "GDKexit");
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB4/MonetDB-server.spec Fri Nov 05 12:49:50 2010 +0100
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101105
+- Rebuilt.
+
* Fri Oct 29 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101029
- Rebuilt.
diff -r 4175e2bd6cfa -r ed85a9c7f949
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.32bit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.32bit Fri Nov
05 12:49:50 2010 +0100
@@ -0,0 +1,38 @@
+stdout of test 'monetdb4-conds` in directory 'conf` itself:
+
+
+# 20:30:38 >
+# 20:30:38 > ./monetdb4-conds.sh monetdb4-conds
+# 20:30:38 >
+
+
+# 20:30:38 >
+# 20:30:38 > Mtimeout -timeout 60 monetdb4-config --conds
+# 20:30:38 >
+
+BITS32=#
+BITS64=
+DOCTOOLS=#
+HAVE_BUILDTOOLS=#
+HAVE_CLIENTS=#
+HAVE_EXTRA_MK=
+HAVE_MONETDB=#
+HAVE_PCRE=#
+HAVE_PERL_DEVEL=#
+HAVE_PERL=#
+HAVE_PERL_SWIG=#
+HAVE_PYTHON=#
+HAVE_RUBYGEM=#
+HAVE_SWIG=#
+LINK_STATIC=
+NATIVE_WIN32=
+NEED_MX=#
+NOT_WIN32=#
+PROFILING=
+CROSS_COMPILING=
+HAVE_NETCDF=
+
+# 20:30:38 >
+# 20:30:38 > Done.
+# 20:30:38 >
+
diff -r 4175e2bd6cfa -r ed85a9c7f949
MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.64bit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB4/conf/Tests/monetdb4-conds.stable.out.Fedora12.64bit Fri Nov
05 12:49:50 2010 +0100
@@ -0,0 +1,38 @@
+stdout of test 'monetdb4-conds` in directory 'conf` itself:
+
+
+# 20:30:38 >
+# 20:30:38 > ./monetdb4-conds.sh monetdb4-conds
+# 20:30:38 >
+
+
+# 20:30:38 >
+# 20:30:38 > Mtimeout -timeout 60 monetdb4-config --conds
+# 20:30:38 >
+
+BITS32=
+BITS64=#
+DOCTOOLS=#
+HAVE_BUILDTOOLS=#
+HAVE_CLIENTS=#
+HAVE_EXTRA_MK=
+HAVE_MONETDB=#
+HAVE_PCRE=#
+HAVE_PERL_DEVEL=#
+HAVE_PERL=#
+HAVE_PERL_SWIG=#
+HAVE_PYTHON=#
+HAVE_RUBYGEM=#
+HAVE_SWIG=#
+LINK_STATIC=
+NATIVE_WIN32=
+NEED_MX=#
+NOT_WIN32=#
+PROFILING=
+CROSS_COMPILING=
+HAVE_NETCDF=
+
+# 20:30:38 >
+# 20:30:38 > Done.
+# 20:30:38 >
+
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB4/debian/changelog Fri Nov 05 12:49:50 2010 +0100
@@ -1,3 +1,9 @@
+monetdb4-server (4.40.1-20101105) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Fri, 05 Nov 2010 09:32:11 +0100
+
monetdb4-server (4.40.1-20101029) unstable; urgency=low
* Rebuilt.
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB4/src/monet/monet_multiplex.mx
--- a/MonetDB4/src/monet/monet_multiplex.mx Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB4/src/monet/monet_multiplex.mx Fri Nov 05 12:49:50 2010 +0100
@@ -1894,7 +1894,7 @@
err = HEAPextend(head, head->size*2);
if (err < 0)
goto bunins_failed;
- nested->batDeleted = nested->batDeleted = nested->batFirst = 0;
+ nested->batDeleted = nested->batFirst = 0;
}
if (Hsize(nested) == SIZEOF_OID) {
if (b->ttype == TYPE_void) {
diff -r 4175e2bd6cfa -r ed85a9c7f949 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Nov 03 17:49:30 2010 +0100
+++ b/MonetDB5/MonetDB-server.spec Fri Nov 05 12:49:50 2010 +0100
@@ -216,6 +216,9 @@
%{_libdir}/pkgconfig/monetdb-mal.pc
%changelog
+* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101105
+- Rebuilt.
+
* Fri Oct 29 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101029
- Rebuilt.
diff -r 4175e2bd6cfa -r ed85a9c7f949
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.32bit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.32bit Fri Nov
05 12:49:50 2010 +0100
@@ -0,0 +1,38 @@
+stdout of test 'monetdb5-conds` in directory 'conf` itself:
+
+
+# 20:30:38 >
+# 20:30:38 > ./monetdb5-conds.sh monetdb5-conds
+# 20:30:38 >
+
+
+# 20:30:38 >
+# 20:30:38 > Mtimeout -timeout 60 monetdb5-config --conds
+# 20:30:38 >
+
+BITS32=#
+BITS64=
+DOCTOOLS=#
+HAVE_BUILDTOOLS=#
+HAVE_CLIENTS=#
+HAVE_EXTRA_MK=
+HAVE_MONETDB=#
+HAVE_PCRE=#
+HAVE_PERL_DEVEL=#
+HAVE_PERL=#
+HAVE_PERL_SWIG=#
+HAVE_PYTHON=#
+HAVE_RUBYGEM=#
+HAVE_SWIG=#
+LINK_STATIC=
+NATIVE_WIN32=
+NEED_MX=#
+NOT_WIN32=#
+PROFILING=
+HAVE_LIBXML2=#
+HAVE_RAPTOR=#
+
+# 20:30:38 >
+# 20:30:38 > Done.
+# 20:30:38 >
+
diff -r 4175e2bd6cfa -r ed85a9c7f949
MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.64bit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/conf/Tests/monetdb5-conds.stable.out.Fedora12.64bit Fri Nov
05 12:49:50 2010 +0100
@@ -0,0 +1,38 @@
+stdout of test 'monetdb5-conds` in directory 'conf` itself:
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
