Update copyright years

[lttngtop.git] / src / lttngtoptypes.h

diff --git a/src/lttngtoptypes.h b/src/lttngtoptypes.h
index 7030b32f81ae253f871c13638a3f7f07ae399968..c69ea0192c56657b1eb99ab850f7324fec5c1dd8 100644 (file)
--- a/src/lttngtoptypes.h
+++ b/src/lttngtoptypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 Julien Desfossez
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -10,10 +10,9 @@
  * 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., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef LTTNGTOPTYPES_H
@@ -25,7 +24,6 @@ struct lttngtop {
        GPtrArray *process_table;       /* struct processtop */
        GPtrArray *files_table;         /* struct files */
        GPtrArray *cpu_table;           /* struct cputime */
-       GHashTable *perf_list;          /* struct perfcounter */
        unsigned long start;
        unsigned long end;
        unsigned int nbproc;
@@ -51,16 +49,20 @@ struct processtop {
        unsigned long birth;
        unsigned long death;
        unsigned long lastactivity;
+       /* Files managing */
        GPtrArray *process_files_table;
+       struct file_history *files_history;
        GPtrArray *threads;
        GHashTable *perf;
        struct processtop *threadparent;
+       /* IO calculting */
        unsigned long totalfileread;
        unsigned long totalfilewrite;
+       unsigned long fileread;
+       unsigned long filewrite;
+       struct syscalls *syscall_info;
        unsigned long totalcpunsec;
        unsigned long threadstotalcpunsec;
-       /* IO speed for this process */
-       struct iostream *iostream;
 };
 
 struct perfcounter
@@ -100,6 +102,7 @@ struct files {
        int oldfd;
        int device;
        int openmode;
+       int flag;
        unsigned long openedat;
        unsigned long closedat;
        unsigned long lastaccess;
@@ -114,6 +117,11 @@ struct files {
        /* XXX : average wait time */
 };
 
+struct file_history {
+       struct files *file;
+       struct file_history *next;
+};
+
 struct sockets {
        int fd;
        int parent_fd;  /* on accept a new fd is created from the bound socket */
@@ -145,9 +153,10 @@ struct vmas {
 struct syscalls {
        unsigned int id;
        unsigned long count;
-        unsigned int cpu_id;
-        unsigned int type;
-        unsigned int tid;
+       uint64_t cpu_id;
+       unsigned int type;
+       unsigned int tid;
+       unsigned int fd;
 };
 
 struct signals {
@@ -156,11 +165,19 @@ struct signals {
        unsigned long count;
 };
 
-struct iostream {
-       struct syscalls *syscall_info; /* NULL if there is no waiting for an exit_syscall */
-       unsigned long ret_read;        /* value returned by an I/O syscall_exit for a sys_read*/
-       unsigned long ret_write;       /* value returned by an I/O syscall_exit for a sys_write*/
-       unsigned long ret_total;
+struct file_info {
+       struct file_info *next;
+       char *name;
+       int fd;
+       int status;
+};
+
+/* header for cputop display */
+struct header_view {
+       char *title;
+       int visible;
+       int sort;
+       int reverse;
 };
 
 #endif /* LTTNGTOPTYPES_H */