diff options
| author | Rickard Green <[email protected]> | 2016-03-11 11:33:42 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-03-11 11:33:42 +0100 |
| commit | e6ca9a6b1352420d3cdc08970b049b02d4303a16 (patch) | |
| tree | 0c45d43cef9236045e507e9b2f911ce4eed075c2 /erts/preloaded/src/erlang.erl | |
| parent | d369571f10ccc5ebf4548f4dbc74efe649c5e669 (diff) | |
| parent | 207a569d4caf80b10a54eec2220ac672a3377f00 (diff) | |
| download | otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.tar.gz otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.tar.bz2 otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.zip | |
Merge branch 'rickard/ds-sched-suspend'
* rickard/ds-sched-suspend:
Improved scheduler suspend functionality
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 9bf8d13fde..dfbd116d6e 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2300,8 +2300,8 @@ subtract(_,_) -> MinBinVHeapSize :: non_neg_integer(), OldMinBinVHeapSize :: non_neg_integer(); (multi_scheduling, BlockState) -> OldBlockState when - BlockState :: block | unblock, - OldBlockState :: block | unblock | enabled; + BlockState :: block | unblock | block_normal | unblock_normal, + OldBlockState :: blocked | disabled | enabled; (scheduler_bind_type, How) -> OldBindType when How :: scheduler_bind_type() | default_bind, OldBindType :: scheduler_bind_type(); @@ -2446,14 +2446,15 @@ tuple_to_list(_Tuple) -> logical_processors_available | logical_processors_online) -> unknown | pos_integer(); (machine) -> string(); + (message_queue_data) -> message_queue_data(); (min_heap_size) -> {min_heap_size, MinHeapSize :: pos_integer()}; (min_bin_vheap_size) -> {min_bin_vheap_size, MinBinVHeapSize :: pos_integer()}; (modified_timing_level) -> integer() | undefined; - (multi_scheduling) -> disabled | blocked | enabled; + (multi_scheduling) -> disabled | blocked | blocked_normal | enabled; (multi_scheduling_blockers) -> [Pid :: pid()]; (nif_version) -> string(); - (message_queue_data) -> message_queue_data(); + (normal_multi_scheduling_blockers) -> [Pid :: pid()]; (otp_release) -> string(); (os_monotonic_time_source) -> [{atom(),term()}]; (os_system_time_source) -> [{atom(),term()}]; |