diff options
| author | Siri Hansen <[email protected]> | 2014-01-28 15:48:11 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-01-28 15:48:11 +0100 |
| commit | f65764907faba7ea6ca1a6bb266b6c6612e06b7b (patch) | |
| tree | f228f7ae616ee86fb4f0ff5a7d6643f608fde471 /lib/observer/src/observer_sys_wx.erl | |
| parent | 10dcd146040728fab222fe325dde9328ab506d15 (diff) | |
| parent | a0d7557b1f84e71f79af5f2d32caf2ce994adb4e (diff) | |
| download | otp-f65764907faba7ea6ca1a6bb266b6c6612e06b7b.tar.gz otp-f65764907faba7ea6ca1a6bb266b6c6612e06b7b.tar.bz2 otp-f65764907faba7ea6ca1a6bb266b6c6612e06b7b.zip | |
Merge branch 'siri/wx-cdv/OTP-11179'
* siri/wx-cdv/OTP-11179:
observer: cosmetic gui tweaks
observer: Fix progress dialog creation
observer: renamed crashdump_viewer files and fixed makefiles
observer: improve wx version of crashdump_viewer
observer: Use crashdump_viewer's term viewer to display large terms and binaries
observer: Fix memory and scheduler info and handle missing fields
observer: Optimize row lookups
observer: improve wx version of crashdump_viewer
observer: Consolidate the view of process information
observer: add wx version of crashdump_viewer
Diffstat (limited to 'lib/observer/src/observer_sys_wx.erl')
| -rw-r--r-- | lib/observer/src/observer_sys_wx.erl | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl index 31800cf12a..f989f9cf97 100644 --- a/lib/observer/src/observer_sys_wx.erl +++ b/lib/observer/src/observer_sys_wx.erl @@ -60,10 +60,10 @@ init([Notebook, Parent]) -> wxSizer:add(TopSizer, FPanel0, [{flag, ?wxEXPAND}, {proportion, 1}]), wxSizer:add(TopSizer, FPanel1, [{flag, ?wxEXPAND}, {proportion, 1}]), BorderFlags = ?wxLEFT bor ?wxRIGHT, - MemoryInfo = create_mem_info(Panel, AllocInfo), + {MemPanel, MemoryInfo} = create_mem_info(Panel, AllocInfo), wxSizer:add(Sizer, TopSizer, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP}, {proportion, 0}, {border, 5}]), - wxSizer:add(Sizer, MemoryInfo, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM}, + wxSizer:add(Sizer, MemPanel, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM}, {proportion, 1}, {border, 5}]), wxPanel:setSizer(Panel, Sizer), Timer = observer_lib:start_timer(10), @@ -86,7 +86,9 @@ update_syspage(#sys_wx_state{node = Node, fields=Fields, sizer=Sizer, alloc=Allo update_alloc(AllocCtrl, AllocInfo), wxSizer:layout(Sizer). -create_mem_info(Panel, Fields) -> +create_mem_info(Parent, Fields) -> + Panel = wxPanel:new(Parent), + wxWindow:setBackgroundColour(Panel, {255,255,255}), Style = ?wxLC_REPORT bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES bor ?wxLC_VRULES, Grid = wxListCtrl:new(Panel, [{style, Style}]), Li = wxListItem:new(), @@ -103,7 +105,12 @@ create_mem_info(Panel, Fields) -> lists:foldl(AddListEntry, 0, ListItems), wxListItem:destroy(Li), update_alloc(Grid, Fields), - Grid. + + Sizer = wxBoxSizer:new(?wxVERTICAL), + wxSizer:add(Sizer, Grid, [{flag, ?wxEXPAND bor ?wxLEFT bor ?wxRIGHT}, + {border, 5}, {proportion, 1}]), + wxWindow:setSizerAndFit(Panel, Sizer), + {Panel, Grid}. update_alloc(Grid, AllocInfo) -> Fields = alloc_info(AllocInfo, [], 0, 0, true), @@ -167,9 +174,12 @@ info_fields() -> {"Async thread pool size", thread_pool_size} ]}, {"CPU's and Threads", - [{"System Logical CPU's", logical_processors}, - {"Erlang Logical CPU's", logical_processors_online}, - {"Used Logical CPU's", logical_processors_available} + [{"Logical CPU's", logical_processors}, + {"Online Logical CPU's", logical_processors_online}, + {"Available Logical CPU's", logical_processors_available}, + {"Schedulers", schedulers}, + {"Online schedulers", schedulers_online}, + {"Available schedulers", schedulers_available} ]} ], Stat = [{"Memory Usage", right, |