diff options
| author | Rickard Green <[email protected]> | 2011-05-13 14:27:41 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-05-13 14:27:41 +0200 |
| commit | 0c73cf3d305c4b033c6e1efa6ebd08796a1d8682 (patch) | |
| tree | 4aa3a5a40d8303f1f6f01cd90cee43857371db07 /erts/emulator/beam/erl_drv_thread.c | |
| parent | 926795501b71ebf9ca4b22927021fa551549f9b0 (diff) | |
| parent | 139fa05489a6ba3e4384e6f20ea3f943741449d5 (diff) | |
| download | otp-0c73cf3d305c4b033c6e1efa6ebd08796a1d8682.tar.gz otp-0c73cf3d305c4b033c6e1efa6ebd08796a1d8682.tar.bz2 otp-0c73cf3d305c4b033c6e1efa6ebd08796a1d8682.zip | |
Merge branch 'rickard/barriers/OTP-9281' into dev
* rickard/barriers/OTP-9281:
Silence warnings
Fix build with hipe on amd64
Reduce number of atomic ops
Use 32-bit atomic for port snapshot
Remove pointless erts_ports_alive variable
Ensure quick break
Ensure that all rehashing information are seen when done
Ensure that stack updates are seen when stack is released
Add needed barriers for write_concurrency tables
Homogenize memory barriers on atomics
Diffstat (limited to 'erts/emulator/beam/erl_drv_thread.c')
| -rw-r--r-- | erts/emulator/beam/erl_drv_thread.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c index 39bbe9633b..dc578f6d2a 100644 --- a/erts/emulator/beam/erl_drv_thread.c +++ b/erts/emulator/beam/erl_drv_thread.c @@ -700,6 +700,13 @@ erl_drv_thread_join(ErlDrvTid tid, void **respp) extern int erts_darwin_main_thread_pipe[2]; extern int erts_darwin_main_thread_result_pipe[2]; +int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp); +int erl_drv_steal_main_thread(char *name, + ErlDrvTid *dtid, + void* (*func)(void*), + void* arg, + ErlDrvThreadOpts *opts); + int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp) |