Hi all,

5 of 8 ) change fusion/lock.c to use new monotonic pthread interface.


Regards,

diff --git a/lib/fusion/lock.c b/lib/fusion/lock.c
index 225dfff..5132c7c 100644
--- a/lib/fusion/lock.c
+++ b/lib/fusion/lock.c
@@ -575,7 +575,7 @@ fusion_skirmish_init( FusionSkirmish    *skirmish,
      D_ASSERT( skirmish != NULL );

      direct_util_recursive_pthread_mutex_init( &skirmish->single.lock );
-     pthread_cond_init( &skirmish->single.cond, NULL );
+     direct_util_monotonic_pthread_cond_init( &skirmish->single.cond );

      return DR_OK;
 }
@@ -655,14 +655,9 @@ fusion_skirmish_wait( FusionSkirmish *skirmish, 
unsigned int timeout )

      if (timeout) {
           struct timespec ts;
-          struct timeval  tv;
           int             ret;

-          gettimeofday( &tv, NULL );
-
-          ts.tv_nsec = tv.tv_usec*1000 + (timeout%1000)*1000;
-          ts.tv_sec  = tv.tv_sec + timeout/1000 + ts.tv_nsec/1000000000;
-          ts.tv_nsec = ts.tv_nsec % 1000000000;
+          direct_util_get_monotonic_pthread_timeout(&ts, timeout/1000, 
(timeout%1000)*1000000);

           ret = pthread_cond_timedwait( &skirmish->single.cond,
                                         &skirmish->single.lock, &ts );


_______________________________________________
directfb-dev mailing list
directfb-dev@directfb.org
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev

Reply via email to