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

LibCore: Convert CFile to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 20:50:06 +02:00
parent 31b38ed88f
commit 8d550c174e
30 changed files with 135 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Applications/SystemMonitor/DevicesModel.cpp
View file

@ -95,11 +95,11 @@ GVariant DevicesModel::data(const GModelIndex& index, Role) const
void DevicesModel::update()
{
CFile proc_devices { "/proc/devices" };
if (!proc_devices.open(CIODevice::OpenMode::ReadOnly))
auto proc_devices = CFile::construct("/proc/devices");
if (!proc_devices->open(CIODevice::OpenMode::ReadOnly))
ASSERT_NOT_REACHED();
auto json = JsonValue::from_string(proc_devices.read_all()).as_array();
auto json = JsonValue::from_string(proc_devices->read_all()).as_array();
m_devices.clear();
json.for_each([this](auto& value) {

8
Applications/SystemMonitor/MemoryStatsWidget.cpp
View file

@ -11,9 +11,9 @@
MemoryStatsWidget::MemoryStatsWidget(GraphWidget& graph, GWidget* parent)
: GWidget(parent)
, m_graph(graph)
, m_proc_memstat("/proc/memstat")
, m_proc_memstat(CFile::construct("/proc/memstat"))
{
if (!m_proc_memstat.open(CIODevice::OpenMode::ReadOnly))
if (!m_proc_memstat->open(CIODevice::OpenMode::ReadOnly))
ASSERT_NOT_REACHED();
set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
set_preferred_size(0, 72);
@ -59,9 +59,9 @@ static inline size_t bytes_to_kb(size_t bytes)
void MemoryStatsWidget::refresh()
{
m_proc_memstat.seek(0);
m_proc_memstat->seek(0);
auto file_contents = m_proc_memstat.read_all();
auto file_contents = m_proc_memstat->read_all();
auto json = JsonValue::from_string(file_contents).as_object();
unsigned kmalloc_eternal_allocated = json.get("kmalloc_eternal_allocated").to_u32();

2
Applications/SystemMonitor/MemoryStatsWidget.h
View file

@ -22,5 +22,5 @@ private:
ObjectPtr<GLabel> m_supervisor_physical_pages_label;
ObjectPtr<GLabel> m_kmalloc_label;
ObjectPtr<GLabel> m_kmalloc_count_label;
CFile m_proc_memstat;
ObjectPtr<CFile> m_proc_memstat;
};

8
Applications/SystemMonitor/ProcessStacksWidget.cpp
View file

@ -28,11 +28,11 @@ void ProcessStacksWidget::set_pid(pid_t pid)
void ProcessStacksWidget::refresh()
{
CFile file(String::format("/proc/%d/stack", m_pid));
if (!file.open(CIODevice::ReadOnly)) {
m_stacks_editor->set_text(String::format("Unable to open %s", file.filename().characters()));
auto file = CFile::construct(String::format("/proc/%d/stack", m_pid));
if (!file->open(CIODevice::ReadOnly)) {
m_stacks_editor->set_text(String::format("Unable to open %s", file->filename().characters()));
return;
}
m_stacks_editor->set_text(file.read_all());
m_stacks_editor->set_text(file->read_all());
}