diff options
| author | Sverker Eriksson <[email protected]> | 2012-01-17 11:18:26 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-02-21 12:22:57 +0100 |
| commit | 41cf0cb977472a15527b6ac693883daaa84faa5a (patch) | |
| tree | a5338019a019fdec255796f0dd48a1b2b3c2f44f /erts/emulator/beam/erl_init.c | |
| parent | 587e7c4a43e5650637390719dc9df2586368d60b (diff) | |
| download | otp-41cf0cb977472a15527b6ac693883daaa84faa5a.tar.gz otp-41cf0cb977472a15527b6ac693883daaa84faa5a.tar.bz2 otp-41cf0cb977472a15527b6ac693883daaa84faa5a.zip | |
erts: First stab at code_ix interface and beam_catches using it
Code loading still blocking
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -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 717315d8bd..8d382057dc 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -236,7 +236,7 @@ void erl_error(char *fmt, va_list args) static int early_init(int *argc, char **argv); void -erts_short_init(void) +erts_short_init_SVERK_SAYS_NOT_USED(void) { int ncpu = early_init(NULL, NULL); erl_init(ncpu); @@ -264,6 +264,7 @@ erl_init(int ncpu) erts_init_trace(); erts_init_binary(); erts_init_bits(); + erts_code_ix_init(); erts_init_fun_table(); init_atom_table(); init_export_table(); @@ -1471,6 +1472,7 @@ erl_start(int argc, char **argv) init_shared_memory(boot_argc, boot_argv); load_preloaded(); + erts_commit_loader_code_ix(); erts_initialized = 1; |