diff options
| author | Rickard Green <[email protected]> | 2013-05-16 17:55:39 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-16 17:55:39 +0200 |
| commit | 92092987b6470969f9ddc1dba8fdf49e7f8724fc (patch) | |
| tree | eb0befb3545266d1c2434b89ef6e40295476da2a /erts/emulator/beam/erl_process.c | |
| parent | bbb2760fa436ae7e7b7d003252e83a24e4f6cb8a (diff) | |
| parent | 1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (diff) | |
| download | otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.tar.gz otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.tar.bz2 otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.zip | |
Merge branch 'maint'
* maint:
Only verify not busy for erlang:send(Port, Msg, [nosuspend]) until scheduled
Make high_msgq_watermark and low_msgq_watermark generic inet options
Do not treat port_set_data/port_get_data as signals
Add 'frmptr' emulator type
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 5d9c5af55f..7415a5721f 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -4670,6 +4670,8 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online) esdp->reductions = 0; init_sched_wall_time(&esdp->sched_wall_time); + + erts_port_task_handle_init(&esdp->nosuspend_port_task_handle); } init_misc_aux_work(); |