diff options
| author | Rickard Green <[email protected]> | 2011-11-13 21:43:04 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-13 21:43:04 +0100 |
| commit | 32ef224c9769cd9359496953075e0133358ccf86 (patch) | |
| tree | 791517a9be6dbf7a9081192edbf96e69f086d2e1 /erts/emulator/beam/erl_drv_thread.c | |
| parent | ca58731b5df58aa2a8b42c583d1ba7bb929e72b2 (diff) | |
| parent | 15774d2ac5ba38dba287309f91eb7e4f58b9a636 (diff) | |
| download | otp-32ef224c9769cd9359496953075e0133358ccf86.tar.gz otp-32ef224c9769cd9359496953075e0133358ccf86.tar.bz2 otp-32ef224c9769cd9359496953075e0133358ccf86.zip | |
Merge branch 'rickard/win-cs-mutex/OTP-9671'
* rickard/win-cs-mutex/OTP-9671:
Use critical sections as mutex implementation on Windows
Diffstat (limited to 'erts/emulator/beam/erl_drv_thread.c')
| -rw-r--r-- | erts/emulator/beam/erl_drv_thread.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c index dc578f6d2a..a49a155701 100644 --- a/erts/emulator/beam/erl_drv_thread.c +++ b/erts/emulator/beam/erl_drv_thread.c @@ -158,7 +158,9 @@ erl_drv_mutex_create(char *name) (sizeof(ErlDrvMutex) + (name ? sys_strlen(name) + 1 : 0))); if (dmtx) { - if (ethr_mutex_init(&dmtx->mtx) != 0) { + ethr_mutex_opt opt = ETHR_MUTEX_OPT_DEFAULT_INITER; + opt.posix_compliant = 1; + if (ethr_mutex_init_opt(&dmtx->mtx, &opt) != 0) { erts_free(ERTS_ALC_T_DRV_MTX, (void *) dmtx); dmtx = NULL; } @@ -226,7 +228,9 @@ erl_drv_cond_create(char *name) (sizeof(ErlDrvCond) + (name ? sys_strlen(name) + 1 : 0))); if (dcnd) { - if (ethr_cond_init(&dcnd->cnd) != 0) { + ethr_cond_opt opt = ETHR_COND_OPT_DEFAULT_INITER; + opt.posix_compliant = 1; + if (ethr_cond_init_opt(&dcnd->cnd, &opt) != 0) { erts_free(ERTS_ALC_T_DRV_CND, (void *) dcnd); dcnd = NULL; } |