Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
when requested to acquire a cond or semaphore with max_duration=0, call the regular...
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 20 Oct 2009 13:10:04 +0000 (13:10 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 20 Oct 2009 13:10:04 +0000 (13:10 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6808 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/simix/smx_synchro.c

index 8272cce..5c95b5d 100644 (file)
@@ -263,7 +263,7 @@ void SIMIX_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex,
     }
 
   } else
     }
 
   } else
-    __SIMIX_cond_wait(cond);
+    SIMIX_cond_wait(cond,NULL);
 
   /* get the mutex again if necessary */
   if(mutex != NULL)
 
   /* get the mutex again if necessary */
   if(mutex != NULL)
@@ -491,5 +491,5 @@ void SIMIX_sem_acquire_timeout(smx_sem_t sem, double max_duration) {
     }
 
   } else
     }
 
   } else
-    SIMIX_sem_block_onto(sem);
+    SIMIX_sem_acquire(sem);
 }
 }