Changeset: 893f5c3b933e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=893f5c3b933e
Modified Files:
MonetDB5/src/mal/mal_profiler.mx
Branch: Jun2010
Log Message:
fixed deadlock
merged
diffs (truncated from 1020 to 300 lines):
diff -r 2aef3c300042 -r 893f5c3b933e
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 14:01:50
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 14:23:29
2010 +0200
@@ -187,7 +187,7 @@
{
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F567DEF0CA64069BF1409C4AC7228E3"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -227,7 +227,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FE781523A94CBDA5CD53F7A319B4D8"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -287,7 +287,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_926BCA1A727C4F29B3DA99D425D895EA"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 2aef3c300042 -r 893f5c3b933e
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 14:01:50
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 14:23:29
2010 +0200
@@ -207,7 +207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43E49CA0EC774DEF94E2596DAC7364FB"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -247,7 +247,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win64\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61BDF3C1EF544447820D9544098DD817"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -407,7 +407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DC301A823AB94F7D92F5D30466B8E3B0"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win64\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 2aef3c300042 -r 893f5c3b933e MonetDB5/src/mal/mal_profiler.mx
--- a/MonetDB5/src/mal/mal_profiler.mx Fri Aug 13 14:01:50 2010 +0200
+++ b/MonetDB5/src/mal/mal_profiler.mx Fri Aug 13 14:23:29 2010 +0200
@@ -1042,12 +1042,29 @@
return b;
}
-int
-initTrace(void)
+
+#define CLEANUPprofile(X) if (X) { BBPdecref((X)->batCacheid, TRUE);
(X)->batPersistence = TRANSIENT; } (X) = NULL;
+
+void
+_cleanupProfiler(void)
{
- if (TRACE_init)
- return 0; /* already initialized */
- mal_set_lock(mal_profileLock, "profileLock");
+ CLEANUPprofile(TRACE_id_event);
+ CLEANUPprofile(TRACE_id_time);
+ CLEANUPprofile(TRACE_id_pc);
+ CLEANUPprofile(TRACE_id_stmt);
+ CLEANUPprofile(TRACE_id_type);
+ CLEANUPprofile(TRACE_id_rbytes);
+ CLEANUPprofile(TRACE_id_wbytes);
+ CLEANUPprofile(TRACE_id_reads);
+ CLEANUPprofile(TRACE_id_writes);
+ CLEANUPprofile(TRACE_id_thread);
+ CLEANUPprofile(TRACE_id_user);
+ TRACE_init = 0;
+}
+
+void
+_initTrace(void)
+{
TRACE_id_event = TRACEcreate("id", "event", TYPE_int);
TRACE_id_time = TRACEcreate("id", "time", TYPE_str);
TRACE_id_ticks = TRACEcreate("id", "ticks", TYPE_lng);
@@ -1072,31 +1089,29 @@
TRACE_id_writes == NULL ||
TRACE_id_thread == NULL ||
TRACE_id_user == NULL
- )
- cleanupProfiler();
- else
+ ) {
+ _cleanupProfiler();
+ } else {
TRACE_init = 1;
- mal_unset_lock(mal_profileLock, "profileLock");
+ }
+}
+
+int
+initTrace(void)
+{
+ if (TRACE_init)
+ return 0; /* already initialized */
+ mal_set_lock(mal_contextLock, "profileLock");
+ _initTrace();
+ mal_unset_lock(mal_contextLock, "profileLock");
return TRACE_init ? 0 : -1;
}
-#define CLEANUPprofile(X) if (X) { BBPdecref((X)->batCacheid, TRUE);
(X)->batPersistence = TRANSIENT; } (X) = NULL;
str
-cleanupProfiler()
+cleanupProfiler(void)
{
mal_set_lock(mal_contextLock, "cleanup");
- CLEANUPprofile(TRACE_id_event);
- CLEANUPprofile(TRACE_id_time);
- CLEANUPprofile(TRACE_id_pc);
- CLEANUPprofile(TRACE_id_stmt);
- CLEANUPprofile(TRACE_id_type);
- CLEANUPprofile(TRACE_id_rbytes);
- CLEANUPprofile(TRACE_id_wbytes);
- CLEANUPprofile(TRACE_id_reads);
- CLEANUPprofile(TRACE_id_writes);
- CLEANUPprofile(TRACE_id_thread);
- CLEANUPprofile(TRACE_id_user);
- TRACE_init = 0;
+ _cleanupProfiler();
mal_unset_lock(mal_contextLock, "cleanup");
return MAL_SUCCEED;
}
@@ -1119,7 +1134,7 @@
BBPclear(TRACE_id_reads->batCacheid);
BBPclear(TRACE_id_writes->batCacheid);
TRACE_init = 0;
- initTrace();
+ _initTrace();
mal_unset_lock(mal_contextLock, "cleanup");
}
diff -r 2aef3c300042 -r 893f5c3b933e buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc Fri Aug 13 14:01:50 2010 +0200
+++ b/buildtools/conf/winrules.msc Fri Aug 13 14:23:29 2010 +0200
@@ -131,7 +131,10 @@
!IFNDEF LIBZLIB
LIBZLIB = C:\zlib-1.2.3.win$(bits)
!ENDIF
-Z_LIBS = "$(LIBZLIB)\lib\zlib1$(DEBUGLIB).lib"
+!IFNDEF LIBZLIBFILE
+LIBZLIBFILE=zlib1
+!ENDIF
+Z_LIBS = "$(LIBZLIB)\lib\$(LIBZLIBFILE)$(DEBUGLIB).lib"
Z_CFLAGS = -DHAVE_LIBZ "-I$(LIBZLIB)\include"
!ENDIF
diff -r 2aef3c300042 -r 893f5c3b933e buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst Fri Aug 13 14:01:50 2010 +0200
+++ b/buildtools/doc/windowsbuild.rst Fri Aug 13 14:23:29 2010 +0200
@@ -24,11 +24,11 @@
In this document we describe how to build the MonetDB suite of
programs on Windows using the sources from our source repository at
-SourceForge__. This document is mainly targeted at building on
+`our server`__. This document is mainly targeted at building on
Windows XP on a 32-bit architecture, but there are notes throughout
about building on Windows XP x64 which is indicated with Windows64.
-__ http://sourceforge.net/projects/monetdb/
+__ http://dev.monetdb.org/hg/MonetDB/
Introduction
============
@@ -158,8 +158,10 @@
- Microsoft Visual Studio .NET 2003 (also known as Microsoft Visual Studio 7);
- Microsoft Visual Studio 2005 (also known as Microsoft Visual Studio 8);
+- Microsoft Visual Studio 2008 (also known as Microsoft Visual Studio 9.0);
- Intel(R) C++ Compiler 9.1 (which actually needs one of the above);
-- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers).
+- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers);
+- Intel(R) C++ Compiler 11.1 (which also needs one of the Microsoft compilers).
Note that the pathfinder component can currently not be compiled with
any of the Microsoft compilers. It can be compiled with the Intel
@@ -171,6 +173,9 @@
a version that uses the MinGW__ (Minimalist GNU for Windows) package.
This is not supported and not further described here.
+We currently use Microsoft Visual Studio 2008 and Intel(R) C++
+Compiler Professional 11.1.046.
+
__ http://www.cygwin.com/
__ http://www.mingw.org/
@@ -198,6 +203,10 @@
link on the left and then on Bison, and get the Setup file and install
it.
+However, we use the version of bison that comes with Cygwin__.
+
+__ http://www.cygwin.com/
+
Flex
----
@@ -207,6 +216,10 @@
at http://gnuwin32.sourceforge.net/. Click on the Packages link on
the left and then on Flex, and get the Setup file and install it.
+However, we use the version of bison that comes with Cygwin__.
+
+__ http://www.cygwin.com/
+
Pthreads
--------
@@ -302,8 +315,9 @@
the clients component when it needs to talk to a MonetDB5 server.
Download the source from http://www.openssl.org/. We used the latest
-stable version (0.9.8k). Follow the instructions in the file
-``INSTALL.W32`` or ``INSTALL.W64``.
+stable version (1.0.0a). Follow the instructions in the file
+``INSTALL.W32`` or ``INSTALL.W64``. We used the option
+``enable-static-engine`` as described in the instructions.
Fix the ``OPENSSL`` definitions in ``buildtools\conf\winrules.msc`` so
that they refer to the location where you installed the library and
@@ -325,19 +339,17 @@
Install these in e.g. ``C:\``.
Note that we hit a bug in version 2.6.31 of libxml2. See the
-bugreport__. Use version 2.6.30 or 2.6.32.
+bugreport__. Use version 2.6.30 or 2.6.32 or later.
On Windows64 you will have to compile libxml2 yourself (with its
optional prerequisites iconv_ and zlib_, for which see below).
-Edit the file ``win32\Makefile.msvc`` and change the one occurrence of
-``zdll.lib`` to ``zlib1.lib``, and then run the following commands in
-the ``win32`` subfolder, substituting the correct locations for the
-iconv and zlib libraries::
+Run the following commands in the ``win32`` subfolder, substituting
+the correct locations for the iconv and zlib libraries::
- cscript configure.js compiler=msvc prefix=C:\libxml2-2.6.30.win64 ^
- include=C:\iconv-1.11.win64\include;C:\zlib-1.2.3.win64\include ^
- lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.3.win64\lib iconv=yes zlib=yes
+ cscript configure.js compiler=msvc prefix=C:\libxml2-2.7.7.win64 ^
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
