diff options
| author | Siri Hansen <[email protected]> | 2014-05-28 11:59:02 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-05-28 11:59:02 +0200 |
| commit | 235d02334181df0bed92b8c6af07d092627691fe (patch) | |
| tree | af1167c109cf58a081a46736fe9f2c9c4c4bce07 /lib/observer/test | |
| parent | 54ba6869f4807a5b70868eb0204900d9de0d9f43 (diff) | |
| parent | dbd2604939e92c110277d941589b8965fdda4270 (diff) | |
| download | otp-235d02334181df0bed92b8c6af07d092627691fe.tar.gz otp-235d02334181df0bed92b8c6af07d092627691fe.tar.bz2 otp-235d02334181df0bed92b8c6af07d092627691fe.zip | |
Merge branch 'siri/cdv-timer-reg-proc/OTP-11919' into maint
* siri/cdv-timer-reg-proc/OTP-11919:
[cdv] Allow registered name as owner of timer in crashdump
Diffstat (limited to 'lib/observer/test')
| -rw-r--r-- | lib/observer/test/crashdump_helper.erl | 4 | ||||
| -rw-r--r-- | lib/observer/test/crashdump_viewer_SUITE.erl | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl index 40dbe28d46..0eb4a92c53 100644 --- a/lib/observer/test/crashdump_helper.erl +++ b/lib/observer/test/crashdump_helper.erl @@ -35,7 +35,9 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) -> register(aaaaaaaa,self()), process_flag(save_calls,3), ets:new(cdv_test_ordset_table,[ordered_set]), - erlang:send_after(1000000,self(),cdv_test_timer_message), + erlang:send_after(1000000,self(),cdv_test_timer_message1), + erlang:send_after(1000000,aaaaaaaa,cdv_test_timer_message2), + erlang:send_after(1000000,noexistproc,cdv_test_timer_message3), Port = hd(erlang:ports()), Fun = fun() -> ok end, Ref = make_ref(), diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl index e9567c82cb..03ab0c20e1 100644 --- a/lib/observer/test/crashdump_viewer_SUITE.erl +++ b/lib/observer/test/crashdump_viewer_SUITE.erl @@ -385,8 +385,14 @@ special(File,Procs) -> {ok,[_Ets=#ets_table{}],[]} = crashdump_viewer:ets_tables(Pid), io:format(" ets tables ok",[]), - {ok,[_Timer=#timer{}],[]} = crashdump_viewer:timers(Pid), - io:format(" timers ok",[]), + + {ok,[#timer{pid=Pid0,name=undefined}, + #timer{pid=Pid0,name="aaaaaaaa"}],[]} = + crashdump_viewer:timers(Pid), + {ok,AllTimers,_TimersTW} = crashdump_viewer:timers(all), + #timer{name="noexistproc"} = + lists:keyfind(undefined,#timer.pid,AllTimers), + io:format(" timers ok:",[]), {ok,Mod1=#loaded_mod{},[]} = crashdump_viewer:loaded_mod_details(atom_to_list(?helper_mod)), |