A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix build on mac
[simgrid.git]
/
src
/
xbt
/
xbt_os_thread.c
diff --git
a/src/xbt/xbt_os_thread.c
b/src/xbt/xbt_os_thread.c
index
6acbaeb
..
e530de4
100644
(file)
--- a/
src/xbt/xbt_os_thread.c
+++ b/
src/xbt/xbt_os_thread.c
@@
-329,11
+329,13
@@
void xbt_os_mutex_acquire(xbt_os_mutex_t mutex)
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
{
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
{
+ int errcode;
+
if (delay < 0) {
xbt_os_mutex_acquire(mutex);
} else if (delay == 0) {
if (delay < 0) {
xbt_os_mutex_acquire(mutex);
} else if (delay == 0) {
-
int
errcode = pthread_mutex_trylock(&(mutex->m));
+ errcode = pthread_mutex_trylock(&(mutex->m));
switch (errcode) {
case 0:
switch (errcode) {
case 0:
@@
-359,7
+361,7
@@
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
int errcode = pthread_mutex_timedlock(&(mutex->m), &ts_end);
int errcode = pthread_mutex_timedlock(&(mutex->m), &ts_end);
-#else
/* Well, let's reimplement it since those lazy libc dudes didn't
*/
+#else
/* reimplement it since those lazy libc dudes didn't (Mac OSX, hu?)
*/
double start = xbt_os_time();
do {
errcode = pthread_mutex_trylock(&(mutex->m));
double start = xbt_os_time();
do {
errcode = pthread_mutex_trylock(&(mutex->m));