diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-16 14:41:28 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-16 14:41:28 +0200 |
| commit | a6b27d639e5c7c85e765331cfe7befbe23c4954b (patch) | |
| tree | 745d5193470835be21d79eff015ca9f06194ce97 /erts/emulator/sys/unix | |
| parent | 0c41940bef1d80b6b335cb0a77d5608d9bbe27fd (diff) | |
| parent | 604967b4c184249d8604f327bb4e683e2c453de8 (diff) | |
| download | otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.tar.gz otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.tar.bz2 otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.zip | |
Merge branch 'pan/win_erlsrv_stop/OTP-9344' into dev
* pan/win_erlsrv_stop/OTP-9344:
Move init of smp rw mutex from init to sys_args to make sure that it is initialized before the first erts_sys_getenv call
Move erts_sys_env_init() to erts_sys_pre_init()
Remove _DEBUG from start_erl.c
Spelling correction in erlsrv doc
Convert windows start_erl to take rootdir on command line
Add command start_disabled to erlsrv
Add global lock for erlsrv to avoid races
Change start order so that service_event gets initialized before it's used
Diffstat (limited to 'erts/emulator/sys/unix')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index bafbbb0f6c..cc08c1d20a 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -527,7 +527,6 @@ erts_sys_pre_init(void) void erl_sys_init(void) { - erts_smp_rwmtx_init(&environ_rwmtx, "environ"); #if !DISABLE_VFORK { int res; @@ -3088,6 +3087,8 @@ get_value(char* rest, char** argv, int* ip) void erl_sys_args(int* argc, char** argv) { + erts_smp_rwmtx_init(&environ_rwmtx, "environ"); + int i, j; i = 1; @@ -3151,4 +3152,5 @@ erl_sys_args(int* argc, char** argv) argv[j++] = argv[i]; } *argc = j; + } |