fix MapServer#4231 for Windows too

unicolet · Jun 23, 2012 · 6081792 · 6081792
1 parent 876f4b3
commit 6081792
Showing 1 changed file with 32 additions and 48 deletions.
diff --git a/mapserver.h b/mapserver.h
@@ -441,55 +441,39 @@ MS_DLL_EXPORT int msImageSetPenGD(gdImagePtr img, colorObj *color);
 #define GET_CLASS(map, lid, cid) map->layers[lid]->class[cid]
 
 #if defined(USE_THREAD) && defined(HAVE_SYNC_FETCH_AND_ADD)
-
-  // __sync* appeared in GCC 4.1.2
-  #define MS_REFCNT_INCR(obj) __sync_fetch_and_add(&obj->refcount, +1)
-  #define MS_REFCNT_DECR(obj) __sync_sub_and_fetch(&obj->refcount, +1)
-  #define MS_REFCNT_INIT(obj) obj->refcount=1, __sync_synchronize()
-
-/*
- * TODO: fix it
- * This particular piece of code provides a locking mechanism around the
- * the reference counter macro so that multiple threads can safely incr/decr
- * the same counter using a MS VC utility function.
- *
- * Unfortunately it does not work (it builds, but hangs) and since building mapserver on Windows
- * is a b***h I'm going to leave it as it is and hope someone else might step up to the challenge.
- * 
- * https://github.com/mapserver/mapserver/issues/4231
- *
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
-
-  #pragma intrinsic (_InterlockedExchangeAdd)
-
-  #if defined(_MSC_VER) && (_MSC_VER <= 1200)
-    #define MS_REFCNT_INCR(obj) ( _InterlockedExchangeAdd((long*)(&obj->refcount), (long)(+1)) +1 )
-    #define MS_REFCNT_DECR(obj) ( _InterlockedExchangeAdd((long*)(&obj->refcount), (long)(-1)) -1 )
-    #define MS_REFCNT_INIT(obj) obj->refcount=1
-  #else
-    #define MS_REFCNT_INCR(obj) ( _InterlockedExchangeAdd((volatile long*)(&obj->refcount), (long)(+1)) +1 )
-    #define MS_REFCNT_DECR(obj) ( _InterlockedExchangeAdd((volatile long*)(&obj->refcount), (long)(-1)) -1 )
-    #define MS_REFCNT_INIT(obj) obj->refcount=1
-  #endif
-
-#elif defined(__MINGW32__) && defined(__i386__)
-
-  #define MS_REFCNT_INCR(obj) ( InterlockedExchangeAdd((long*)(&obj->refcount), (long)(+1)) +1 )
-  #define MS_REFCNT_DECR(obj) ( InterlockedExchangeAdd((long*)(&obj->refcount), (long)(-1)) -1 )
-  #define MS_REFCNT_INIT(obj) obj->refcount=1
-*/
-
-#else
-
-  #define MS_REFCNT_INCR(obj) obj->refcount++
-  #define MS_REFCNT_DECR(obj) (--(obj->refcount))
-  #define MS_REFCNT_INIT(obj) obj->refcount=1
-
+	#define MS_REFCNT_INCR(obj) __sync_fetch_and_add(&obj->refcount, +1)
+	#define MS_REFCNT_DECR(obj) __sync_sub_and_fetch(&obj->refcount, +1)
+	#define MS_REFCNT_INIT(obj) obj->refcount=1, __sync_synchronize()
+#elif defined(USE_THREAD)
+	#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+		#pragma intrinsic (_InterlockedExchangeAdd)
+		#if defined(_MSC_VER) && (_MSC_VER <= 1200)
+			#define MS_REFCNT_INCR(obj) ( _InterlockedExchangeAdd((long*)(&obj->refcount), (long)(+1)) +1 )
+			#define MS_REFCNT_DECR(obj) ( _InterlockedExchangeAdd((long*)(&obj->refcount), (long)(-1)) -1 )
+			#define MS_REFCNT_INIT(obj) obj->refcount=1
+		#else
+			#define MS_REFCNT_INCR(obj) ( _InterlockedExchangeAdd((volatile long*)(&obj->refcount), (long)(+1)) +1 )
+			#define MS_REFCNT_DECR(obj) ( _InterlockedExchangeAdd((volatile long*)(&obj->refcount), (long)(-1)) -1 )
+			#define MS_REFCNT_INIT(obj) obj->refcount=1
+		#endif
+	#elif defined(__MINGW32__) && defined(__i386__)
+		#define MS_REFCNT_INCR(obj) ( InterlockedExchangeAdd((long*)(&obj->refcount), (long)(+1)) +1 )
+		#define MS_REFCNT_DECR(obj) ( InterlockedExchangeAdd((long*)(&obj->refcount), (long)(-1)) -1 )
+		#define MS_REFCNT_INIT(obj) obj->refcount=1
+	#else
+		// unsafe fallback
+		#define MS_REFCNT_INCR(obj) obj->refcount++
+		#define MS_REFCNT_DECR(obj) (--(obj->refcount))
+		#define MS_REFCNT_INIT(obj) obj->refcount=1
+	#endif // close if defined(_MSC..
+#endif // close elif
+
+#if defined(USE_THREAD)
+	#define MS_REFCNT_DECR_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0
+	#define MS_REFCNT_DECR_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0
+
+	#define MS_IS_VALID_ARRAY_INDEX(index, size) ((index<0 || index>=size)?MS_FALSE:MS_TRUE)
 #endif
-#define MS_REFCNT_DECR_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0
-#define MS_REFCNT_DECR_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0
-
-#define MS_IS_VALID_ARRAY_INDEX(index, size) ((index<0 || index>=size)?MS_FALSE:MS_TRUE)
 
 #endif