Changeset: c65daeac480b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c65daeac480b
Modified Files:
MonetDB/.cvsignore
MonetDB/NT/.cvsignore
MonetDB/conf/.cvsignore
MonetDB4/.cvsignore
MonetDB4/NT/.cvsignore
MonetDB4/NT/winservice/.cvsignore
MonetDB4/conf/.cvsignore
MonetDB4/src/monet/.cvsignore
MonetDB4/src/tools/.cvsignore
MonetDB5/.cvsignore
MonetDB5/NT/.cvsignore
MonetDB5/NT/MonetDB5-Installer/.cvsignore
MonetDB5/conf/.cvsignore
MonetDB5/src/mal/Tests/.cvsignore
MonetDB5/src/tools/.cvsignore
buildtools/.cvsignore
buildtools/Mx/.cvsignore
buildtools/Mx/Mx.vcproj
buildtools/Mx/MxLib.vcproj
buildtools/Mx/config.vcproj
buildtools/autogen/.cvsignore
buildtools/burg/.cvsignore
buildtools/mel/.cvsignore
clients/.cvsignore
clients/NT/.cvsignore
clients/conf/.cvsignore
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/.cvsignore
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/.cvsignore
geom/.cvsignore
geom/NT/.cvsignore
geom/NT/MonetDB5-Geom/.cvsignore
geom/NT/MonetDB5-Geom64/.cvsignore
geom/conf/.cvsignore
geom/src/.cvsignore
java/.cvsignore
java/NT/.cvsignore
java/conf/.cvsignore
pathfinder/.cvsignore
pathfinder/NT/.cvsignore
pathfinder/NT/MonetDB4-XQuery/.cvsignore
pathfinder/NT/MonetDB4-XQuery64/.cvsignore
pathfinder/conf/.cvsignore
sql/.cvsignore
sql/NT/.cvsignore
sql/NT/MonetDB5-SQL/.cvsignore
sql/NT/MonetDB5-SQL64/.cvsignore
sql/conf/.cvsignore
template/.cvsignore
template/conf/.cvsignore
testing/.cvsignore
testing/NT/.cvsignore
testing/conf/.cvsignore
Branch: Jun2010
Log Message:
Merge heads.
diffs (truncated from 2787 to 300 lines):
diff -r dec8995bfd4c -r c65daeac480b .hgeol
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgeol Sun Jun 20 15:25:16 2010 +0200
@@ -0,0 +1,26 @@
+# This file is used in Mercurial 1.5.4 and newer.
+# If you're running such a version, enable the eol extension in your
+# .hgrc file (on Linux and Mac, as well as on Windows), and disable
+# the win32text extension.
+
+[patterns]
+# various binary files
+**.bmp = BIN
+**.bz2 = BIN
+**.dll = BIN
+**.gif = BIN
+**.gz = BIN
+**.ico = BIN
+**.jpg = BIN
+**.pdf = BIN
+**.png = BIN
+**.zip = BIN
+
+# Windows specific files
+**.chm = BIN
+**.rtf = CRLF
+**.sln = CRLF
+**.vdproj = CRLF
+
+# all the rest is text
+** = native
diff -r dec8995bfd4c -r c65daeac480b MonetDB/.cvsignore
--- a/MonetDB/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-java
-Linux*
-SunOS*
-CYGWIN*
-IRIX*
-AIX*
-aclocal.m4
-acout.in
-autom4te*.cache
-configure
-configure.in
-install.lst
-doc.lst
diff -r dec8995bfd4c -r c65daeac480b MonetDB/NT/.cvsignore
--- a/MonetDB/NT/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-MonetDB.pc
-Run*.bat
-bin
-com
-conf
-doc
-etc
-include
-info
-lady.gif
-lib
-libexec
-man
-monetdb_config.h
-sbin
-scripts
-share
-src
-tests
-unistd.h
-var
diff -r dec8995bfd4c -r c65daeac480b MonetDB/conf/.cvsignore
--- a/MonetDB/conf/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-compile
-config.guess
-config.h.in
-config.sub
-install-sh
-ltmain.sh
-mkinstalldirs
-missing
diff -r dec8995bfd4c -r c65daeac480b MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Fri Jun 18 17:50:56 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mx Sun Jun 20 15:25:16 2010 +0200
@@ -1943,29 +1943,16 @@
void
BBPkeepref(bat i)
{
- int lock = locked_by ? BBP_getpid() != locked_by : 1;
-
if (i == bat_nil)
return;
if (i < 0)
i = -i;
if (BBPcheck(i, "BBPkeepref")) {
- if (lock)
- gdk_set_lock(GDKswapLock(i), "BBPkeepref");
-
- while (BBP_status(i) & BBPUNLOADING) {
- if (lock)
- gdk_unset_lock(GDKswapLock(i), "BBPincref spin
wait");
- BBPspin(i, "BBPkeepref", BBPUNLOADING);
- if (lock)
- gdk_set_lock(GDKswapLock(i), "BBPincref spin
wait");
- }
- /* got the lock */
- ++BBP_lrefs(i); /* incref(i, TRUE, FALSE); */
+ int lock = locked_by ? BBP_getpid() != locked_by : 1;
+
+ incref(i, TRUE, lock);
assert(BBP_refs(i));
- --BBP_refs(i); /* decref(i, FALSE, FALSE, FALSE); */
- if (lock)
- gdk_unset_lock(GDKswapLock(i), "BBPfix");
+ decref(i, FALSE, FALSE, lock);
}
}
@@ -1974,55 +1961,25 @@
{
int lock = locked_by ? BBP_getpid() != locked_by : 1;
- if (i == bat_nil || BBP_lrefs(i) <= 0)
+ if (i == bat_nil)
return;
if (i < 0)
i = -i;
- if (BBPcheck(i, "BBPreleaselref")) {
- if (lock)
- gdk_set_lock(GDKswapLock(i), "BBPreleaselref");
-
- while (BBP_status(i) & BBPUNLOADING) {
- if (lock)
- gdk_unset_lock(GDKswapLock(i), "BBPincref spin
wait");
- BBPspin(i, "BBPreleaselref", BBPUNLOADING);
- if (lock)
- gdk_set_lock(GDKswapLock(i), "BBPincref spin
wait");
- }
- /* got the lock */
- assert(BBP_lrefs(i));
- --BBP_lrefs(i); /* decref(i, TRUE, FALSE, FALSE); */
- if (lock)
- gdk_unset_lock(GDKswapLock(i), "BBPfix");
- }
+ assert(BBP_refs(i) > 0);
+ decref(i, TRUE, FALSE, lock);
}
void
BBPreleaseref(bat i)
{
- int lock = locked_by ? BBP_getpid() != locked_by : 1;
-
- if (i == bat_nil || BBP_refs(i) <= 0)
- return;
- if (i < 0)
- i = -i;
- if (BBPcheck(i, "BBPreleaseref")) {
- if (lock)
- gdk_set_lock(GDKswapLock(i), "BBPreleaseref");
-
- while (BBP_status(i) & BBPUNLOADING) {
- if (lock)
- gdk_unset_lock(GDKswapLock(i), "BBPincref spin
wait");
- BBPspin(i, "BBPreleaseref", BBPUNLOADING);
- if (lock)
- gdk_set_lock(GDKswapLock(i), "BBPincref spin
wait");
- }
- /* got the lock */
- assert(BBP_refs(i)); /* decref(i, FALSE, FALSE, FALSE); */
- --BBP_refs(i);
- if (lock)
- gdk_unset_lock(GDKswapLock(i), "BBPfix");
- }
+ int lock = locked_by ? BBP_getpid() != locked_by : 1;
+
+ if (i == bat_nil)
+ return;
+ if (i < 0)
+ i = -i;
+ assert(BBP_refs(i) > 0);
+ decref(i, FALSE, FALSE, lock);
}
static INLINE void
diff -r dec8995bfd4c -r c65daeac480b MonetDB4/.cvsignore
--- a/MonetDB4/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-java
-Linux*
-SunOS*
-CYGWIN*
-IRIX*
-AIX*
-aclocal.m4
-acout.in
-autom4te*.cache
-configure
-configure.in
-install.lst
-doc.lst
diff -r dec8995bfd4c -r c65daeac480b MonetDB4/NT/.cvsignore
--- a/MonetDB4/NT/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-MonetDB.pc
-Run*.bat
-bin
-com
-conf
-doc
-etc
-include
-info
-lady.gif
-lib
-libexec
-man
-monetdb4_config.h
-sbin
-scripts
-share
-src
-tests
-unistd.h
-var
diff -r dec8995bfd4c -r c65daeac480b MonetDB4/NT/winservice/.cvsignore
--- a/MonetDB4/NT/winservice/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-*.ilk
-*.pdb
-*.exe
-*.obj
diff -r dec8995bfd4c -r c65daeac480b MonetDB4/conf/.cvsignore
--- a/MonetDB4/conf/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-compile
-config.guess
-config.h.in
-config.sub
-install-sh
-ltmain.sh
-mkinstalldirs
-missing
diff -r dec8995bfd4c -r c65daeac480b MonetDB4/src/monet/.cvsignore
--- a/MonetDB4/src/monet/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-static_modules.mx
-
diff -r dec8995bfd4c -r c65daeac480b MonetDB4/src/tools/.cvsignore
--- a/MonetDB4/src/tools/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-static_modules.mx
diff -r dec8995bfd4c -r c65daeac480b MonetDB5/.cvsignore
--- a/MonetDB5/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-aclocal.m4
-acout.in
-AIX*
-autom4te*.cache
-configure
-configure.in
-CYGWIN*
-doc.lst
-install.lst
-IRIX*
-java
-Linux*
-SunOS*
diff -r dec8995bfd4c -r c65daeac480b MonetDB5/NT/.cvsignore
--- a/MonetDB5/NT/.cvsignore Fri Jun 18 17:50:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-RunMapprove.bat
-RunMserver.bat
-RunMtest.bat
-bin
-com
-conf
-etc
-include
-info
-lib
-libexec
-mal_config.h
-man
-sbin
-share
-src
-unistd.h
-var
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
