diff --git a/src/virt-manager.schemas.in b/src/virt-manager.schemas.in index 263d24a7e..baedfc86c 100644 --- a/src/virt-manager.schemas.in +++ b/src/virt-manager.schemas.in @@ -143,32 +143,6 @@ - - /schemas/apps/::PACKAGE::/stats/enable-mem-poll - /apps/::PACKAGE::/stats/enable-mem-poll - ::PACKAGE:: - bool - 1 - - - Poll memory usage stats - Whether or not the app will poll connection and VM memory usage statistics - - - - - /schemas/apps/::PACKAGE::/stats/enable-cpu-poll - /apps/::PACKAGE::/stats/enable-cpu-poll - ::PACKAGE:: - bool - 1 - - - Poll cpu stats - Whether or not the app will poll connection and VM cpu usage statistics - - - /schemas/apps/::PACKAGE::/urls/url-list-length /apps/::PACKAGE::/urls/url-list-length diff --git a/src/virtManager/config.py b/src/virtManager/config.py index a0a4cb21c..41c506e86 100644 --- a/src/virtManager/config.py +++ b/src/virtManager/config.py @@ -360,19 +360,11 @@ class vmmConfig: return self.conf.get_bool(self.conf_dir + "/stats/enable-disk-poll") def get_stats_enable_net_poll(self): return self.conf.get_bool(self.conf_dir + "/stats/enable-net-poll") - def get_stats_enable_mem_poll(self): - return self.conf.get_bool(self.conf_dir + "/stats/enable-mem-poll") - def get_stats_enable_cpu_poll(self): - return self.conf.get_bool(self.conf_dir + "/stats/enable-cpu-poll") def set_stats_enable_disk_poll(self, val): self.conf.set_bool(self.conf_dir + "/stats/enable-disk-poll", val) def set_stats_enable_net_poll(self, val): self.conf.set_bool(self.conf_dir + "/stats/enable-net-poll", val) - def set_stats_enable_mem_poll(self, val): - self.conf.set_bool(self.conf_dir + "/stats/enable-mem-poll", val) - def set_stats_enable_cpu_poll(self, val): - self.conf.set_bool(self.conf_dir + "/stats/enable-cpu-poll", val) def on_stats_enable_disk_poll_changed(self, cb, userdata=None): self.conf.notify_add(self.conf_dir + "/stats/enable-disk-poll", cb, @@ -380,12 +372,6 @@ class vmmConfig: def on_stats_enable_net_poll_changed(self, cb, userdata=None): self.conf.notify_add(self.conf_dir + "/stats/enable-net-poll", cb, userdata) - def on_stats_enable_mem_poll_changed(self, cb, userdata=None): - self.conf.notify_add(self.conf_dir + "/stats/enable-mem-poll", cb, - userdata) - def on_stats_enable_cpu_poll_changed(self, cb, userdata=None): - self.conf.notify_add(self.conf_dir + "/stats/enable-cpu-poll", cb, - userdata) # VM Console preferences def on_console_popup_changed(self, callback): diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 85dfa0f63..f683f9482 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -930,14 +930,13 @@ class vmmDetails(gobject.GObject): dsk_txt = _("Disabled") net_txt = _("Disabled") - if self.config.get_stats_enable_cpu_poll(): - cpu_txt = "%d %%" % self.vm.cpu_time_percentage() + cpu_txt = "%d %%" % self.vm.cpu_time_percentage() + + vm_memory = self.vm.current_memory() + host_memory = self.vm.get_connection().host_memory_size() + mem_txt = "%d MB of %d MB" % (int(round(vm_memory/1024.0)), + int(round(host_memory/1024.0))) - if self.config.get_stats_enable_mem_poll(): - vm_memory = self.vm.current_memory() - host_memory = self.vm.get_connection().host_memory_size() - mem_txt = "%d MB of %d MB" % (int(round(vm_memory/1024.0)), - int(round(host_memory/1024.0))) if self.config.get_stats_enable_disk_poll(): dsk_txt = _rx_tx_text(self.vm.disk_read_rate(), self.vm.disk_write_rate(), "KB/s") diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py index 56b3b4a57..6f6d779c8 100644 --- a/src/virtManager/domain.py +++ b/src/virtManager/domain.py @@ -66,23 +66,17 @@ class vmmDomain(gobject.GObject): self._orig_inactive_xml = None self._valid_xml = False - self._mem_stats = None - self._cpu_stats = None self._network_traffic = None self._disk_io = None self._update_status() - self.config.on_stats_enable_mem_poll_changed(self.toggle_sample_mem_stats) - self.config.on_stats_enable_cpu_poll_changed(self.toggle_sample_cpu_stats) self.config.on_stats_enable_net_poll_changed(self.toggle_sample_network_traffic) self.config.on_stats_enable_disk_poll_changed(self.toggle_sample_disk_io) self._stats_net_supported = True self._stats_disk_supported = True - self.toggle_sample_mem_stats() - self.toggle_sample_cpu_stats() self.toggle_sample_network_traffic() self.toggle_sample_disk_io() @@ -297,17 +291,11 @@ class vmmDomain(gobject.GObject): self.config.on_console_scaling_changed, cb) - def _sample_mem_stats_dummy(self, ignore): - return 0, 0 - def _sample_mem_stats(self, info): pcentCurrMem = info[2] * 100.0 / self.connection.host_memory_size() pcentMaxMem = info[1] * 100.0 / self.connection.host_memory_size() return pcentCurrMem, pcentMaxMem - def _sample_cpu_stats_dummy(self, ignore, ignore1): - return 0, 0, 0 - def _sample_cpu_stats(self, info, now): prevCpuTime = 0 prevTimestamp = 0 @@ -417,8 +405,8 @@ class vmmDomain(gobject.GObject): if self.get_id() == 0: info[1] = self.connection.host_memory_size() - cpuTime, cpuTimeAbs, pcentCpuTime = self._cpu_stats(info, now) - pcentCurrMem, pcentMaxMem = self._mem_stats(info) + cpuTime, cpuTimeAbs, pcentCpuTime = self._sample_cpu_stats(info, now) + pcentCurrMem, pcentMaxMem = self._sample_mem_stats(info) rdBytes, wrBytes = self._disk_io() rxBytes, txBytes = self._network_traffic() @@ -1457,20 +1445,6 @@ class vmmDomain(gobject.GObject): self.redefine(util.xml_parse_wrapper, change_label) - def toggle_sample_cpu_stats(self, ignore1=None, ignore2=None, - ignore3=None, ignore4=None): - if self.config.get_stats_enable_cpu_poll(): - self._cpu_stats = self._sample_cpu_stats - else: - self._cpu_stats = self._sample_cpu_stats_dummy - - def toggle_sample_mem_stats(self, ignore1=None, ignore2=None, - ignore3=None, ignore4=None): - if self.config.get_stats_enable_mem_poll(): - self._mem_stats = self._sample_mem_stats - else: - self._mem_stats = self._sample_mem_stats_dummy - def toggle_sample_network_traffic(self, ignore1=None, ignore2=None, ignore3=None, ignore4=None): if self.config.get_stats_enable_net_poll(): diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py index 12ca57d38..c59be8496 100644 --- a/src/virtManager/manager.py +++ b/src/virtManager/manager.py @@ -149,10 +149,6 @@ class vmmManager(gobject.GObject): VMLIST_SORT_DISK_IO) self.config.on_stats_enable_net_poll_changed(self.enable_polling, VMLIST_SORT_NETWORK_USAGE) - self.config.on_stats_enable_cpu_poll_changed(self.enable_polling, - VMLIST_SORT_CPU_USAGE) - self.config.on_stats_enable_mem_poll_changed(self.enable_polling, - VMLIST_SORT_MEMORY_USAGE) self.window.get_widget("vm-view").set_active(0) @@ -329,11 +325,7 @@ class vmmManager(gobject.GObject): [ (VMLIST_SORT_DISK_IO, self.config.get_stats_enable_disk_poll()), (VMLIST_SORT_NETWORK_USAGE, - self.config.get_stats_enable_net_poll()), - (VMLIST_SORT_CPU_USAGE, - self.config.get_stats_enable_cpu_poll()), - (VMLIST_SORT_MEMORY_USAGE, - self.config.get_stats_enable_mem_poll())]: + self.config.get_stats_enable_net_poll())]: self.enable_polling(None, None, init_val, typ) self.window.get_widget("menu_file_restore_saved").set_sensitive(False) @@ -1025,11 +1017,7 @@ class vmmManager(gobject.GObject): col.set_visible(self.config.is_vmlist_cpu_usage_visible()) def enable_polling(self, ignore1, ignore2, conf_entry, userdata): - if userdata == VMLIST_SORT_CPU_USAGE: - widgn = "menu_view_cpu_usage" - elif userdata == VMLIST_SORT_MEMORY_USAGE: - widgn = "menu_view_memory_usage" - elif userdata == VMLIST_SORT_DISK_IO: + if userdata == VMLIST_SORT_DISK_IO: widgn = "menu_view_disk_io" elif userdata == VMLIST_SORT_NETWORK_USAGE: widgn = "menu_view_network_traffic" diff --git a/src/virtManager/preferences.py b/src/virtManager/preferences.py index 8ca97387d..805dcc805 100644 --- a/src/virtManager/preferences.py +++ b/src/virtManager/preferences.py @@ -46,8 +46,6 @@ class vmmPreferences(gobject.GObject): self.config.on_sound_remote_changed(self.refresh_sound_remote) self.config.on_stats_enable_disk_poll_changed(self.refresh_disk_poll) self.config.on_stats_enable_net_poll_changed(self.refresh_net_poll) - self.config.on_stats_enable_mem_poll_changed(self.refresh_mem_poll) - self.config.on_stats_enable_cpu_poll_changed(self.refresh_cpu_poll) self.refresh_update_interval() self.refresh_history_length() @@ -58,8 +56,6 @@ class vmmPreferences(gobject.GObject): self.refresh_sound_remote() self.refresh_disk_poll() self.refresh_net_poll() - self.refresh_mem_poll() - self.refresh_cpu_poll() self.window.signal_autoconnect({ "on_prefs_stats_update_interval_changed": self.change_update_interval, @@ -74,8 +70,6 @@ class vmmPreferences(gobject.GObject): "on_prefs_sound_remote_toggled": self.change_remote_sound, "on_prefs_stats_enable_disk_toggled": self.change_disk_poll, "on_prefs_stats_enable_net_toggled": self.change_net_poll, - "on_prefs_stats_enable_mem_toggled": self.change_mem_poll, - "on_prefs_stats_enable_cpu_toggled": self.change_cpu_poll, }) def close(self, ignore1=None, ignore2=None): @@ -121,12 +115,6 @@ class vmmPreferences(gobject.GObject): def refresh_net_poll(self, ignore1=None, ignore2=None, ignore3=None, ignore4=None): self.window.get_widget("prefs-stats-enable-net").set_active(self.config.get_stats_enable_net_poll()) - def refresh_mem_poll(self, ignore1=None, ignore2=None, ignore3=None, - ignore4=None): - self.window.get_widget("prefs-stats-enable-mem").set_active(self.config.get_stats_enable_mem_poll()) - def refresh_cpu_poll(self, ignore1=None, ignore2=None, ignore3=None, - ignore4=None): - self.window.get_widget("prefs-stats-enable-cpu").set_active(self.config.get_stats_enable_cpu_poll()) def change_update_interval(self, src): self.config.set_stats_update_interval(src.get_value_as_int()) @@ -149,10 +137,6 @@ class vmmPreferences(gobject.GObject): self.config.set_stats_enable_disk_poll(src.get_active()) def change_net_poll(self, src): self.config.set_stats_enable_net_poll(src.get_active()) - def change_mem_poll(self, src): - self.config.set_stats_enable_mem_poll(src.get_active()) - def change_cpu_poll(self, src): - self.config.set_stats_enable_cpu_poll(src.get_active()) def show_help(self, src): # From the Preferences window, show the help document from diff --git a/src/vmm-preferences.glade b/src/vmm-preferences.glade index 6cd499e76..b612a6526 100644 --- a/src/vmm-preferences.glade +++ b/src/vmm-preferences.glade @@ -1,6 +1,6 @@ - + Preferences @@ -38,27 +38,34 @@ 3 3 - + True 0 - samples + Update status every + + + + + True + 0 + Maintain history of - 2 - 3 1 2 - + True - 0 - seconds + True + 0 0 60 1 5 0 + - 2 - 3 + 1 + 2 + GTK_FILL @@ -78,36 +85,29 @@ - + True - True - 0 0 60 1 5 0 - + 0 + seconds - 1 - 2 - GTK_FILL + 2 + 3 - + True 0 - Maintain history of + samples + 2 + 3 1 2 - - - True - 0 - Update status every - - @@ -144,19 +144,37 @@ 3 3 - + + + + + + + + + + + + + True - True - 0 - True - + 0 + Disk I/O - 1 - 2 - 3 - 4 - GTK_EXPAND + GTK_FILL + + + + + True + 0 + Network I/O + + + 1 + 2 + GTK_FILL @@ -170,18 +188,16 @@ 1 2 - 2 - 3 GTK_EXPAND - + True True 0 True - + 1 @@ -191,67 +207,6 @@ GTK_EXPAND - - - True - True - 0 - True - - - - 1 - 2 - GTK_EXPAND - - - - - True - 0 - Network I/O - - - 3 - 4 - GTK_FILL - - - - - True - 0 - Disk I/O - - - 2 - 3 - GTK_FILL - - - - - True - 0 - Memory Usage - - - 1 - 2 - GTK_FILL - - - - - True - 0 - CPU Usage - PANGO_ELLIPSIZE_END - - - GTK_FILL - - @@ -302,31 +257,37 @@ True 6 - 1 3 - + True Never -Fullscreen only -Always - +For all new domains +For all domains + - 5 - 6 + 1 + 2 5 - + True 0 - Graphical Console Scaling: + Automatically open consoles: + + + + + True + 0 + Grab keyboard input: - 4 - 5 + 2 + 3 @@ -344,34 +305,27 @@ On mouse over - + True 0 - Grab keyboard input: + Graphical Console Scaling: - 2 - 3 + 4 + 5 - - True - 0 - Automatically open consoles: - - - - + True Never -For all new domains -For all domains - +Fullscreen only +Always + - 1 - 2 + 5 + 6 5 @@ -407,8 +361,14 @@ For all domains True 2 - 1 8 + + + True + 0 + Install Audio Device: + + True @@ -447,13 +407,6 @@ For all domains 2 - - - True - 0 - Install Audio Device: - -