Helgrind tests: ported tests tc23 and tc24 to Darwin/amd64 too.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11594 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/helgrind/tests/tc23_bogus_condwait.c b/helgrind/tests/tc23_bogus_condwait.c
index 77276a1..aab6f89 100644
--- a/helgrind/tests/tc23_bogus_condwait.c
+++ b/helgrind/tests/tc23_bogus_condwait.c
@@ -9,8 +9,8 @@
pthread_mutex_t mx[4];
pthread_cond_t cv;
pthread_rwlock_t rwl;
-sem_t quit_now;
-static int my_sem_init(sem_t*, char*, int, unsigned);
+sem_t* quit_now;
+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* rescue_me ( void* uu )
@@ -31,14 +31,14 @@
sleep(1);
pthread_cond_signal( &cv );
- my_sem_wait( &quit_now );
+ my_sem_wait( quit_now );
return NULL;
}
void* grab_the_lock ( void* uu )
{
int r= pthread_mutex_lock( &mx[2] ); assert(!r);
- my_sem_wait( &quit_now );
+ my_sem_wait( quit_now );
r= pthread_mutex_unlock( &mx[2] ); assert(!r);
return NULL;
}
@@ -56,7 +56,7 @@
r= pthread_cond_init(&cv, NULL); assert(!r);
r= pthread_rwlock_init(&rwl, NULL); assert(!r);
- r= my_sem_init( &quit_now, "quit_now", 0,0 ); assert(!r);
+ quit_now = my_sem_init( "quit_now", 0,0 ); assert(quit_now);
r= pthread_create( &grabber, NULL, grab_the_lock, NULL ); assert(!r);
sleep(1); /* let the grabber get there first */
@@ -77,13 +77,13 @@
/* mx is held by someone else. */
r= pthread_cond_wait(&cv, &mx[2] );
- r= my_sem_post( &quit_now ); assert(!r);
- r= my_sem_post( &quit_now ); assert(!r);
+ r= my_sem_post( quit_now ); assert(!r);
+ r= my_sem_post( quit_now ); assert(!r);
r= pthread_join( my_rescuer, NULL ); assert(!r);
r= pthread_join( grabber, NULL ); assert(!r);
- r= my_sem_destroy( &quit_now ); assert(!r);
+ r= my_sem_destroy( quit_now ); assert(!r);
return 0;
}
@@ -94,58 +94,47 @@
-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
}
diff --git a/helgrind/tests/tc24_nonzero_sem.c b/helgrind/tests/tc24_nonzero_sem.c
index e88ab5c..5e990f5 100644
--- a/helgrind/tests/tc24_nonzero_sem.c
+++ b/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 @@
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 @@
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