diff options
| author | Patrik Nyblom <[email protected]> | 2013-04-05 18:51:50 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-04-05 18:51:50 +0200 |
| commit | b9ef8bac23fa0421765afe3073f430a1f0d92260 (patch) | |
| tree | 94428e0a154e4c7c835d56b92fb0e42eda19b12c /erts/emulator/beam/io.c | |
| parent | b269e15eea9232205a371d6b10c50628d836b661 (diff) | |
| parent | 7b31cdb80624567568474d79bff07e053457a450 (diff) | |
| download | otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.tar.gz otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.tar.bz2 otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.zip | |
Merge branch 'maint-r16' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/emulator/beam/io.c')
| -rw-r--r-- | erts/emulator/beam/io.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index a9771de7ad..7cadd4aaad 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -2651,11 +2651,17 @@ void erts_init_io(int port_tab_size, int port_tab_size_ignore_files) { ErlDrvEntry** dp; + UWord common_element_size; erts_smp_rwmtx_opt_t drv_list_rwmtx_opts = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER; drv_list_rwmtx_opts.type = ERTS_SMP_RWMTX_TYPE_EXTREMELY_FREQUENT_READ; drv_list_rwmtx_opts.lived = ERTS_SMP_RWMTX_LONG_LIVED; + common_element_size = ERTS_ALC_DATA_ALIGN_SIZE(sizeof(Port)); + common_element_size += ERTS_ALC_DATA_ALIGN_SIZE(sizeof(ErtsPortTaskBusyPortQ)); + common_element_size += 10; /* name */ #ifdef ERTS_SMP + common_element_size += sizeof(erts_mtx_t); + init_xports_list_alloc(); #endif @@ -2684,6 +2690,7 @@ void erts_init_io(int port_tab_size, NULL, (ErtsPTabElementCommon *) &erts_invalid_port.common, port_tab_size, + common_element_size, /* Doesn't need to be excact */ "port_table"); erts_smp_atomic_init_nob(&erts_bytes_out, 0); |