RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 12:15:07 +00:00
Code Issues Activity Actions

Inspector: Show remote object properties in a table view

Browse source 
This patch expands the object model of this program quite a bit.
We now have a RemoteProcess object that contains a list of remote root
RemoteObject objects.

The RemoteProcess vends a RemoteObjectGraphModel&, and indices in that
model have internal_data() pointing to a corresponding RemoteObject.
RemoteObjects in turn vend a RemoteObjectPropertyModel&, which is what
we use to show the object properties.

This is pretty cool :^)
This commit is contained in:
Andreas Kling 2019-08-19 20:29:52 +02:00
parent 736dc5f6c0
commit 4f3234148a
10 changed files with 252 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

67
DevTools/Inspector/RemoteObjectGraphModel.cpp
View file

@ -1,12 +1,14 @@
#include "RemoteObjectGraphModel.h"
#include "RemoteObject.h"
#include "RemoteProcess.h"
#include <AK/JsonObject.h>
#include <AK/JsonValue.h>
#include <LibDraw/PNGLoader.h>
#include <LibGUI/GApplication.h>
#include <stdio.h>
RemoteObjectGraphModel::RemoteObjectGraphModel(pid_t pid)
: m_pid(pid)
RemoteObjectGraphModel::RemoteObjectGraphModel(RemoteProcess& process)
: m_process(process)
{
m_object_icon.set_bitmap_for_size(16, load_png("/res/icons/16x16/inspector-object.png"));
m_window_icon.set_bitmap_for_size(16, load_png("/res/icons/16x16/window.png"));
@ -19,12 +21,12 @@ RemoteObjectGraphModel::~RemoteObjectGraphModel()
GModelIndex RemoteObjectGraphModel::index(int row, int column, const GModelIndex& parent) const
{
if (!parent.is_valid()) {
if (m_remote_roots.is_empty())
if (m_process.roots().is_empty())
return {};
return create_index(row, column, &m_remote_roots.at(row));
return create_index(row, column, &m_process.roots().at(row));
}
auto& remote_parent = *static_cast<RemoteObject*>(parent.internal_data());
return create_index(row, column, remote_parent.children.at(row));
return create_index(row, column, &remote_parent.children.at(row));
}
GModelIndex RemoteObjectGraphModel::parent_index(const GModelIndex& index) const
@ -35,7 +37,7 @@ GModelIndex RemoteObjectGraphModel::parent_index(const GModelIndex& index) const
if (!remote_object.parent)
return {};
for (int row = 0; row < remote_object.parent->children.size(); ++row) {
if (remote_object.parent->children[row] == &remote_object)
if (&remote_object.parent->children[row] == &remote_object)
return create_index(row, 0, remote_object.parent);
}
@ -46,7 +48,7 @@ GModelIndex RemoteObjectGraphModel::parent_index(const GModelIndex& index) const
int RemoteObjectGraphModel::row_count(const GModelIndex& index) const
{
if (!index.is_valid())
return m_remote_roots.size();
return m_process.roots().size();
auto& remote_object = *static_cast<RemoteObject*>(index.internal_data());
return remote_object.children.size();
}
@ -72,54 +74,5 @@ GVariant RemoteObjectGraphModel::data(const GModelIndex& index, Role role) const
void RemoteObjectGraphModel::update()
{
auto success = m_socket.connect(CSocketAddress::local(String::format("/tmp/rpc.%d", m_pid)));
if (!success) {
fprintf(stderr, "Couldn't connect to PID %d\n", m_pid);
exit(1);
}
m_socket.on_connected = [this] {
dbg() << "Connected to PID " << m_pid;
};
m_socket.on_ready_to_read = [this] {
if (m_socket.eof()) {
dbg() << "Disconnected from PID " << m_pid;
m_socket.close();
return;
}
auto data = m_socket.read_all();
auto json_value = JsonValue::from_string(data);
ASSERT(json_value.is_array());
m_json = json_value.as_array();
Vector<NonnullOwnPtr<RemoteObject>> remote_objects;
HashMap<String, RemoteObject*> objects_by_address;
for (auto& value : m_json.values()) {
ASSERT(value.is_object());
auto& object = value.as_object();
auto remote_object = make<RemoteObject>();
remote_object->address = object.get("address").to_string();
remote_object->parent_address = object.get("parent").to_string();
remote_object->name = object.get("name").to_string();
remote_object->class_name = object.get("class_name").to_string();
objects_by_address.set(remote_object->address, remote_object);
remote_objects.append(move(remote_object));
}
for (int i = 0; i < remote_objects.size(); ++i) {
auto& remote_object = remote_objects[i];
auto* parent = objects_by_address.get(remote_object->parent_address).value_or(nullptr);
if (!parent) {
m_remote_roots.append(move(remote_object));
} else {
remote_object->parent = parent;
parent->children.append(move(remote_object));
}
}
did_update();
};
did_update();
}