Show full process argument list instead only executable name

[scan-pagemap] / pagemap.h

diff --git a/pagemap.h b/pagemap.h
index 34c5d9483715c9dd2e6a64ce07ef34b8b7d9fd0f..2bdaa2ba3cccc4557d1cdd95d95bbd73bc8fd6c6 100644 (file)
--- a/pagemap.h
+++ b/pagemap.h
@@ -1,11 +1,29 @@
+/*
+ * Copyright (C) 2010 Timo Kokkonen <timo.t.kokkonen@iki.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #ifndef _PAGEMAP_H
 #define _PAGEMAP_H
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "utils.h"
 #include "list.h"
-#include "bintree.h"
+#include "rbtree.h"
 
 #define PAGE_SHIFT     12
 #define PAGE_SIZE      (1 << PAGE_SHIFT)
@@ -22,7 +40,7 @@ struct maps_list {
 #define BITRANGE(first, last) (((2ll << (last - first)) - 1) << first)
 
 struct pageframe {
-       struct bintree tree;
+       struct rb_node tree;
        struct list_head ml;    /* List of mappings which refer to this pfn */
 
        unsigned long long pf;  /* page frame entry from /proc/pid/pagemap */
@@ -32,7 +50,10 @@ struct pageframe {
        int refcount;
 };
 
-#define tree_to_pageframe(tree_struct)                         \
+struct pageframe *pf_insert(struct rb_root *root, struct pageframe *pf);
+struct pageframe *pf_search(struct rb_root *root, struct pageframe *pf);
+
+#define rb_to_pageframe(tree_struct)                           \
        container_of((tree_struct), struct pageframe, tree)
 
 static inline void clear_pageframe(struct pageframe *pf)
@@ -71,8 +92,6 @@ static inline int swap_offset(struct pageframe *p)
        return (BITRANGE(5, 54) & p->pf) >> 5;
 }
 
-#define KPAGEFLAGS_NUM 22
-
 enum kpageflags {
        LOCKED,
        ERROR,
@@ -96,8 +115,12 @@ enum kpageflags {
        HWPOISON,
        NOPAGE,
        KSM,
+       THP,
+       __PAGEFLAGS_LAST,
 };
 
+#define KPAGEFLAGS_NUM __PAGEFLAGS_LAST
+
 struct kpageflag_str {
        int flag;
        char *str;
@@ -150,6 +173,7 @@ struct process {
 
        long int pages_present;
        long int pages_swapped;
+       long int pages_unique;
 
        int is_initial_pid;
 };
@@ -182,12 +206,11 @@ static inline void init_parse_opts(struct parse_opts *p)
 
 static inline struct pidlist *alloc_pidlist(void)
 {
-       struct pidlist *p = malloc(sizeof(*p));
+       struct pidlist *p = calloc(sizeof(*p), 1);
 
        if (p == NULL)
                return p;
 
-       memset(p, 0, sizeof(*p));
        INIT_LIST_HEAD(&p->list);
 
        return p;