CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-15 18:03:06 +12:00
Code Issues Projects Releases Wiki Activity

RAII

Browse source
This commit is contained in:
Jos Dehaes 2021-10-10 20:23:11 +02:00
parent 8fad5a61be
commit d5cb24fbeb
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/osx/btop_collect.cpp
View file

@ -516,6 +516,15 @@ namespace Mem {
return bool(val);
}
class IOObject {
public:
IOObject(string name, io_object_t obj) : name(name), object(obj) {}
virtual ~IOObject() { IOObjectRelease(object); }
private:
string name;
io_object_t &object;
};
void collect_disk(unordered_flat_map<string, disk_info> &disks, unordered_flat_map<string, string> &mapping) {
io_registry_entry_t drive;
io_iterator_t drive_list;
@ -531,7 +540,9 @@ namespace Mem {
Logger::error("Error in IOServiceGetMatchingServices()");
return;
}
auto d = IOObject("drive list", drive_list); // dummy var so it gets destroyed
while ((drive = IOIteratorNext(drive_list)) != 0) {
auto dr = IOObject("drive", drive);
io_registry_entry_t volumeRef;
IORegistryEntryGetParentEntry(drive, kIOServicePlane, &volumeRef);
if (volumeRef) {
@ -547,11 +558,7 @@ namespace Mem {
if (disks.contains(mountpoint)) {
auto& disk = disks.at(mountpoint);
CFDictionaryRef properties;
if (IORegistryEntryCreateCFProperties(volumeRef, (CFMutableDictionaryRef *)&properties, kCFAllocatorDefault, 0)) {
Logger::error("Error in IORegistryEntryCreateCFProperties()");
goto RETURN; // We must use a goto here to clean up drive_list
}
IORegistryEntryCreateCFProperties(volumeRef, (CFMutableDictionaryRef *)&properties, kCFAllocatorDefault, 0);
if (properties) {
CFDictionaryRef statistics = (CFDictionaryRef)CFDictionaryGetValue(properties, CFSTR("Statistics"));
if (statistics) {
@ -588,12 +595,7 @@ namespace Mem {
}
}
}
/* Release. */
IOObjectRelease(drive);
}
RETURN:
/* Release. */
IOObjectRelease(drive_list);
}
auto collect(const bool no_update) -> mem_info & {