query KSM page sharing

bump version to 1.0-45

diff --git a/Makefile b/Makefile
index 5a963381f7d23fda1b1bba7ac2626a54048069e3..2972ec95523d930f9e1615bb704f2e367a774346 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.3
 
 VERSION=1.0
 RELEASE=2.3
 
 VERSION=1.0

-PKGREL=44
+PKGREL=45

 
 PACKAGE=libpve-common-perl
 
 
 PACKAGE=libpve-common-perl
 

diff --git a/data/PVE/ProcFSTools.pm b/data/PVE/ProcFSTools.pm
index 4c1591cd8049b01dc488d7d908133c92ac2fc84a..2c2b376f7ff8d51ea2b9ac4f274de14d5ae9a2c8 100644 (file)
--- a/data/PVE/ProcFSTools.pm
+++ b/data/PVE/ProcFSTools.pm
@@ -175,6 +175,7 @@ sub read_meminfo {
        memtotal => 0,
        memfree => 0,
        memused => 0,
        memtotal => 0,
        memfree => 0,
        memused => 0,

+       memshared => 0,

        swaptotal => 0,
        swapfree => 0,
        swapused => 0,
        swaptotal => 0,
        swapfree => 0,
        swapused => 0,


@@ -199,6 +200,9 @@ sub read_meminfo {
     $res->{swapfree} = $d->{swapfree};
     $res->{swapused} = $res->{swaptotal} - $res->{swapfree};
 
     $res->{swapfree} = $d->{swapfree};
     $res->{swapused} = $res->{swaptotal} - $res->{swapfree};
 

+    my $spages = PVE::Tools::file_read_firstline("/sys/kernel/mm/ksm/pages_sharing");
+    $res->{memshared} = int($spages) * 4096;
+

     return $res;
 }
 
     return $res;
 }
 

diff --git a/debian/changelog b/debian/changelog
index e0b8e02693e480a6c04f5bb1c0cdfc6f06360880..6b434fa922248b0b495bc0d9a1e964c86306e25e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpve-common-perl (1.0-45) unstable; urgency=low
+
+  * read_meminfo: query KSM page sharing
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 01 Feb 2013 09:04:27 +0100
+

 libpve-common-perl (1.0-44) unstable; urgency=low
 
   * vlan changes: use ip command instead of old vconfig, activate gvrp 
 libpve-common-perl (1.0-44) unstable; urgency=low
 
   * vlan changes: use ip command instead of old vconfig, activate gvrp