Update memps from mainstream

Change-Id: I45753fcd754a4403109f2262486363679c0a5cd9
Signed-off-by: Anatolii Nikulin <nikulin.a@samsung.com>

diff --git a/daemon/sys_stat.c b/daemon/sys_stat.c
index ca0c8c8..09ad004 100644 (file)
--- a/daemon/sys_stat.c
+++ b/daemon/sys_stat.c
@@ -741,7 +741,7 @@ static uint64_t total_gem_memory(void)
        return total_gem_mem;
 }
 
-static int smaps_field_lcnt = 0;
+static int smaps_lcnt = 0;
 
 #define BUF_INC_SIZE    (512 * 1024)        /* maximal SMAPS I saw 2 MB     */
 /* reads file contents into memory */
@@ -826,40 +826,40 @@ int get_fixed_smaps_lcnt(void)
 
        if (buf.release[0] >= '4') {
                if (sub_version >= 4)
-               ret = 18;
-               /* Size, Rss, Pss, Shared_Clean, Shard_Dirty,
+               ret = 19;
+               /* Vma, Size, Rss, Pss, Shared_Clean, Shard_Dirty,
                 * Private_Clean, Private_Drity,
                 * Referenced, Anonymous, AnonHugePages, Shared_Hugetlb,
                 * Private_Hugetlb, Swap, SwapPss, KernelPageSize,
                 * MMUPageSize, Locked, VmFlags */
                else if (sub_version == 3)
-               ret = 16;
-               /* Size, Rss, Pss, Shared_Clean, Shard_Dirty,
+               ret = 17;
+               /* Vma, Size, Rss, Pss, Shared_Clean, Shard_Dirty,
                 * Private_Clean, Private_Drity,
                 * Referenced, Anonymous, AnonHugePages, Swap, SwapPss,
                 * KernelPageSize, MMUPageSize, Locked, VmFlags */
                else
-               ret = 15;
-               /* Size, Rss, Pss, Shared_Clean, Shard_Dirty,
+               ret = 16;
+               /* Vma, Size, Rss, Pss, Shared_Clean, Shard_Dirty,
                 * Private_Clean, Private_Drity,
                 * Referenced, Anonymous, AnonHugePages, Swap,
                 * KernelPageSize, MMUPageSize, Locked, VmFlags */
        } else if (buf.release[0] == '3') {
                if (sub_version >= 10)
-               ret = 15;
-               /* Size, Rss, Pss, Shared_Clean, Shard_Dirty,
+               ret = 16;
+               /* Vma, Size, Rss, Pss, Shared_Clean, Shard_Dirty,
                 * Private_Clean, Private_Drity,
                 * Referenced, Anonymous, AnonHugePages, Swap,
                 * KernelPageSize, MMUPageSize, Locked, VmFlags */
                else
-               ret = 14;
-               /* Size, Rss, Pss, Shared_Clean, Shard_Dirty,
+               ret = 15;
+               /* Vma, Size, Rss, Pss, Shared_Clean, Shard_Dirty,
                 * Private_Clean, Private_Drity,
                 * Referenced, Anonymous, AnonHugePages, Swap,
                 * KernelPageSize, MMUPageSize, Locked */
        } else {
-               ret = 11;
-               /* Size, Rss, Pss, Shared_Clean, Shard_Dirty,
+               ret = 12;
+               /* Vma, Size, Rss, Pss, Shared_Clean, Shard_Dirty,
                 * Private_Clean, Private_Drity,
                 * Referenced, Swap, KernelPageSize, MMUPageSize */
        }
@@ -907,7 +907,7 @@ error:
 
 void init_read_mapinfo()
 {
-       smaps_field_lcnt = get_smaps_lcnt();
+       smaps_lcnt = get_smaps_lcnt();
 }
 
 /* b6e82000-b6e83000 rw-p 00020000 b3:19 714        /usr/lib/ld-2.20-2014.11.so  : TM1
@@ -925,7 +925,7 @@ int read_mapinfo_section(FILE* fp, proc_t *proc)
        int line_cnt;
        char buf[LARGE_BUFFER];
 
-       line_cnt = smaps_field_lcnt;
+       line_cnt = smaps_lcnt;
        if ((--line_cnt <= 0) || (line = fgets(buf, sizeof(buf), fp)) == 0)
                return -EOF;