Changeset 1290:7945c75972b0 in freeDiameter

Timestamp:

Jun 17, 2015, 12:32:07 AM (9 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix test_app for Mac OS X. Need to retest on other systems.

File:

• extensions/test_app/ta_bench.c (modified) (6 diffs)

extensions/test_app/ta_bench.c

@@ -37 +37 @@
 
 #include "test_app.h"
-
+#include <stdio.h>
+
+#ifndef __APPLE__ /* they deprecated the semaphore there... */
 #include <semaphore.h>
-#include <stdio.h>
+
+#define my_sem_t sem_t
+#define my_sem_init sem_init
+#define my_sem_destroy sem_detroy
+#define my_sem_timedwait sem_timedwait
+#define my_sem_post sem_post
+
+#else // on APPLE
+#include <sched.h>
+#include <dispatch/dispatch.h>
+
+#define my_sem_t dispatch_semaphore_t
+
+static int my_sem_init(my_sem_t * s, int pshared, unsigned int value ) {
+        *s = dispatch_semaphore_create(value);
+        if (*s == NULL)
+                return ENOMEM;
+        return 0;
+}
+
+static int my_sem_destroy(my_sem_t *s) {
+        dispatch_release(*s);
+        *s = NULL;
+        return 0;
+}
+
+static int my_sem_timedwait(my_sem_t * s, struct timespec *ts) {
+        struct timespec tsn;
+        int64_t nsec;
+        dispatch_time_t when;
+        
+        CHECK_SYS( clock_gettime(CLOCK_REALTIME, &tsn) );
+        
+        nsec = (ts->tv_sec * 1000000000) + ts->tv_nsec
+                - (tsn.tv_sec * 1000000000) - tsn.tv_nsec;
+        
+        when = dispatch_time (  DISPATCH_TIME_NOW, nsec );
+        
+        return dispatch_semaphore_wait ( *s, when ) ? ETIMEDOUT : 0;
+}
+
+static int my_sem_post(my_sem_t *s) {
+        dispatch_semaphore_signal(*s);
+        return 0;
+}
+
+#endif // APPLE
+
+
 
 struct ta_mess_info {
@@ -46 +96 @@
 };
 
-static sem_t ta_sem; /* To handle the concurrency */
+static my_sem_t ta_sem; /* To handle the concurrency */
 
 /* Cb called when an answer is received */
@@ -110 +160 @@
         
         /* Post the semaphore */
-        CHECK_SYS_DO( sem_post(&ta_sem), );
+        CHECK_SYS_DO( my_sem_post(&ta_sem), );
         
         return;
@@ -214 +264 @@
         do {
                 /* Do not create more that NB_CONCURRENT_MESSAGES in paralel */
-                int ret = sem_timedwait(&ta_sem, &end_time);
+                int ret = my_sem_timedwait(&ta_sem, &end_time);
                 if (ret == -1) {
                         ret = errno;
@@ -270 +320 @@
 int ta_bench_init(void)
 {
-        CHECK_SYS( sem_init( &ta_sem, 0, ta_conf->bench_concur) );
+        CHECK_SYS( my_sem_init( &ta_sem, 0, ta_conf->bench_concur) );
 
         CHECK_FCT( fd_event_trig_regcb(ta_conf->signal, "test_app.bench", ta_bench_start ) );
@@ -281 +331 @@
         // CHECK_FCT_DO( fd_sig_unregister(ta_conf->signal), /* continue */ );
         
-        CHECK_SYS_DO( sem_destroy(&ta_sem), );
+        CHECK_SYS_DO( my_sem_destroy(&ta_sem), );
         
         return;