mirror of
https://github.com/SerenityOS/serenity.git
synced 2025-01-23 18:02:05 -05:00
MenuApplets: Add CPUGraph, our first menu applet :^)
This implements the WSCPUMonitor functionality in a separate process.
This commit is contained in:
parent
44d5388e78
commit
c3029a6a1f
6 changed files with 112 additions and 0 deletions
|
@ -108,6 +108,7 @@ cp ../Servers/TTYServer/TTYServer mnt/bin/TTYServer
|
|||
cp ../Servers/TelnetServer/TelnetServer mnt/bin/TelnetServer
|
||||
cp ../Servers/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer
|
||||
cp ../Shell/Shell mnt/bin/Shell
|
||||
cp ../MenuApplets/CPUGraph/CPUGraph.MenuApplet mnt/bin/
|
||||
echo "done"
|
||||
|
||||
printf "installing shortcuts... "
|
||||
|
|
|
@ -92,6 +92,8 @@ build_targets="$build_targets ../Shell"
|
|||
|
||||
build_targets="$build_targets ../Userland"
|
||||
|
||||
build_targets="$build_targets ../MenuApplets/CPUGraph"
|
||||
|
||||
build_targets="$build_targets ." # the kernel
|
||||
|
||||
(cd ../AK/Tests && $make_cmd clean)
|
||||
|
|
1
MenuApplets/CPUGraph/.gitignore
vendored
Normal file
1
MenuApplets/CPUGraph/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
CPUGraph.MenuApplet
|
7
MenuApplets/CPUGraph/Makefile
Executable file
7
MenuApplets/CPUGraph/Makefile
Executable file
|
@ -0,0 +1,7 @@
|
|||
include ../../Makefile.common
|
||||
|
||||
OBJS = main.o
|
||||
|
||||
APP = CPUGraph.MenuApplet
|
||||
|
||||
include ../Makefile.common
|
87
MenuApplets/CPUGraph/main.cpp
Normal file
87
MenuApplets/CPUGraph/main.cpp
Normal file
|
@ -0,0 +1,87 @@
|
|||
#include <AK/CircularQueue.h>
|
||||
#include <LibCore/CProcessStatisticsReader.h>
|
||||
#include <LibCore/CTimer.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
#include <LibGUI/GApplication.h>
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <LibGUI/GWindowServerConnection.h>
|
||||
|
||||
NonnullRefPtr<GraphicsBitmap> create_shared_bitmap(const Size& size)
|
||||
{
|
||||
ASSERT(GWindowServerConnection::the().server_pid());
|
||||
ASSERT(!size.is_empty());
|
||||
size_t pitch = round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16);
|
||||
size_t size_in_bytes = size.height() * pitch;
|
||||
auto shared_buffer = SharedBuffer::create_with_size(size_in_bytes);
|
||||
ASSERT(shared_buffer);
|
||||
shared_buffer->share_with(GWindowServerConnection::the().server_pid());
|
||||
return GraphicsBitmap::create_with_shared_buffer(GraphicsBitmap::Format::RGBA32, *shared_buffer, size);
|
||||
}
|
||||
|
||||
static void get_cpu_usage(unsigned& busy, unsigned& idle)
|
||||
{
|
||||
busy = 0;
|
||||
idle = 0;
|
||||
|
||||
auto all_processes = CProcessStatisticsReader::get_all();
|
||||
|
||||
for (auto& it : all_processes) {
|
||||
for (auto& jt : it.value.threads) {
|
||||
if (it.value.pid == 0)
|
||||
idle += jt.times_scheduled;
|
||||
else
|
||||
busy += jt.times_scheduled;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
GApplication app(argc, argv);
|
||||
|
||||
Size applet_size(30, 16);
|
||||
Rect applet_rect({}, applet_size);
|
||||
|
||||
CircularQueue<float, 30> cpu_history;
|
||||
|
||||
i32 applet_id = GWindowServerConnection::the().send_sync<WindowServer::CreateMenuApplet>(applet_size)->applet_id();
|
||||
auto bitmap = create_shared_bitmap(applet_size);
|
||||
|
||||
GWindowServerConnection::the().send_sync<WindowServer::SetMenuAppletBackingStore>(applet_id, bitmap->shared_buffer_id());
|
||||
|
||||
unsigned last_busy = 0;
|
||||
unsigned last_idle = 0;
|
||||
|
||||
auto repaint = [&] {
|
||||
unsigned busy;
|
||||
unsigned idle;
|
||||
get_cpu_usage(busy, idle);
|
||||
unsigned busy_diff = busy - last_busy;
|
||||
unsigned idle_diff = idle - last_idle;
|
||||
last_busy = busy;
|
||||
last_idle = idle;
|
||||
float cpu = (float)busy_diff / (float)(busy_diff + idle_diff);
|
||||
cpu_history.enqueue(cpu);
|
||||
|
||||
GPainter painter(*bitmap);
|
||||
painter.fill_rect(applet_rect, Color::Black);
|
||||
int i = cpu_history.capacity() - cpu_history.size();
|
||||
for (auto cpu_usage : cpu_history) {
|
||||
painter.draw_line(
|
||||
{ applet_rect.x() + i, applet_rect.bottom() },
|
||||
{ applet_rect.x() + i, (int)(applet_rect.y() + (applet_rect.height() - (cpu_usage * (float)applet_rect.height()))) },
|
||||
Color::from_rgb(0xaa6d4b));
|
||||
++i;
|
||||
}
|
||||
|
||||
GWindowServerConnection::the().send_sync<WindowServer::InvalidateMenuAppletRect>(applet_id, applet_rect);
|
||||
};
|
||||
|
||||
repaint();
|
||||
|
||||
auto timer = CTimer::construct(1000, [&] {
|
||||
repaint();
|
||||
});
|
||||
|
||||
return app.exec();
|
||||
}
|
14
MenuApplets/Makefile.common
Executable file
14
MenuApplets/Makefile.common
Executable file
|
@ -0,0 +1,14 @@
|
|||
DEFINES += -DUSERLAND
|
||||
|
||||
all: $(APP)
|
||||
|
||||
$(APP): $(OBJS)
|
||||
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -laudio -lgui -lipc -ldraw -lthread -lpthread -lcore -lc
|
||||
|
||||
.cpp.o:
|
||||
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
|
||||
|
||||
-include $(OBJS:%.o=%.d)
|
||||
|
||||
clean:
|
||||
@echo "CLEAN"; rm -f $(APP) $(OBJS) *.d
|
Loading…
Add table
Reference in a new issue