X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtoptypes.h;h=15b861446cfd44e1cf22ba6015911ea1257984c9;hp=7e105f91a79dfca38692863413e141aeeff63f54;hb=1d74c4d1c6aaa6bcad2f2d4b02e720c0a318584d;hpb=b093de8aa1ac7555d20b3aa4227d4675b39ef008

diff --git a/src/lttngtoptypes.h b/src/lttngtoptypes.h
index 7e105f9..15b8614 100644
--- 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
@@ -22,10 +21,11 @@
 #include <glib.h>
 
 struct lttngtop {
+	GHashTable *process_hash_table;	/* struct processtop */
 	GPtrArray *process_table;	/* struct processtop */
 	GPtrArray *files_table;		/* struct files */
 	GPtrArray *cpu_table;		/* struct cputime */
-	GHashTable *perf_list;		/* struct perfcounter */
+	GPtrArray *kprobes_table;	/* struct kprobes */
 	unsigned long start;
 	unsigned long end;
 	unsigned int nbproc;
@@ -43,14 +43,14 @@ struct processtop {
 	unsigned int puuid;
 	int pid;
 	char *comm;
+	struct host *host;
 	int tid;
 	int ppid;
-	int oldpid;
-	int oldtid;
-	int oldppid;
+	int vpid;
+	int vtid;
+	int vppid;
 	unsigned long birth;
 	unsigned long death;
-	unsigned long lastactivity;
 	/* Files managing */
 	GPtrArray *process_files_table;
 	struct file_history *files_history;
@@ -79,6 +79,7 @@ struct cputime {
 	struct processtop *current_task;
 	unsigned long task_start;
 	GHashTable *perf;
+	struct syscall *current_syscall;
 };
 
 /*
@@ -104,6 +105,7 @@ struct files {
 	int oldfd;
 	int device;
 	int openmode;
+	int flag;
 	unsigned long openedat;
 	unsigned long closedat;
 	unsigned long lastaccess;
@@ -151,10 +153,15 @@ struct vmas {
 	unsigned long page_faults;
 };
 
+struct syscall {
+	char *name;
+	unsigned long ts_start;
+};
+
 struct syscalls {
 	unsigned int id;
 	unsigned long count;
-	unsigned int cpu_id;
+	uint64_t cpu_id;
 	unsigned int type;
 	unsigned int tid;
 	unsigned int fd;
@@ -173,4 +180,25 @@ struct file_info {
 	int status;
 };
 
+/* header for cputop display */
+struct header_view {
+	char *title;
+	int visible;
+	int sort;
+	int reverse;
+};
+
+struct kprobes {
+	char *probe_name;
+	char *symbol_name;
+	int probe_addr;
+	int probe_offset;
+	int count;
+};
+
+struct host {
+	char *hostname;
+	int filter;
+};
+
 #endif /* LTTNGTOPTYPES_H */