Fix segfault in mail folder (SF: 3007493)

[monky] / src / top.h

diff --git a/src/top.h b/src/top.h
index cf0fccf..51bf936 100644 (file)
--- a/src/top.h
+++ b/src/top.h
@@ -1,4 +1,6 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -8,7 +10,7 @@
  *
  * Copyright (c) 2005 Adi Zaimi, Dan Piponi <dan@tanelorn.demon.co.uk>,
  *                                       Dave Clark <clarkd@skynet.ca>
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -24,7 +26,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$ */
+ */
+
+#ifndef _top_h_
+#define _top_h_
 
 /* Ensure there's an operating system defined.
  * compile with gcc -DOS ...
@@ -36,9 +41,8 @@
  ******************************************/
 
 #include "conky.h"
+#include "text_object.h"
 #define CPU_THRESHHOLD 0       /* threshhold for the cpu diff to appear */
-#include <stdlib.h>
-#include <stdio.h>
 #include <time.h>
 #include <dirent.h>
 #include <string.h>
@@ -53,9 +57,9 @@
 
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <sys/time.h>
 
 #include <regex.h>
@@ -70,13 +74,57 @@
 
 #define PROCFS_TEMPLATE "/proc/%d/stat"
 #define PROCFS_TEMPLATE_MEM "/proc/%d/statm"
+#define PROCFS_TEMPLATE_IO "/proc/%d/io"
 #define PROCFS_CMDLINE_TEMPLATE "/proc/%d/cmdline"
 #define MAX_SP 10      // number of elements to sort
 
+enum top_field {
+       TOP_CPU,
+       TOP_NAME,
+       TOP_PID,
+       TOP_MEM,
+       TOP_TIME,
+       TOP_MEM_RES,
+       TOP_MEM_VSIZE,
+#ifdef IOSTATS
+       TOP_READ_BYTES,
+       TOP_WRITE_BYTES,
+       TOP_IO_PERC
+#endif
+};
+
 /******************************************
  * Process class                                                 *
  ******************************************/
 
+struct process {
+       struct process *next;
+       struct process *previous;
+
+       pid_t pid;
+       char *name;
+       float amount;
+       // User and kernel times are in hundredths of seconds
+       unsigned long user_time;
+       unsigned long total;
+       unsigned long kernel_time;
+       unsigned long previous_user_time;
+       unsigned long previous_kernel_time;
+       unsigned long total_cpu_time;
+       unsigned int vsize;
+       unsigned int rss;
+#ifdef IOSTATS
+       unsigned long long read_bytes;
+       unsigned long long previous_read_bytes;
+       unsigned long long write_bytes;
+       unsigned long long previous_write_bytes;
+       float io_perc;
+#endif
+       unsigned int time_stamp;
+       unsigned int counted;
+       unsigned int changed;
+};
+
 struct sorted_process {
        struct sorted_process *greater;
        struct sorted_process *less;
@@ -84,4 +132,21 @@ struct sorted_process {
 };
 
 /* Pointer to head of process list */
-void process_find_top(struct process **, struct process **);
+void process_find_top(struct process **, struct process **, struct process **
+#ifdef IOSTATS
+               , struct process **
+#endif
+               );
+
+/* lookup a program by it's name */
+struct process *get_process_by_name(const char *);
+
+int parse_top_args(const char *s, const char *arg, struct text_object *obj);
+void print_top(struct text_object *, char *, int);
+void free_top(struct text_object *, int);
+
+/* return zero on success, non-zero otherwise */
+int set_top_name_width(const char *);
+
+
+#endif /* _top_h_ */