Changeset 21049

Timestamp:

02/23/08 12:45:32 (6 months ago)

Author:

patrick

Message:

Test for unnamed POSIX semaphore support instead of tracking
ploatform-specific information in SemaphorePosix?.{cpp,h}.

Files:

• juggler/trunk/modules/vapor/configure.ac (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/md/POSIX/Sync/SemaphorePosix.cpp (modified) (4 diffs)
• juggler/trunk/modules/vapor/vpr/md/POSIX/Sync/SemaphorePosix.h (modified) (3 diffs)

juggler/trunk/modules/vapor/configure.ac

@@ -341 +341 @@
-        AC_MSG_WARN(*** POSIX threads will not be used (no library found) ***)
-    fi
+
+    DPP_LANG_SAVE
+    DPP_LANG_C
+
+    vprsave_CFLAGS="$CFLAGS"
+    vprsave_LIBS="$LIBS"
+
+    CFLAGS="$CFLAGS $PTHREAD_ARG"
+    LIBS="$LIBS $PTHREAD_LIB"
+
+    # If the code below compiles, links, and returns 0, then we can use
+    # unnamed POSIX semaphores.
+    AC_CACHE_CHECK([for unnamed POSIX semaphore support],
+                   [ac_cv_has_unnamed_posix_semaphores],
+                   [AC_RUN_IFELSE([
+#include <semaphore.h>
+
+int main()
+{
+   sem_t sema;
+   return sem_init(&sema, 0, 1);
+}],
+                        [ac_cv_has_unnamed_posix_semaphores='yes'],
+                        [ac_cv_has_unnamed_posix_semaphores='no'])]
+                  )
+
+    if test "x$ac_cv_has_unnamed_posix_semaphores" = "xyes" ; then
+        AC_DEFINE(VPR_HAVE_UNNAMED_POSIX_SEMAPHORE, ,
+                  [Define if unnamed POSIX semaphores are available.])
+    fi
+
+    CFLAGS="$vprsave_CFLAGS"
+    LIBS="$vprsave_LIBS"
+
+    DPP_LANG_RESTORE
-
-    # Do not define _POSIX_C_SOURCE here because it will cause problems when

juggler/trunk/modules/vapor/vpr/md/POSIX/Sync/SemaphorePosix.cpp

@@ -46 +46 @@
-#include <vpr/md/POSIX/Sync/SemaphorePosix.h>
-
-#if defined(VPR_OS_Darwin) && VPR_OS_RELEASE_MAJOR <= 9
-#define VPR_USE_NAMED_SEMAPHORE 1
-#endif
-
-
-namespace vpr
@@ -56 +52 @@
-SemaphorePosix::SemaphorePosix(const int initialValue)
-{
-def VPR_USE_NAMED_SEMAPHORE
+ ! defined(VPR_HAVE_UNNAMED_POSIX_SEMAPHORE)
-   // Use strdup(3) here so that mktemp(3) can modify the memory.  Trying
-   // to modify a constant string would be bad.
@@ -104 +100 @@
-{
-   // ---- Delete the semaphore --- //
-def VPR_USE_NAMED_SEMAPHORE
+ ! defined(VPR_HAVE_UNNAMED_POSIX_SEMAPHORE)
-   const int result = sem_close(mSema);
-   vprASSERT(result == 0);
@@ -120 +116 @@
-void SemaphorePosix::reset(const int val)
-{
-def VPR_USE_NAMED_SEMAPHORE
+ ! defined(VPR_HAVE_UNNAMED_POSIX_SEMAPHORE)
-   // First deallocate the current semaphore.
-   const int result = sem_close(mSema);

juggler/trunk/modules/vapor/vpr/md/POSIX/Sync/SemaphorePosix.h

@@ -57 +57 @@
-#include <vpr/Sync/DeadlockException.h>
-
-#if defined(VPR_OS_Darwin) && VPR_OS_RELEASE_MAJOR <= 9
-#define VPR_USE_NAMED_SEMAPHORE 1
-#endif
-
-
-namespace vpr
@@ -291 +287 @@
-
-protected:
-def VPR_USE_NAMED_SEMAPHORE
+ ! defined(VPR_HAVE_UNNAMED_POSIX_SEMAPHORE)
-   char* mSemaFile;
-#endif
@@ -299 +295 @@
-} // End of vpr namespace
-
-#undef VPR_USE_NAMED_SEMAPHORE
-
-#endif  /* _VPR_SEMAPHORE_POSIX_H_ */