From 4e0ab1dd225e0c2886b0251a68da4ee450d45993 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 29 Oct 2020 23:40:20 +0100 Subject: [PATCH] HackStudio: Remove ProcessStateWidget This was a little banner that would pop up when running something in the "Build" tab. It didn't look very good and it was mostly distracting how it would pop in and out of the window. --- DevTools/HackStudio/CMakeLists.txt | 1 - DevTools/HackStudio/ProcessStateWidget.cpp | 102 --------------------- DevTools/HackStudio/ProcessStateWidget.h | 55 ----------- DevTools/HackStudio/TerminalWrapper.cpp | 6 -- DevTools/HackStudio/TerminalWrapper.h | 3 - 5 files changed, 167 deletions(-) delete mode 100644 DevTools/HackStudio/ProcessStateWidget.cpp delete mode 100644 DevTools/HackStudio/ProcessStateWidget.h diff --git a/DevTools/HackStudio/CMakeLists.txt b/DevTools/HackStudio/CMakeLists.txt index 12095a938e..27d473c687 100644 --- a/DevTools/HackStudio/CMakeLists.txt +++ b/DevTools/HackStudio/CMakeLists.txt @@ -25,7 +25,6 @@ set(SOURCES HackStudioWidget.cpp LanguageClient.cpp Locator.cpp - ProcessStateWidget.cpp Project.cpp ProjectFile.cpp TerminalWrapper.cpp diff --git a/DevTools/HackStudio/ProcessStateWidget.cpp b/DevTools/HackStudio/ProcessStateWidget.cpp deleted file mode 100644 index b098383a0d..0000000000 --- a/DevTools/HackStudio/ProcessStateWidget.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "ProcessStateWidget.h" -#include -#include -#include -#include -#include -#include - -namespace HackStudio { - -ProcessStateWidget::ProcessStateWidget() -{ - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - set_preferred_size(0, 20); - set_visible(false); - - set_layout(); - - auto& pid_label_label = add("Process:"); - pid_label_label.set_font(Gfx::Font::default_bold_font()); - m_pid_label = add(""); - - auto& state_label_label = add("State:"); - state_label_label.set_font(Gfx::Font::default_bold_font()); - m_state_label = add(""); - - // FIXME: This should show CPU% instead. - auto& cpu_label_label = add("Times scheduled:"); - cpu_label_label.set_font(Gfx::Font::default_bold_font()); - m_cpu_label = add(""); - - auto& memory_label_label = add("Memory (resident):"); - memory_label_label.set_font(Gfx::Font::default_bold_font()); - m_memory_label = add(""); - - m_timer = add(500, [this] { - refresh(); - }); -} - -ProcessStateWidget::~ProcessStateWidget() -{ -} - -void ProcessStateWidget::refresh() -{ - pid_t pid = tcgetpgrp(m_tty_fd); - - auto processes = Core::ProcessStatisticsReader::get_all(); - auto child_process_data = processes.get(pid); - - if (!child_process_data.has_value()) - return; - - auto active_process_data = processes.get(child_process_data.value().pgid); - - auto& data = active_process_data.value(); - - m_pid_label->set_text(String::formatted("{}({})", data.name, pid)); - m_state_label->set_text(data.threads.first().state); - m_cpu_label->set_text(String::formatted("{}", data.threads.first().times_scheduled)); - m_memory_label->set_text(String::formatted("{}", data.amount_resident)); -} - -void ProcessStateWidget::set_tty_fd(int tty_fd) -{ - m_tty_fd = tty_fd; - if (m_tty_fd == -1) { - set_visible(false); - return; - } - set_visible(true); - refresh(); -} - -} diff --git a/DevTools/HackStudio/ProcessStateWidget.h b/DevTools/HackStudio/ProcessStateWidget.h deleted file mode 100644 index 7769473bc1..0000000000 --- a/DevTools/HackStudio/ProcessStateWidget.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include - -namespace HackStudio { - -class ProcessStateWidget final : public GUI::Widget { - C_OBJECT(ProcessStateWidget) -public: - virtual ~ProcessStateWidget() override; - - void set_tty_fd(int); - -private: - explicit ProcessStateWidget(); - - void refresh(); - - RefPtr m_pid_label; - RefPtr m_state_label; - RefPtr m_cpu_label; - RefPtr m_memory_label; - - RefPtr m_timer; - - int m_tty_fd { -1 }; -}; - -} diff --git a/DevTools/HackStudio/TerminalWrapper.cpp b/DevTools/HackStudio/TerminalWrapper.cpp index d1dc9a3752..9b485b6906 100644 --- a/DevTools/HackStudio/TerminalWrapper.cpp +++ b/DevTools/HackStudio/TerminalWrapper.cpp @@ -25,7 +25,6 @@ */ #include "TerminalWrapper.h" -#include "ProcessStateWidget.h" #include #include #include @@ -82,7 +81,6 @@ void TerminalWrapper::run_command(const String& command) } else if (WIFSIGNALED(wstatus)) { m_terminal_widget->inject_string(String::formatted("\033[34;1m(Command signaled with {}!)\033[0m\n", strsignal(WTERMSIG(wstatus)))); } - m_process_state_widget->set_tty_fd(-1); m_pid = -1; if (on_command_exit) @@ -156,9 +154,6 @@ void TerminalWrapper::run_command(const String& command) } ASSERT_NOT_REACHED(); } - - // Parent process, cont'd. - m_process_state_widget->set_tty_fd(ptm_fd); } void TerminalWrapper::kill_running_command() @@ -176,7 +171,6 @@ TerminalWrapper::TerminalWrapper(bool user_spawned) RefPtr config = Core::ConfigFile::get_for_app("Terminal"); m_terminal_widget = add(-1, false, config); - m_process_state_widget = add(); if (user_spawned) run_command("Shell"); diff --git a/DevTools/HackStudio/TerminalWrapper.h b/DevTools/HackStudio/TerminalWrapper.h index 30608c0597..f7841f4bc5 100644 --- a/DevTools/HackStudio/TerminalWrapper.h +++ b/DevTools/HackStudio/TerminalWrapper.h @@ -32,8 +32,6 @@ class TerminalWidget; namespace HackStudio { -class ProcessStateWidget; - class TerminalWrapper final : public GUI::Widget { C_OBJECT(TerminalWrapper) public: @@ -50,7 +48,6 @@ public: private: explicit TerminalWrapper(bool user_spawned = true); - RefPtr m_process_state_widget; RefPtr m_terminal_widget; pid_t m_pid { -1 }; bool m_user_spawned { true };