[gnome-usage] Drop support for monitoring network
- From: Petr Štětka <pstetka src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-usage] Drop support for monitoring network
- Date: Wed, 19 Apr 2017 14:35:57 +0000 (UTC)
commit c3542a9059670e45af94e04d7e86f4739ee724ee
Author: Petr Štětka <pstetka redhat com>
Date: Wed Apr 19 16:35:36 2017 +0200
Drop support for monitoring network
README.md | 6 --
meson.build | 1 -
src/graph-stack-switcher.vala | 3 +-
src/graph-switcher-button.vala | 6 --
src/meson.build | 7 +--
src/network-graph-table.vala | 57 --------------
src/network-graph.vala | 99 -----------------------
src/network-monitor.vala | 106 -------------------------
src/network-sub-view.vala | 76 ------------------
src/performance-view.vala | 3 +-
src/process-dialog.vala | 13 ---
src/process-list-box.vala | 9 +--
src/process-row.vala | 19 -----
src/process.vala | 39 ---------
src/sub-process-list-box.vala | 2 -
src/sub-process-sub-row.vala | 3 -
src/system-monitor.vala | 40 ----------
src/vapis/netinfo.vapi | 169 ----------------------------------------
18 files changed, 4 insertions(+), 654 deletions(-)
---
diff --git a/README.md b/README.md
index 99960ec..dbe4390 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ A nice way to view information about use of system resources, like memory and di
In terminal run ```gnome-usage``` command or run Usage from app launcher.
##Dependencies
-- [libnetinfo-ffi >= 0.3.1](https://github.com/kaegi/netinfo-ffi)
- libgtop >= 2.34.2
##Compilation:
@@ -29,13 +28,8 @@ cd gnome-usage
meson build && cd build
ninja-build #or ninja
sudo ninja-build install #or sudo ninja install
-sudo setcap cap_net_raw,cap_net_admin=eip /usr/local/bin/gnome-usage
```
-###netinfo-ffi dependency
-RPM packages for libnetinfo-ffi you can get from [Fedora
Copr](https://copr.fedorainfracloud.org/coprs/pstetka/gnome-usage/packages/)
-or compile yourself from [GitHub](https://github.com/kaegi/netinfo-ffi).
-
##License
Code is under GNU GPLv3 license.
diff --git a/meson.build b/meson.build
index a1408e3..2ea2718 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,6 @@ gobject = dependency('gobject-2.0')
gio = dependency('gio-2.0')
gtk = dependency('gtk+-3.0')
gtop = dependency('libgtop-2.0', version : '>=2.34.2')
-netinfo = cc.find_library('netinfo')
math = cc.find_library('m')
subdir('data')
diff --git a/src/graph-stack-switcher.vala b/src/graph-stack-switcher.vala
index f35d3e4..06950a3 100644
--- a/src/graph-stack-switcher.vala
+++ b/src/graph-stack-switcher.vala
@@ -24,8 +24,7 @@ namespace Usage
buttons = {
new GraphSwitcherButton.processor(_("Processor")),
new GraphSwitcherButton.memory(_("Memory")),
- new GraphSwitcherButton.disk(_("Disk I/O")),
- new GraphSwitcherButton.network(_("Network")),
+ new GraphSwitcherButton.disk(_("Disk I/O"))
};
foreach(Gtk.ToggleButton button in buttons)
diff --git a/src/graph-switcher-button.vala b/src/graph-switcher-button.vala
index c9f0fa2..0623fca 100644
--- a/src/graph-switcher-button.vala
+++ b/src/graph-switcher-button.vala
@@ -20,12 +20,6 @@ namespace Usage
child = createContent(disk_graph, label);
}
- public GraphSwitcherButton.network(string label)
- {
- Rg.Graph network_graph = new NetworkGraph();
- child = createContent(network_graph, label);
- }
-
private Gtk.Box createContent(Rg.Graph graph, string label_text)
{
graph.height_request = 80;
diff --git a/src/meson.build b/src/meson.build
index 627a020..75c7dd9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,10 +19,6 @@ vala_sources = [
'memory-graph.vala',
'memory-monitor.vala',
'memory-sub-view.vala',
- 'network-graph-table.vala',
- 'network-graph.vala',
- 'network-monitor.vala',
- 'network-sub-view.vala',
'performance-view.vala',
'pie-chart.vala',
'power-view.vala',
@@ -52,7 +48,6 @@ vala_args = [
'--pkg=rg',
'--pkg=egg',
'--pkg=better',
- '--pkg=netinfo',
'--pkg=libgtop-2.0',
'--pkg=config',
'--pkg=posix',
@@ -65,5 +60,5 @@ usage = executable('gnome-usage',
include_directories : include_directories('/usr/include/libgtop-2.0'),
vala_args: vala_args,
install: true,
- dependencies : [glib, gobject, gio, gtk, rg, egg, math, gtop, netinfo])
+ dependencies : [glib, gobject, gio, gtk, rg, egg, math, gtop])
diff --git a/src/performance-view.vala b/src/performance-view.vala
index 240cfd8..1795009 100644
--- a/src/performance-view.vala
+++ b/src/performance-view.vala
@@ -17,8 +17,7 @@ namespace Usage
{
new ProcessorSubView(),
new MemorySubView(),
- new DiskSubView(),
- new NetworkSubView()
+ new DiskSubView()
};
search_bar = new Gtk.SearchBar();
diff --git a/src/process-dialog.vala b/src/process-dialog.vala
index 59349a0..f372dc0 100644
--- a/src/process-dialog.vala
+++ b/src/process-dialog.vala
@@ -10,8 +10,6 @@ namespace Usage
GraphBlock processor_graph_block;
GraphBlock memory_graph_block;
GraphBlock disk_graph_block;
- GraphBlock downloads_graph_block;
- GraphBlock uploads_graph_block;
public ProcessDialog(Pid pid, string app_name, string process)
{
@@ -39,15 +37,10 @@ namespace Usage
processor_graph_block = new GraphBlock(GraphBlockType.PROCESSOR, _("Processor"), this.title);
memory_graph_block = new GraphBlock(GraphBlockType.MEMORY, _("Memory"), this.title);
- disk_graph_block = new GraphBlock(GraphBlockType.DISK, _("Disk I/O"), this.title);
- downloads_graph_block = new GraphBlock(GraphBlockType.NETWORK, _("Downloads"), this.title,
false);
- uploads_graph_block = new GraphBlock(GraphBlockType.NETWORK, _("Uploads"), this.title, false);
grid.attach(processor_graph_block, 0, 0, 1, 1);
grid.attach(memory_graph_block, 1, 0, 1, 1);
grid.attach(disk_graph_block, 2, 0, 1, 1);
- grid.attach(downloads_graph_block, 0, 1, 1, 1);
- grid.attach(uploads_graph_block, 1, 1, 1, 1);
content.add(grid);
content.show_all();
@@ -69,8 +62,6 @@ namespace Usage
ProcessStatus process_status = ProcessStatus.DEAD;
int app_cpu_load = 0;
uint64 app_memory_usage = 0;
- uint64 app_net_download = 0;
- uint64 app_net_upload = 0;
if(data != null)
{
@@ -80,15 +71,11 @@ namespace Usage
processor_other = int.max(processor_other, 0);
processor_graph_block.update(app_cpu_load, processor_other, 100, (int)
data.get_last_processor());
process_status = data.get_status();
- app_net_download = data.get_net_download();
- app_net_upload = data.get_net_upload();
}
else
processor_graph_block.update(0, (int) monitor.cpu_load, 100);
memory_graph_block.update(app_memory_usage, monitor.ram_usage, monitor.ram_total);
- downloads_graph_block.update(app_net_download, monitor.net_download - app_net_download,
monitor.net_download);
- uploads_graph_block.update(app_net_upload, monitor.net_upload - app_net_upload,
monitor.net_upload);
headerbar.set_process_state(process_status);
return true;
}
diff --git a/src/process-list-box.vala b/src/process-list-box.vala
index 3484912..80dff5d 100644
--- a/src/process-list-box.vala
+++ b/src/process-list-box.vala
@@ -2,8 +2,7 @@ namespace Usage
{
public enum ProcessListBoxType {
PROCESSOR,
- MEMORY,
- NETWORK
+ MEMORY
}
public class ProcessListBox : Gtk.ListBox
@@ -69,8 +68,6 @@ namespace Usage
return (int) ((uint64) (p_a.get_cpu_load() < p_b.get_cpu_load()) - (uint64)
(p_a.get_cpu_load() > p_b.get_cpu_load()));
case ProcessListBoxType.MEMORY:
return (int) ((uint64) (p_a.get_mem_usage() < p_b.get_mem_usage()) - (uint64)
(p_a.get_mem_usage() > p_b.get_mem_usage()));
- case ProcessListBoxType.NETWORK:
- return (int) ((uint64) (p_a.get_net_all() < p_b.get_net_all()) - (uint64)
(p_a.get_net_all() > p_b.get_net_all()));
}
};
@@ -90,10 +87,6 @@ namespace Usage
foreach(unowned Process process in (GLib.Application.get_default() as
Application).get_system_monitor().get_ram_processes())
model.insert_sorted(process, processcmp);
break;
- case ProcessListBoxType.NETWORK:
- foreach(unowned Process process in (GLib.Application.get_default() as
Application).get_system_monitor().get_net_processes())
- model.insert_sorted(process, processcmp);
- break;
}
}
else
diff --git a/src/process-row.vala b/src/process-row.vala
index e519aef..a286b10 100644
--- a/src/process-row.vala
+++ b/src/process-row.vala
@@ -151,25 +151,6 @@ namespace Usage
else
max_usage = false;
break;
- case ProcessListBoxType.NETWORK:
- if(group)
- {
- string values_string = "";
- var values = new GLib.List<uint64?>();
- foreach(Process sub_process in process.get_sub_processes().get_values())
- values.insert_sorted((uint64) sub_process.get_net_all(), sort);
-
- foreach(uint64 value in values)
- values_string += " " + Utils.format_size_speed_values(value);
-
- title_label.label += " (" + process.get_sub_processes().size().to_string() + ")";
- load_label.set_label(values_string);
- }
- else
- {
- load_label.set_label(Utils.format_size_speed_values(process.get_net_all()));
- }
- break;
}
set_styles();
diff --git a/src/process.vala b/src/process.vala
index 8a14eee..a1159e7 100644
--- a/src/process.vala
+++ b/src/process.vala
@@ -12,9 +12,6 @@ namespace Usage
uint64 x_cpu_last_used;
uint last_processor;
uint64 mem_usage;
- uint64 net_download;
- uint64 net_upload;
- uint64 net_all;
HashTable<Pid?, Process>? sub_processes;
bool alive;
ProcessStatus status;
@@ -31,9 +28,6 @@ namespace Usage
this.x_cpu_last_used = 0;
this.last_processor = 0;
this.mem_usage = 0;
- this.net_download = 0;
- this.net_upload = 0;
- this.net_all = 0;
this.sub_processes = null;
this.alive = true;
this.status = ProcessStatus.SLEEPING;
@@ -47,9 +41,6 @@ namespace Usage
this.cpu_last_used = process.get_cpu_last_used();
this.x_cpu_last_used = process.get_x_cpu_last_used();
this.mem_usage = process.get_mem_usage();
- this.net_download = process.get_net_download();
- this.net_upload = process.get_net_upload();
- this.net_all = process.get_net_all();
this.alive = process.get_alive();
this.status = process.get_status();
}
@@ -154,36 +145,6 @@ namespace Usage
this.mem_usage = mem_usage;
}
- public uint64 get_net_download()
- {
- return net_download;
- }
-
- public void set_net_download(uint64 net_download)
- {
- this.net_download = net_download;
- }
-
- public uint64 get_net_upload()
- {
- return net_upload;
- }
-
- public void set_net_upload(uint64 net_upload)
- {
- this.net_upload = net_upload;
- }
-
- public uint64 get_net_all()
- {
- return net_all;
- }
-
- public void set_net_all(uint64 net_all)
- {
- this.net_all = net_all;
- }
-
public HashTable<Pid?, Process>? get_sub_processes()
{
return sub_processes;
diff --git a/src/sub-process-list-box.vala b/src/sub-process-list-box.vala
index 722e0a7..7d1d56b 100644
--- a/src/sub-process-list-box.vala
+++ b/src/sub-process-list-box.vala
@@ -42,8 +42,6 @@ namespace Usage
return (int) ((uint64) (p_a.get_cpu_load() < p_b.get_cpu_load()) - (uint64)
(p_a.get_cpu_load() > p_b.get_cpu_load()));
case ProcessListBoxType.MEMORY:
return (int) ((uint64) (p_a.get_mem_usage() < p_b.get_mem_usage()) - (uint64)
(p_a.get_mem_usage() > p_b.get_mem_usage()));
- case ProcessListBoxType.NETWORK:
- return (int) ((uint64) (p_a.get_net_all() < p_b.get_net_all()) - (uint64)
(p_a.get_net_all() > p_b.get_net_all()));
}
};
diff --git a/src/sub-process-sub-row.vala b/src/sub-process-sub-row.vala
index b3ab960..775296b 100644
--- a/src/sub-process-sub-row.vala
+++ b/src/sub-process-sub-row.vala
@@ -57,9 +57,6 @@ namespace Usage
else
max_usage = false;
break;
- case ProcessListBoxType.NETWORK:
- load_label.set_label(Utils.format_size_speed_values(process.get_net_all()));
- break;
}
}
diff --git a/src/system-monitor.vala b/src/system-monitor.vala
index 26d6767..64f4e82 100644
--- a/src/system-monitor.vala
+++ b/src/system-monitor.vala
@@ -9,18 +9,13 @@ namespace Usage
public uint64 ram_total { get; private set; }
public uint64 swap_usage { get; private set; }
public uint64 swap_total { get; private set; }
- public uint64 net_download { get; private set; }
- public uint64 net_upload { get; private set; }
- public uint64 net_usage { get; private set; }
private CpuMonitor cpu_monitor;
private MemoryMonitor memory_monitor;
- private NetworkMonitor network_monitor;
private HashTable<Pid?, Process> process_table;
private HashTable<string, Process> cpu_process_table;
private HashTable<string, Process> ram_process_table;
- private HashTable<string, Process> net_process_table;
private int process_mode = GTop.EXCLUDE_SYSTEM;
private GLib.List<AppInfo> apps_info;
@@ -55,16 +50,6 @@ namespace Usage
return ram_process_table[cmdline];
}
- public List<unowned Process> get_net_processes()
- {
- return net_process_table.get_values();
- }
-
- public unowned Process get_net_process(string cmdline)
- {
- return net_process_table[cmdline];
- }
-
public unowned GLib.List<AppInfo> get_apps_info()
{
return apps_info;
@@ -76,12 +61,10 @@ namespace Usage
cpu_monitor = new CpuMonitor();
memory_monitor = new MemoryMonitor();
- network_monitor = new NetworkMonitor();
process_table = new HashTable<Pid?, Process>(int_hash, int_equal);
cpu_process_table = new HashTable<string, Process>(str_hash, str_equal);
ram_process_table = new HashTable<string, Process>(str_hash, str_equal);
- net_process_table = new HashTable<string, Process>(str_hash, str_equal);
var settings = (GLib.Application.get_default() as Application).settings;
apps_info = AppInfo.get_all();
@@ -99,7 +82,6 @@ namespace Usage
{
cpu_monitor.update();
memory_monitor.update();
- network_monitor.update();
cpu_load = cpu_monitor.get_cpu_load();
x_cpu_load = cpu_monitor.get_x_cpu_load();
@@ -107,9 +89,6 @@ namespace Usage
ram_total = memory_monitor.get_ram_total();
swap_usage = memory_monitor.get_swap_usage();
swap_total = memory_monitor.get_swap_total();
- net_download = network_monitor.get_net_download();
- net_upload = network_monitor.get_net_upload();
- net_usage = network_monitor.get_net_usage();
foreach(unowned Process process in process_table.get_values())
{
@@ -118,7 +97,6 @@ namespace Usage
set_alive_false(ref cpu_process_table);
set_alive_false(ref ram_process_table);
- set_alive_false(ref net_process_table);
GTop.Proclist proclist;
var pids = GTop.get_proclist (out proclist, process_mode);
@@ -141,7 +119,6 @@ namespace Usage
get_process_status(ref process);
cpu_monitor.update_process(ref process);
memory_monitor.update_process(ref process);
- network_monitor.update_process(ref process);
}
}
@@ -170,14 +147,6 @@ namespace Usage
}
update_processes(process_table_temp, ref ram_process_table);
- process_table_temp.remove_all();
- foreach(unowned Process process in process_table.get_values())
- {
- if(process.get_net_all() >= 1)
- process_table_temp.insert(process.get_pid(), process);
- }
- update_processes(process_table_temp, ref net_process_table);
-
return true;
}
@@ -374,9 +343,6 @@ namespace Usage
{
double cpu_load = 0;
uint64 mem_usage = 0;
- uint64 net_all = 0;
- uint64 net_download = 0;
- uint64 net_upload = 0;
foreach(unowned Process sub_process in process.get_sub_processes().get_values())
{
if (sub_process.get_alive() == false)
@@ -385,16 +351,10 @@ namespace Usage
{
cpu_load += sub_process.get_cpu_load();
mem_usage += sub_process.get_mem_usage();
- net_all += sub_process.get_net_all();
- net_download += sub_process.get_net_download();
- net_upload += sub_process.get_net_upload();
}
}
process.set_cpu_load(cpu_load);
process.set_mem_usage(mem_usage);
- process.set_net_all(net_all);
- process.set_net_download(net_download);
- process.set_net_upload(net_upload);
if(process.get_sub_processes().length == 1) //tranform to process
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
