diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2013-12-18 14:42:43 +0100 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2014-01-06 12:08:55 -0500 |
| commit | b5da599aef13f85dbf3a3a963abdea69b6b3677e (patch) | |
| tree | 562d2def4b3a2cb580f81ea8f43bade0a131d990 /virtManager/domain.py | |
| parent | 77b11439656a25840980f98ebfef1bce4bde8c9e (diff) | |
| download | virt-manager-b5da599aef13f85dbf3a3a963abdea69b6b3677e.tar.gz | |
Base mem statistics on virDomainMemoryStats if available.
Attempt to query domain memory stats via virDomainMemoryStats.
(crobinso: remove the broken fallback, since it's confusing)
Diffstat (limited to 'virtManager/domain.py')
| -rw-r--r-- | virtManager/domain.py | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/virtManager/domain.py b/virtManager/domain.py index c94ac570..fc9cf066 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -245,6 +245,8 @@ class vmmDomain(vmmLibvirtObject): self.remote_console_supported = False self.title_supported = False + self._mem_stats_supported = True + self._enable_net_poll = False self._stats_net_supported = True self._stats_net_skip = [] @@ -1359,12 +1361,26 @@ class vmmDomain(vmmLibvirtObject): # Stats helpers ### ################### - def _sample_mem_stats(self, info): - curmem = info[2] - if not self.is_active(): - curmem = 0 + def _sample_mem_stats(self): + curmem = 0 + totalmem = 1 + + if self._mem_stats_supported and self.is_active(): + try: + stats = self._backend.memoryStats() + # did we get both required stat items back? + if set(['actual', 'rss']).issubset( + set(stats.keys())): + curmem = stats['rss'] + totalmem = stats['actual'] + except libvirt.libvirtError, err: + if util.is_error_nosupport(err): + logging.debug("Mem stats not supported: %s", err) + self._mem_stats_supported = False + else: + logging.error("Error reading mem stats: %s", err) - pcentCurrMem = curmem * 100.0 / self.maximum_memory() + pcentCurrMem = curmem * 100.0 / totalmem pcentCurrMem = max(0.0, min(pcentCurrMem, 100.0)) return pcentCurrMem, curmem @@ -1767,7 +1783,7 @@ class vmmDomain(vmmLibvirtObject): now = time.time() (cpuTime, cpuTimeAbs, pcentHostCpu, pcentGuestCpu) = self._sample_cpu_stats(info, now) - pcentCurrMem, curmem = self._sample_mem_stats(info) + pcentCurrMem, curmem = self._sample_mem_stats() rdBytes, wrBytes = self._sample_disk_io() rxBytes, txBytes = self._sample_network_traffic() |