RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:17:35 +00:00
Code Issues Activity Actions

SystemMonitor: Display the stack of only the selected thread

Browse source 
This uses the new ProcFS interface at /proc/<pid>/stacks/<tid>
This commit is contained in:
Ben Wiederhake 2020-08-09 20:19:28 +02:00 • committed by Andreas Kling
parent c3df2fe83f
commit dbbdb39c1f
4 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/SystemMonitor/CMakeLists.txt
View file

@ -7,7 +7,7 @@ set(SOURCES
ProcessFileDescriptorMapWidget.cpp ProcessFileDescriptorMapWidget.cpp
ProcessMemoryMapWidget.cpp ProcessMemoryMapWidget.cpp
ProcessModel.cpp ProcessModel.cpp
ProcessStacksWidget.cpp ProcessStackWidget.cpp
ProcessUnveiledPathsWidget.cpp ProcessUnveiledPathsWidget.cpp
) )

25
Applications/SystemMonitor/ProcessStacksWidget.cpp → Applications/SystemMonitor/ProcessStackWidget.cpp
View file

@ -24,44 +24,45 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "ProcessStacksWidget.h" #include "ProcessStackWidget.h"
#include <AK/ByteBuffer.h> #include <AK/ByteBuffer.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
ProcessStacksWidget::ProcessStacksWidget() ProcessStackWidget::ProcessStackWidget()
{ {
set_layout<GUI::VerticalBoxLayout>(); set_layout<GUI::VerticalBoxLayout>();
layout()->set_margins({ 4, 4, 4, 4 }); layout()->set_margins({ 4, 4, 4, 4 });
m_stacks_editor = add<GUI::TextEditor>(); m_stack_editor = add<GUI::TextEditor>();
m_stacks_editor->set_mode(GUI::TextEditor::ReadOnly); m_stack_editor->set_mode(GUI::TextEditor::ReadOnly);
m_timer = add<Core::Timer>(1000, [this] { refresh(); }); m_timer = add<Core::Timer>(1000, [this] { refresh(); });
} }
ProcessStacksWidget::~ProcessStacksWidget() ProcessStackWidget::~ProcessStackWidget()
{ {
} }
void ProcessStacksWidget::set_pid(pid_t pid) void ProcessStackWidget::set_ids(pid_t pid, pid_t tid)
{ {
if (m_pid == pid) if (m_pid == pid && m_tid == tid)
return; return;
m_pid = pid; m_pid = pid;
m_tid = tid;
refresh(); refresh();
} }
void ProcessStacksWidget::refresh() void ProcessStackWidget::refresh()
{ {
auto file = Core::File::construct(String::format("/proc/%d/stack", m_pid)); auto file = Core::File::construct(String::format("/proc/%d/stacks/%d", m_pid, m_tid));
if (!file->open(Core::IODevice::ReadOnly)) { if (!file->open(Core::IODevice::ReadOnly)) {
m_stacks_editor->set_text(String::format("Unable to open %s", file->filename().characters())); m_stack_editor->set_text(String::format("Unable to open %s", file->filename().characters()));
return; return;
} }
auto new_text = file->read_all(); auto new_text = file->read_all();
if (m_stacks_editor->text() != new_text) { if (m_stack_editor->text() != new_text) {
m_stacks_editor->set_text(new_text); m_stack_editor->set_text(new_text);
} }
} }

13
Applications/SystemMonitor/ProcessStacksWidget.h → Applications/SystemMonitor/ProcessStackWidget.h
View file

@ -29,18 +29,19 @@
#include <LibGUI/TextEditor.h> #include <LibGUI/TextEditor.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
class ProcessStacksWidget final : public GUI::Widget { class ProcessStackWidget final : public GUI::Widget {
C_OBJECT(ProcessStacksWidget) C_OBJECT(ProcessStackWidget)
public: public:
virtual ~ProcessStacksWidget() override; virtual ~ProcessStackWidget() override;
void set_pid(pid_t); void set_ids(pid_t pid, pid_t tid);
void refresh(); void refresh();
private: private:
ProcessStacksWidget(); ProcessStackWidget();
pid_t m_pid { -1 }; pid_t m_pid { -1 };
RefPtr<GUI::TextEditor> m_stacks_editor; pid_t m_tid { -1 };
RefPtr<GUI::TextEditor> m_stack_editor;
RefPtr<Core::Timer> m_timer; RefPtr<Core::Timer> m_timer;
}; };

23
Applications/SystemMonitor/main.cpp
View file

@ -31,7 +31,7 @@
#include "ProcessFileDescriptorMapWidget.h" #include "ProcessFileDescriptorMapWidget.h"
#include "ProcessMemoryMapWidget.h" #include "ProcessMemoryMapWidget.h"
#include "ProcessModel.h" #include "ProcessModel.h"
#include "ProcessStacksWidget.h" #include "ProcessStackWidget.h"
#include "ProcessUnveiledPathsWidget.h" #include "ProcessUnveiledPathsWidget.h"
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <LibGUI/AboutDialog.h> #include <LibGUI/AboutDialog.h>
@ -199,34 +199,34 @@ int main(int argc, char** argv)
memory_stats_widget->refresh(); memory_stats_widget->refresh();
}); });
auto selected_pid = [&]() -> pid_t { auto selected_id = [&](ProcessModel::Column column) -> pid_t {
if (process_table_view.selection().is_empty()) if (process_table_view.selection().is_empty())
return -1; return -1;
auto pid_index = process_table_view.model()->index(process_table_view.selection().first().row(), ProcessModel::Column::PID); auto pid_index = process_table_view.model()->index(process_table_view.selection().first().row(), column);
return process_table_view.model()->data(pid_index, GUI::Model::Role::Display).to_i32(); return process_table_view.model()->data(pid_index, GUI::Model::Role::Display).to_i32();
}; };
auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/kill16.png"), [&](const GUI::Action&) { auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/kill16.png"), [&](const GUI::Action&) {
pid_t pid = selected_pid(); pid_t pid = selected_id(ProcessModel::Column::PID);
if (pid != -1) if (pid != -1)
kill(pid, SIGKILL); kill(pid, SIGKILL);
}); });
auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/stop16.png"), [&](const GUI::Action&) { auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/stop16.png"), [&](const GUI::Action&) {
pid_t pid = selected_pid(); pid_t pid = selected_id(ProcessModel::Column::PID);
if (pid != -1) if (pid != -1)
kill(pid, SIGSTOP); kill(pid, SIGSTOP);
}); });
auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/continue16.png"), [&](const GUI::Action&) { auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/continue16.png"), [&](const GUI::Action&) {
pid_t pid = selected_pid(); pid_t pid = selected_id(ProcessModel::Column::PID);
if (pid != -1) if (pid != -1)
kill(pid, SIGCONT); kill(pid, SIGCONT);
}); });
auto profile_action = GUI::Action::create("Profile process", { Mod_Ctrl, Key_P }, auto profile_action = GUI::Action::create("Profile process", { Mod_Ctrl, Key_P },
Gfx::Bitmap::load_from_file("/res/icons/16x16/app-profiler.png"), [&](auto&) { Gfx::Bitmap::load_from_file("/res/icons/16x16/app-profiler.png"), [&](auto&) {
pid_t pid = selected_pid(); pid_t pid = selected_id(ProcessModel::Column::PID);
if (pid != -1) { if (pid != -1) {
auto pid_string = String::format("%d", pid); auto pid_string = String::format("%d", pid);
pid_t child; pid_t child;
@ -242,7 +242,7 @@ int main(int argc, char** argv)
auto inspect_action = GUI::Action::create("Inspect process", { Mod_Ctrl, Key_I }, auto inspect_action = GUI::Action::create("Inspect process", { Mod_Ctrl, Key_I },
Gfx::Bitmap::load_from_file("/res/icons/16x16/app-inspector.png"), [&](auto&) { Gfx::Bitmap::load_from_file("/res/icons/16x16/app-inspector.png"), [&](auto&) {
pid_t pid = selected_pid(); pid_t pid = selected_id(ProcessModel::Column::PID);
if (pid != -1) { if (pid != -1) {
auto pid_string = String::format("%d", pid); auto pid_string = String::format("%d", pid);
pid_t child; pid_t child;
@ -316,10 +316,11 @@ int main(int argc, char** argv)
auto& memory_map_widget = process_tab_widget.add_tab<ProcessMemoryMapWidget>("Memory map"); auto& memory_map_widget = process_tab_widget.add_tab<ProcessMemoryMapWidget>("Memory map");
auto& open_files_widget = process_tab_widget.add_tab<ProcessFileDescriptorMapWidget>("Open files"); auto& open_files_widget = process_tab_widget.add_tab<ProcessFileDescriptorMapWidget>("Open files");
auto& unveiled_paths_widget = process_tab_widget.add_tab<ProcessUnveiledPathsWidget>("Unveiled paths"); auto& unveiled_paths_widget = process_tab_widget.add_tab<ProcessUnveiledPathsWidget>("Unveiled paths");
auto& stacks_widget = process_tab_widget.add_tab<ProcessStacksWidget>("Stacks"); auto& stack_widget = process_tab_widget.add_tab<ProcessStackWidget>("Stack");
process_table_view.on_selection = [&](auto&) { process_table_view.on_selection = [&](auto&) {
auto pid = selected_pid(); auto pid = selected_id(ProcessModel::Column::PID);
auto tid = selected_id(ProcessModel::Column::TID);
if (!can_access_pid(pid)) { if (!can_access_pid(pid)) {
process_tab_widget.set_visible(false); process_tab_widget.set_visible(false);
process_tab_unused_widget.set_text("Process cannot be accessed"); process_tab_unused_widget.set_text("Process cannot be accessed");
@ -330,7 +331,7 @@ int main(int argc, char** argv)
process_tab_widget.set_visible(true); process_tab_widget.set_visible(true);
process_tab_unused_widget.set_visible(false); process_tab_unused_widget.set_visible(false);
open_files_widget.set_pid(pid); open_files_widget.set_pid(pid);
stacks_widget.set_pid(pid); stack_widget.set_ids(pid, tid);
memory_map_widget.set_pid(pid); memory_map_widget.set_pid(pid);
unveiled_paths_widget.set_pid(pid); unveiled_paths_widget.set_pid(pid);
}; };