[gnome-boxes] Add Net graph stats

[Marc-Andre Lureau <malureau src gnome org>]

commit 5e5e204f953c6f6bc4cc97c4bc3ef17274a6826f
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Thu Nov 10 16:43:47 2011 +0100

    Add Net graph stats

 src/libvirt-machine.vala |   95 ++++++++++++++++++++++++++--------------------
 src/machine.vala         |    1 -
 src/properties.vala      |    6 ++-
 3 files changed, 58 insertions(+), 44 deletions(-)
---
diff --git a/src/libvirt-machine.vala b/src/libvirt-machine.vala
index 13ff4df..3a3a744 100644
--- a/src/libvirt-machine.vala
+++ b/src/libvirt-machine.vala
@@ -68,10 +68,11 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
         double cpu_time_abs;
         double cpu_guest_percent;
         double memory_percent;
-        uint disk_read;
-        uint disk_write;
-        uint net_read;
-        uint net_write;
+        double disk_read;
+        double disk_write;
+        DomainInterfaceStats net;
+        double net_read;
+        double net_write;
     }
 
     static const int STATS_SIZE = 20;
@@ -119,12 +120,54 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
     }
 
 
+    private void update_net_stat (ref MachineStat stat) {
+        if (!is_running ())
+            return;
+
+        try {
+            // FIXME: switch to domain.get_devices () and loop over all interfaces
+            var xmldoc = domain.get_config (0).to_xml ();
+            var target_dev = extract_xpath (xmldoc,
+                "string(/domain/devices/interface[ type='network']/target/@dev)", true);
+            if (target_dev == "")
+                return;
+
+            var net = GLib.Object.new (typeof (GVir.DomainInterface),
+                                       "path", target_dev,
+                                       "domain", domain) as GVir.DomainInterface;
+            stat.net = net.get_stats ();
+            var prev = stats[STATS_SIZE - 1];
+            if (prev.net != null) {
+                stat.net_read = (stat.net.rx_bytes - prev.net.rx_bytes);
+                stat.net_write = (stat.net.tx_bytes - prev.net.tx_bytes);
+            }
+        } catch (GLib.Error err) {
+        }
+    }
+
     public signal void stats_updated ();
 
     public double[] cpu_stats;
     public double[] io_stats;
     public double[] net_stats;
     private void update_stats () {
+        try {
+            var now = get_monotonic_time ();
+            var stat = MachineStat () { timestamp = now };
+            var info = domain.get_info ();
+
+            update_cpu_stat (info, ref stat);
+            update_mem_stat (info, ref stat);
+            update_io_stat (ref stat);
+            update_net_stat (ref stat);
+
+            stats = stats[1:STATS_SIZE];
+            stats += stat;
+
+        } catch (GLib.Error err) {
+            warning (err.message);
+        }
+
         cpu_stats = {};
         io_stats = {};
         net_stats = {};
@@ -132,24 +175,16 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
         foreach (var s in stats) {
             cpu_stats += s.cpu_guest_percent;
         }
+        foreach (var s in stats) {
+            net_stats += (s.net_read + s.net_write);
+        }
+        foreach (var s in stats) {
+            io_stats += (s.disk_read + s.disk_write);
+        }
 
         stats_updated ();
     }
 
-    private void update_net_stat (ref MachineStat stat) {
-        try {
-            // var xmldoc = domain.get_config (0).doc;
-            // var target_dev = extract_xpath (xmldoc,
-            //     "string(/domain/devices/interface[ type='network']/target/@dev)", true);
-            // if (target_dev == "")
-            //     return;
-            // var interfaces = domain.get_interfaces ();
-            // foreach (var iface in interfaces)
-            //     message (iface.name);
-        } catch (GLib.Error err) {
-        }
-    }
-
     private uint stats_id;
     public void set_stats_enable (bool enable) {
         if (enable) {
@@ -157,29 +192,7 @@ private class Boxes.LibvirtMachine: Boxes.Machine {
                 return;
 
             stats_id = Timeout.add_seconds (1, () => {
-                    try {
-                        var now = get_monotonic_time ();
-                        var stat = MachineStat () { timestamp = now };
-                        var info = domain.get_info ();
-
-                        // message (domain.get_config (0).to_xml ());
-                        // message (domain.get_config (0).get_node_content ("devices"));
-                        // var devices = domain.get_config (0).get_devices ().data;
-                        // foreach (var d in devices) {
-                        //     message (d.to_xml ());
-                        // }
-                        update_cpu_stat (info, ref stat);
-                        update_mem_stat (info, ref stat);
-                        update_io_stat (ref stat);
-                        update_net_stat (ref stat);
-
-                        stats = stats[1:STATS_SIZE];
-                        stats += stat;
-
-                        update_stats ();
-                    } catch (GLib.Error err) {
-                        warning (err.message);
-                    }
+                    update_stats ();
                     return true;
                 });
         } else {
diff --git a/src/machine.vala b/src/machine.vala
index fe06859..fb18bc9 100644
--- a/src/machine.vala
+++ b/src/machine.vala
@@ -401,7 +401,6 @@ private class Boxes.MachineActor: Boxes.UI {
                              "y", height - 200.0f,
                              "width", 180.0f,
                              "height", 130.0f).completed.connect (() => {
-                                     message ("enabled");
                                  yconstraint.enabled = true;
                              });
 
diff --git a/src/properties.vala b/src/properties.vala
index 6361393..1c8acbb 100644
--- a/src/properties.vala
+++ b/src/properties.vala
@@ -148,6 +148,8 @@ private class Boxes.Properties: Boxes.UI {
         if (machine != null) {
             stats_id = machine.stats_updated.connect (() => {
                 cpu.points = machine.cpu_stats;
+                net.points = machine.net_stats;
+                io.points = machine.io_stats;
             });
         }
     }
@@ -222,14 +224,14 @@ private class Boxes.Properties: Boxes.UI {
         label = new Gtk.Label (_("I/O:"));
         label.get_style_context ().add_class ("boxes-graph-label");
         grid.attach (label, 2, 0, 1, 1);
-        io = new MiniGraph.with_ymax ({}, 100.0, 20);
+        io = new MiniGraph.with_ymax ({}, 20);
         io.hexpand = true;
         grid.attach (io, 3, 0, 1, 1);
 
         label = new Gtk.Label (_("Net:"));
         label.get_style_context ().add_class ("boxes-graph-label");
         grid.attach (label, 4, 0, 1, 1);
-        net = new MiniGraph.with_ymax ({}, 100.0, 20);
+        net = new MiniGraph ({}, 20);
         net.hexpand = true;
         grid.attach (net, 5, 0, 1, 1);