Fix Win32 build. VC++ 6.0 and 7.0 now use the thread-safe code.

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@197 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/THREADS b/THREADS
index 0dc5cec765638a0835c5cae5c0554d205c1f8b0e..152a2c3cab36f1ad7ff03fb3fb0cf9ccce2818ab 100644 (file)
--- a/THREADS
+++ b/THREADS
@@ -54,4 +54,7 @@ thread-safe.
   It uses lots of global vars. You may use it in functions not
   designed to be thread-safe like functions wrapping the _r version of some
   operation (eg. rrd_create, but not in rrd_create_r)
-  
+
+WIN32 Platform Note (added 04/01/03):
+
+Both rrdtool.vcproj (MSVC++ 7.0) and rrd.dsw (MSVC++ 6.0) are configured to compile with rrd_thread_safe_nt.c.

diff --git a/bindings/perl-shared/ntmake.pl b/bindings/perl-shared/ntmake.pl
index 75321fd52eb202f220fd718cac543cecd4601db8..76eab97be1824357a89a044094ab995d362c9a17 100644 (file)
--- a/bindings/perl-shared/ntmake.pl
+++ b/bindings/perl-shared/ntmake.pl
@@ -14,7 +14,8 @@ WriteMakefile(
    'INC'       => '-I../../src/ -I../../libraries/freetype-2.0.5/include -I ../../libraries/libart_lgpl-2.3.7 -I ../../libraries/zlib-1.1.4 -I ../../libraries/libpng-1.2.0',
    'OPTIMIZE' => '-O2 -MT',
 # change this path to refer to your libc.lib
-    'MYEXTLIB'  => '"$(VCINSTALLDIR)/vc7/lib/libcmt.lib" ../../src/debug/rrd.lib ../../libraries/libart_lgpl-2.3.7/debug/libart.lib ../../libraries/zlib-1.1.4/debug/zlib.lib ../../libraries/libpng-1.2.0/debug/png.lib ../../libraries/freetype-2.0.5/debug/freetype.lib', 
+# keep one line for MSVC++ 6.0 and one for 7.0
+    'MYEXTLIB'  => '"' . $ENV{'MSVCDir'} . '/lib/libc.lib" ../../src/release/rrd.lib ../../libraries/libart_lgpl-2.3.7/release/libart.lib ../../libraries/zlib-1.1.4/release/zlib.lib ../../libraries/libpng-1.2.0/release/png.lib ../../libraries/freetype-2.0.5/release/freetype.lib', 
 #   'MYEXTLIB'  => '"$(VCINSTALLDIR)/vc7/lib/libcmt.lib" ../../src/release/rrd.lib ../../libraries/libart_lgpl-2.3.7/release/libart.lib ../../libraries/zlib-1.1.4/release/zlib.lib ../../libraries/libpng-1.2.0\release\png.lib ../../libraries/freetype-2.0.5/release/freetype.lib', 
     'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
     ($] ge '5.005') ? (

diff --git a/src/rrd.dsp b/src/rrd.dsp
index d40a217e373fb0fe7439c000e791e3bc7bb7dbd5..38aa7ccfb3e78e1bc156615f85e1663628118527 100644 (file)
--- a/src/rrd.dsp
+++ b/src/rrd.dsp
@@ -160,6 +160,10 @@ SOURCE=.\rrd_last.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rrd_nan_inf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\rrd_open.c
 # End Source File
 # Begin Source File
@@ -176,6 +180,10 @@ SOURCE=.\rrd_rpncalc.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rrd_thread_safe_nt.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\rrd_tune.c
 # End Source File
 # Begin Source File

diff --git a/src/rrd.h b/src/rrd.h
index bdcc720886edf2b9b4b8d8fd903843886b6f947f..078e29ecc5621a3e2efb6f1309cfc1023d197ba8 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -5,6 +5,9 @@
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.4  2003/04/01 22:52:23  jake
+ * Fix Win32 build. VC++ 6.0 and 7.0 now use the thread-safe code.
+ *
  * Revision 1.3  2003/02/13 07:05:27  oetiker
  * Find attached the patch I promised to send to you. Please note that there
  * are three new source files (src/rrd_is_thread_safe.h, src/rrd_thread_safe.c
@@ -62,7 +65,7 @@ int    rrd_create_r(char *filename,
                    int argc, char **argv);
 /* NOTE: rrd_update_r is only thread-safe if no at-style time
    specifications get used!!! */
-int    rrd_update_r(char *filename, char *template,
+int    rrd_update_r(char *filename, char *_template,
                    int argc, char **argv);
 int    rrd_dump_r(char *filename);
 time_t rrd_last_r(char *filename);

diff --git a/src/rrd.vcproj b/src/rrd.vcproj
index c1b05846f96b0045021adb47a99d18a199fb7539..3c141fcf37fef9bc7ea3699cebc3aa677bd53cca 100644 (file)
--- a/src/rrd.vcproj
+++ b/src/rrd.vcproj
@@ -65,7 +65,7 @@
                                Optimization="0"
                                AdditionalIncludeDirectories="..\libraries\libpng-1.2.0,..\libraries\zlib-1.1.4,..\libraries\libart_lgpl-2.3.7,..\libraries\freetype-2.0.5\include"
                                PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,_CTYPE_DISABLE_MACROS"
-                               RuntimeLibrary="4"
+                               RuntimeLibrary="1"
                                PrecompiledHeaderFile=".\debug/rrd.pch"
                                AssemblerListingLocation=".\debug/"
                                ObjectFile=".\debug/"
@@ -154,6 +154,9 @@
                <File
                        RelativePath=".\rrd_last.c">
                </File>
+               <File
+                       RelativePath="rrd_nan_inf.c">
+               </File>
                <File
                        RelativePath=".\rrd_open.c">
                </File>
@@ -166,6 +169,9 @@
                <File
                        RelativePath=".\rrd_rpncalc.c">
                </File>
+               <File
+                       RelativePath="rrd_thread_safe_nt.c">
+               </File>
                <File
                        RelativePath=".\rrd_tune.c">
                </File>

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 715f0dc76e160f97645f404d4739fd689e82f452..e47c41223e81a9c0c5ba6535586102ca13326ad8 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -29,7 +29,7 @@
 
 #ifndef RRD_DEFAULT_FONT
 #ifdef WIN32
-#define RRD_DEFAULT_FONT "c:/winnt/fonts/COUR.TTF"
+/* this is set in confignt/config.h */
 #else
 #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" 
 /* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */

diff --git a/src/rrd_nan_inf.c b/src/rrd_nan_inf.c
index 9fc3b616ff010d8d86b2c15b19f71f674c68cb4a..ce0873e5ed37003c7e4c12dd7ae29866870aae0a 100644 (file)
--- a/src/rrd_nan_inf.c
+++ b/src/rrd_nan_inf.c
@@ -2,6 +2,8 @@
 
 #if defined(WIN32)
 
+#include <math.h>
+
 double set_to_DNAN(void) { return (double)fmod(0.0,0.0); }
 double set_to_DINF(void) { return (double)fabs((double)log(0.0)); }
 

diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c
index 13160e69cea2fc835ec6faffcd8f38c068bcd673..8cdc00e54b289cecec0eb580c9a73838aacefa4c 100644 (file)
--- a/src/rrd_not_thread_safe.c
+++ b/src/rrd_not_thread_safe.c
@@ -13,6 +13,7 @@
 #include "rrd_tool.h"
 #define MAXLEN 4096
 #define ERRBUFLEN 256
+
 static char rrd_error[MAXLEN] = "\0";
 static char rrd_liberror[ERRBUFLEN] = "\0";
 /* The global context is very useful in the transition period to even

diff --git a/src/rrd_thread_safe_nt.c b/src/rrd_thread_safe_nt.c
new file mode 100644 (file)
index 0000000..337a994
--- /dev/null
+++ b/src/rrd_thread_safe_nt.c
@@ -0,0 +1,141 @@
+/*****************************************************************************
+ * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
+ *                             & Tobias Oetiker
+ * Distributed under the GPL
+ *****************************************************************************
+ * rrd_thread_safe.c   Contains routines used when thread safety is required
+ *                     for win32
+ *****************************************************************************
+ * $Id$
+ *************************************************************************** */
+
+#include <windows.h>
+#include <string.h>
+/* #include <error.h> */
+#include "rrd.h"
+#include "rrd_tool.h"
+
+/* Key for the thread-specific rrd_context */
+static DWORD context_key;
+static CRITICAL_SECTION CriticalSection; 
+
+
+/* Once-only initialisation of the key */
+static DWORD context_key_once = 0;
+
+
+/* Free the thread-specific rrd_context - we might actually use
+   rrd_free_context instead...
+ */
+static void context_destroy_context(void)
+{
+       DeleteCriticalSection(&CriticalSection);
+    TlsFree(context_key);
+       context_key_once=0;
+}
+static void context_init_context(void)
+{
+       if (!InterlockedExchange(&context_key_once, 1)) {
+               context_key = TlsAlloc();
+               InitializeCriticalSection(&CriticalSection);
+               atexit(context_destroy_context);
+       }
+}
+struct rrd_context *rrd_get_context(void) {
+    struct rrd_context *ctx;
+               
+       context_init_context();
+ 
+    ctx = TlsGetValue(context_key);
+    if (!ctx) {
+               ctx = rrd_new_context();
+               TlsSetValue(context_key, ctx);
+    } 
+    return ctx;
+}
+#undef strerror
+const char *rrd_strerror(int err) {
+    struct rrd_context *ctx;
+       context_init_context();
+
+       ctx = rrd_get_context();
+
+    EnterCriticalSection(&CriticalSection); 
+    strncpy(ctx->lib_errstr, strerror(err), ctx->errlen);
+       LeaveCriticalSection(&CriticalSection); 
+
+    return ctx->lib_errstr;
+}
+/*
+ * there much be a re-entrant version of these somewhere in win32 land
+ */
+struct tm* localtime_r(const time_t *timep, struct tm* result)
+{
+       struct tm *local;
+       context_init_context();
+
+       EnterCriticalSection(&CriticalSection);
+       local = localtime(timep);
+       memcpy(result,local,sizeof(struct tm));
+       LeaveCriticalSection(&CriticalSection);
+       return result;
+}
+char* ctime_r(const time_t *timep, char* result)
+{
+       char *local;
+       context_init_context();
+
+       EnterCriticalSection(&CriticalSection);
+       local = ctime(timep);
+       strcpy(result,local);
+       LeaveCriticalSection(&CriticalSection);
+       return result;
+}
+
+struct tm* gmtime_r(const time_t *timep, struct tm* result)
+{
+       struct tm *local;
+       context_init_context();
+
+       EnterCriticalSection(&CriticalSection);
+       local = gmtime(timep);
+       memcpy(result,local,sizeof(struct tm));
+       LeaveCriticalSection(&CriticalSection);
+       return result;
+}
+
+/* implementation from Apache's APR library */
+char *strtok_r(char *str, const char *sep, char **last)
+{
+    char *token;
+       context_init_context();
+
+
+    if (!str)           /* subsequent call */
+        str = *last;    /* start where we left off */
+
+    /* skip characters in sep (will terminate at '\0') */
+    while (*str && strchr(sep, *str))
+        ++str;
+
+    if (!*str)          /* no more tokens */
+        return NULL;
+
+    token = str;
+
+    /* skip valid token characters to terminate token and
+     * prepare for the next call (will terminate at '\0) 
+     */
+    *last = token + 1;
+    while (**last && !strchr(sep, **last))
+        ++*last;
+
+    if (**last) {
+        **last = '\0';
+        ++*last;
+    }
+
+    return token;
+}
+

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 6d7652b74d0bd507ad553bed09c564199d61b5f8..16bd4f27ec2ebeac915d74190a230659421cc0c5 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -110,6 +110,10 @@ int isnan(double value);
 #define isnan _isnan
 #define finite _finite
 #define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
+struct tm* localtime_r(const time_t *timep, struct tm* result);
+char* ctime_r(const time_t *timep, char* result);
+struct tm* gmtime_r(const time_t *timep, struct tm* result);
+char *strtok_r(char *str, const char *sep, char **last);
 #endif
 
 /* local include files -- need to be after the system ones */

diff --git a/src/rrdtool.dsp b/src/rrdtool.dsp
index ecffcc7b2d2d1a25ba25529dbf72add78f2bf8a1..3f24fd85b6281266517e31b1f814d2766f510c44 100644 (file)
--- a/src/rrdtool.dsp
+++ b/src/rrdtool.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "NDEBUG"
 # ADD RSC /l 0x100c /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "_DEBUG"
 # ADD RSC /l 0x100c /d "_DEBUG"