update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / helgrind / tests / tc24_nonzero_sem.c

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/tests/tc24_nonzero_sem.c b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/tests/tc24_nonzero_sem.c
index e88ab5c8f1ae6038334a8e0dfa84632880dd0917..5e990f5fd5575b923f9cae23680d601f321c6096 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/tests/tc24_nonzero_sem.c
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/tests/tc24_nonzero_sem.c
@@ -2,15 +2,20 @@
    nonzero initial value, when said semaphores are correctly used.
    Also useful for generating VCG of simple semaphore activity, for
    inspection. */
+
 #include <stdio.h>
 #include <pthread.h>
 #include <semaphore.h>
 #include <assert.h>
+#include <stdlib.h>
 #include <unistd.h>
+
 #define N_THREADS 3
-static int my_sem_init(sem_t*, char*, int, unsigned);
+
+static sem_t* my_sem_init(char*, int, unsigned);
 static int my_sem_destroy(sem_t*);
 static int my_sem_wait(sem_t*); //static int my_sem_post(sem_t*);
+
 void* child_fn ( void* semV ) {
    int r;
    sem_t* sem = (sem_t*)semV;
@@ -21,13 +26,13 @@ void* child_fn ( void* semV ) {
 int main ( void )
 {
    int r, i;
-   sem_t sem;
+   sem_t* sem;
    pthread_t child[N_THREADS];
 
-   r= my_sem_init(&sem, "sem1", 0, N_THREADS); assert(!r);
+   sem= my_sem_init("sem1", 0, N_THREADS); assert(sem);
 
    for (i = 0; i < N_THREADS; i++) {
-      r= pthread_create( &child[i], NULL, child_fn, (void*)&sem );
+      r= pthread_create( &child[i], NULL, child_fn, sem );
       assert(!r);
    }
 
@@ -36,63 +41,54 @@ int main ( void )
       assert(!r);
    }
 
-   r= my_sem_destroy(&sem); assert(!r);
+   r= my_sem_destroy(sem); assert(!r);
    return 0;
 }
 
 
-static int my_sem_init (sem_t* s, char* identity, int pshared, unsigned count)
+static sem_t* my_sem_init (char* identity, int pshared, unsigned count)
 {
+   sem_t* s;
+
 #if defined(VGO_linux)
-   return sem_init(s, pshared, count);
+   s = malloc(sizeof(*s));
+   if (s) {
+      if (sem_init(s, pshared, count) < 0) {
+        perror("sem_init");
+        free(s);
+        s = NULL;
+      }
+   }
 #elif defined(VGO_darwin)
    char name[100];
-   sem_t** fakeptr = (sem_t**)s;
-   assert(sizeof(sem_t) >= sizeof(sem_t*));
-   { int i; for (i = 0; i < sizeof(name); i++) name[i] = 0; }
    sprintf(name, "anonsem_%s_pid%d", identity, (int)getpid());
    name[ sizeof(name)-1 ] = 0;
    if (0) printf("name = %s\n", name);
-   *fakeptr = sem_open(name, O_CREAT, 0600, count);
-   if (*fakeptr == (sem_t*)SEM_FAILED)
-      return -1;
-   else
-      return 0;
+   s = sem_open(name, O_CREAT | O_EXCL, 0600, count);
+   if (s == SEM_FAILED) {
+      perror("sem_open");
+      s = NULL;
+   }
 #else
 #  error "Unsupported OS"
 #endif
+
+   return s;
 }
 
 static int my_sem_destroy ( sem_t* s )
 {
-#if defined(VGO_linux)
    return sem_destroy(s);
-#elif defined(VGO_darwin)
-   sem_t** fakeptr = (sem_t**)s;
-   return sem_close(*fakeptr);
-#else
-#  error "Unsupported OS"
-#endif
 }
 
 static int my_sem_wait(sem_t* s)
 {
-#if defined(VGO_linux)
   return sem_wait(s);
-#elif defined(VGO_darwin)
-  return sem_wait( *(sem_t**)s );
-#else
-#  error "Unsupported OS"
-#endif
 }
 
-//static int my_sem_post(sem_t* s)
-//{
-//#if defined(VGO_linux)
-//  return sem_post(s);
-//#elif defined(VGO_darwin)
-//  return sem_post( *(sem_t**)s );
-//#else
-//#  error "Unsupported OS"
-//#endif
-//}
+#if 0
+static int my_sem_post(sem_t* s)
+{
+  return sem_post(s);
+}
+#endif