diff options
| author | Sverker Eriksson <[email protected]> | 2014-11-25 14:33:04 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-11-25 16:11:17 +0100 |
| commit | 6b435239e4eeb2bc57ef3e8ca8a2de48817b5571 (patch) | |
| tree | 68775d99d1ea595822a5f34e9993b331361a762e /erts/emulator/test/port_SUITE.erl | |
| parent | 21a16f6c19cd8aba39481c89bf2b32c7910f3d32 (diff) | |
| download | otp-6b435239e4eeb2bc57ef3e8ca8a2de48817b5571.tar.gz otp-6b435239e4eeb2bc57ef3e8ca8a2de48817b5571.tar.bz2 otp-6b435239e4eeb2bc57ef3e8ca8a2de48817b5571.zip | |
erts: Fix port data memory allocation bug
for non-immediate port data >= sizeof(Eterm)*2 words.
Diffstat (limited to 'erts/emulator/test/port_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/port_SUITE.erl | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl index 8792f25d76..9083545060 100644 --- a/erts/emulator/test/port_SUITE.erl +++ b/erts/emulator/test/port_SUITE.erl @@ -2343,8 +2343,10 @@ port_setget_data(Config) when is_list(Config) -> Port = erlang:open_port({spawn_driver, "echo_drv"}, []), NSched = erlang:system_info(schedulers_online), + HeapData = {1,2,3,<<"A heap binary">>,fun()->"This is fun"end, + list_to_binary(lists:seq(1,100))}, PRs = lists:map(fun(I) -> - spawn_opt(fun() -> port_setget_data_hammer(Port,1) end, + spawn_opt(fun() -> port_setget_data_hammer(Port,HeapData,false,1) end, [monitor, {scheduler, I rem NSched}]) end, lists:seq(1,10)), @@ -2362,13 +2364,17 @@ port_setget_data(Config) when is_list(Config) -> PRs), ok. -port_setget_data_hammer(Port, N) -> +port_setget_data_hammer(Port, HeapData, IsSet0, N) -> Rand = random:uniform(3), - try case Rand of - 1 -> true = erlang:port_set_data(Port, atom); - 2 -> true = erlang:port_set_data(Port, {1,2,3}); - 3 -> erlang:port_get_data(Port) - end + IsSet1 = try case Rand of + 1 -> true = erlang:port_set_data(Port, atom), true; + 2 -> true = erlang:port_set_data(Port, HeapData), true; + 3 -> case erlang:port_get_data(Port) of + atom -> true; + HeapData -> true; + undefined -> false=IsSet0 + end + end catch error:badarg -> true = get(prepare_for_close), @@ -2381,7 +2387,7 @@ port_setget_data_hammer(Port, N) -> after 0 -> ok end, - port_setget_data_hammer(Port, N+1). + port_setget_data_hammer(Port, HeapData, IsSet1, N+1). wait_until(Fun) -> |