diff options
| author | Erlang/OTP <[email protected]> | 2010-10-21 12:09:25 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-10-21 12:09:25 +0200 |
| commit | 7343ad05132654c2b5b8366d05991128a28a9a01 (patch) | |
| tree | c6196de1d2459a326a3b0b122aa1721c630b21d0 /lib/kernel/src | |
| parent | 5c68a006f173a75db1ac973dd45e2fe3945958f3 (diff) | |
| parent | d20bbf4f3fe70ed3a00990b0ceb11292732318b8 (diff) | |
| download | otp-7343ad05132654c2b5b8366d05991128a28a9a01.tar.gz otp-7343ad05132654c2b5b8366d05991128a28a9a01.tar.bz2 otp-7343ad05132654c2b5b8366d05991128a28a9a01.zip | |
Merge branch 'bjorn/fix-on_load/OTP-8902' into maint-r14
* bjorn/fix-on_load/OTP-8902:
Teach -init_debug to print info about on_load handlers begin run
Fix hang in on_load handlers in embedded mode
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/kernel.erl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl index 92ee7b441a..d3b0f6c712 100644 --- a/lib/kernel/src/kernel.erl +++ b/lib/kernel/src/kernel.erl @@ -143,6 +143,13 @@ init(safe) -> Boot = start_boot_server(), DiskLog = start_disk_log(), Pg2 = start_pg2(), + + %% Run the on_load handlers for all modules that have been + %% loaded so far. Running them at this point means that + %% on_load handlers can safely call kernel processes + %% (and in particular call code:priv_dir/1 or code:lib_dir/1). + init:run_on_load_handlers(), + {ok, {SupFlags, Boot ++ DiskLog ++ Pg2}}. get_code_args() -> |