projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
native_client
/
src
/
untrusted
/
pthread
/
nc_mutex.c
diff --git
a/src/native_client/src/untrusted/pthread/nc_mutex.c
b/src/native_client/src/untrusted/pthread/nc_mutex.c
index
d7344a4
..
b16ed7b
100644
(file)
--- a/
src/native_client/src/untrusted/pthread/nc_mutex.c
+++ b/
src/native_client/src/untrusted/pthread/nc_mutex.c
@@
-113,8
+113,9
@@
static int mutex_lock_nonrecursive(pthread_mutex_t *mutex, int try_only,
__sync_val_compare_and_swap(&mutex->mutex_state,
LOCKED_WITHOUT_WAITERS,
LOCKED_WITH_WAITERS) != UNLOCKED) {
__sync_val_compare_and_swap(&mutex->mutex_state,
LOCKED_WITHOUT_WAITERS,
LOCKED_WITH_WAITERS) != UNLOCKED) {
- int rc = __nc_irt_futex.futex_wait_abs(&mutex->mutex_state,
- LOCKED_WITH_WAITERS, abstime);
+ int rc = __libnacl_irt_futex.futex_wait_abs(&mutex->mutex_state,
+ LOCKED_WITH_WAITERS,
+ abstime);
if (abstime != NULL && rc == ETIMEDOUT)
return ETIMEDOUT;
}
if (abstime != NULL && rc == ETIMEDOUT)
return ETIMEDOUT;
}
@@
-233,7
+234,7
@@
int pthread_mutex_unlock(pthread_mutex_t *mutex) {
*/
mutex->mutex_state = UNLOCKED;
int woken;
*/
mutex->mutex_state = UNLOCKED;
int woken;
- __
nc
_irt_futex.futex_wake(&mutex->mutex_state, 1, &woken);
+ __
libnacl
_irt_futex.futex_wake(&mutex->mutex_state, 1, &woken);
}
return 0;
}
}
return 0;
}