diff options
| author | Dan Gudmundsson <[email protected]> | 2015-10-27 09:58:14 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-10-27 09:58:14 +0100 |
| commit | 36707f0eac0fdb61331a8cee4917a00a301528a3 (patch) | |
| tree | 568004e8297b5091f66c2eca5c949155c7b1242a | |
| parent | 47996010a0413f984c8312bb525d96ada3c91cf7 (diff) | |
| parent | 75b95b2e899baba8e254ec4742e0442ed4419efc (diff) | |
| download | otp-36707f0eac0fdb61331a8cee4917a00a301528a3.tar.gz otp-36707f0eac0fdb61331a8cee4917a00a301528a3.tar.bz2 otp-36707f0eac0fdb61331a8cee4917a00a301528a3.zip | |
Merge branch 'dgud/observer/cdv-ets-owner/OTP-13030' into maint
* dgud/observer/cdv-ets-owner/OTP-13030:
cdv: Fix crashdump ets table type
observer: Show ets owner pid in crashdump viewers ets popup window
| -rw-r--r-- | lib/observer/src/cdv_ets_cb.erl | 2 | ||||
| -rw-r--r-- | lib/observer/src/crashdump_viewer.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/observer/src/cdv_ets_cb.erl b/lib/observer/src/cdv_ets_cb.erl index 9e6e72e08d..bac8b56fc3 100644 --- a/lib/observer/src/cdv_ets_cb.erl +++ b/lib/observer/src/cdv_ets_cb.erl @@ -97,7 +97,7 @@ info_fields() -> [{"Id", id}, {"Name", name}, {"Slot", slot}, - {"Owner", owner}, + {"Owner", pid}, {"Data Structure", data_type} ]}, {"Settings", diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl index f2ce51b2af..b66b4d59c9 100644 --- a/lib/observer/src/crashdump_viewer.erl +++ b/lib/observer/src/crashdump_viewer.erl @@ -1572,7 +1572,7 @@ get_etsinfo(Fd,EtsTable = #ets_table{details=Ds},WS) -> get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{fixed=>Val}},WS); "Type" -> Val = val(Fd), - get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{data_type=>Val}},WS); + get_etsinfo(Fd,EtsTable#ets_table{data_type=Val},WS); "Protection" -> Val = val(Fd), get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{protection=>Val}},WS); |