diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-26 15:29:30 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-26 15:29:30 +0200 |
| commit | 41e6d95c4ca11598a5eb93901ce2fb0b758e9657 (patch) | |
| tree | 7f2f967c396a4005607a96a99b00b30ec28bd953 | |
| parent | 4a5a75811e2cd590b5c94f71864a5245fd511ccf (diff) | |
| download | otp-41e6d95c4ca11598a5eb93901ce2fb0b758e9657.tar.gz otp-41e6d95c4ca11598a5eb93901ce2fb0b758e9657.tar.bz2 otp-41e6d95c4ca11598a5eb93901ce2fb0b758e9657.zip | |
Change start order so that service_event gets initialized before it's used
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 0a57eb6d88..0173fd40f6 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -803,10 +803,12 @@ early_init(int *argc, char **argv) /* #if defined(HIPE) hipe_signal_init(); /* must be done very early */ #endif - erl_sys_init(); erl_sys_args(argc, argv); + /* Creates threads on Windows that depend on the arguments, so has to be after erl_sys_args */ + erl_sys_init(); + erts_ets_realloc_always_moves = 0; erts_ets_always_compress = 0; erts_dist_buf_busy_limit = ERTS_DE_BUSY_LIMIT; |