From 7cd289b092dd46a6480e1cc770738df82bce924c Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 9 Mar 2006 19:59:14 +0000
Subject: [PATCH] 0.8.28

git-svn-id: http://ltt.polymtl.ca/svn@1631 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt/branches/poly/ChangeLog                    |  4 ++++
 ltt/branches/poly/configure.in                 |  2 +-
 ltt/branches/poly/facilities/Makefile.am       |  6 ++++--
 .../poly/facilities/kernel_arch_i386.xml       |  2 ++
 ltt/branches/poly/facilities/statedump.xml     | 14 ++++++++++++++
 ltt/branches/poly/lttv/lttv/state.c            | 18 ++++++++++++++++--
 ltt/branches/poly/lttv/lttv/state.h            |  1 +
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/ltt/branches/poly/ChangeLog b/ltt/branches/poly/ChangeLog
index 0175fcaf..d045b1b1 100644
--- a/ltt/branches/poly/ChangeLog
+++ b/ltt/branches/poly/ChangeLog
@@ -1,5 +1,9 @@
 LinuxTraceToolkit ChangeLog
 
+09/03/2006	LTTV 0.8.28
+						Add usertrace support.
+						Bugfix : handle badly number syscall xml correctly.
+						Add network_ip_interface XML.
 05/03/2006	LTTV 0.8.26
 						Add mouse scroll support.
 						Add user_generic.xml facility.
diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 73f88761..a3aa1a89 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.27-05032006)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.28-09032006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
diff --git a/ltt/branches/poly/facilities/Makefile.am b/ltt/branches/poly/facilities/Makefile.am
index c5e6f0db..6e87ebdc 100644
--- a/ltt/branches/poly/facilities/Makefile.am
+++ b/ltt/branches/poly/facilities/Makefile.am
@@ -15,7 +15,8 @@ process.xml \
 socket.xml \
 statedump.xml \
 timer.xml \
-user_generic.xml
+user_generic.xml \
+network_ip_interface.xml
 
 facilities_DATA = \
 core.xml \
@@ -33,7 +34,8 @@ process.xml \
 socket.xml \
 statedump.xml \
 timer.xml \
-user_generic.xml
+user_generic.xml \
+network_ip_interface.xml
 
 
 facilitiesdir = $(pkgdatadir)/facilities
diff --git a/ltt/branches/poly/facilities/kernel_arch_i386.xml b/ltt/branches/poly/facilities/kernel_arch_i386.xml
index 3498181b..92639bc4 100644
--- a/ltt/branches/poly/facilities/kernel_arch_i386.xml
+++ b/ltt/branches/poly/facilities/kernel_arch_i386.xml
@@ -294,6 +294,8 @@
 			<label name=inotify_init value=291/>
 			<label name=inotify_add_watch value=292/>
 			<label name=inotify_rm_watch value=293/>
+			<label name=ltt_trace_generic value=294/>
+			<label name=ltt_register_generic value=295/>
     </enum>
   </type>
 
diff --git a/ltt/branches/poly/facilities/statedump.xml b/ltt/branches/poly/facilities/statedump.xml
index 7f757d93..a15f3d8b 100644
--- a/ltt/branches/poly/facilities/statedump.xml
+++ b/ltt/branches/poly/facilities/statedump.xml
@@ -32,6 +32,13 @@
     </enum>
   </type>
 
+	<type name=interface_state>
+		<enum>
+      <label name=UP value=0/> <description></description>
+      <label name=DOWN value=1/> <description></description>
+		</enum>
+	</type>
+
   <event name=enumerate_file_descriptors>
     <description>List of open file descriptors</description>
       <field name="name"><description>File name</description><string/></field>
@@ -73,6 +80,13 @@
       <field name="status"> <description>Process status</description> <typeref name=process_status/> </field>
   </event>
 
+  <event name=enumerate_network_ip_interface>
+    <description>List of each IP interface up</description>
+      <field name="name"> <description>Interface name</description><string/></field>
+      <field name="addr"> <description>IP address</description> <uint size=4 network/> </field>
+			<field name="status"> <description>Status of the interface</description> <typeref name=interface_state/> </field>
+  </event>  
+  
   <event name=statedump_end>
     <description>Kernel state dump complete</description>
   </event>
diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index efbd2ed6..a9d371a5 100644
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -799,6 +799,7 @@ free_max_time(LttvTraceState *tcs)
 typedef struct _LttvNameTables {
  // FIXME  GQuark *eventtype_names;
   GQuark *syscall_names;
+	guint nb_syscalls;
   GQuark *trap_names;
   GQuark *irq_names;
   GQuark *soft_irq_names;
@@ -856,6 +857,7 @@ create_name_tables(LttvTraceState *tcs)
   lttv_trace_hook_destroy(&h);
 
   name_tables->syscall_names = g_new(GQuark, nb);
+  name_tables->nb_syscalls = nb;
 
   for(i = 0 ; i < nb ; i++) {
     name_tables->syscall_names[i] = ltt_enum_string_get(t, i);
@@ -951,6 +953,7 @@ get_name_tables(LttvTraceState *tcs)
   name_tables = (LttvNameTables *)*(v.v_pointer);
   //tcs->eventtype_names = name_tables->eventtype_names;
   tcs->syscall_names = name_tables->syscall_names;
+  tcs->nb_syscalls = name_tables->nb_syscalls;
   tcs->trap_names = name_tables->trap_names;
   tcs->irq_names = name_tables->irq_names;
   tcs->soft_irq_names = name_tables->soft_irq_names;
@@ -1254,8 +1257,19 @@ static gboolean syscall_entry(void *hook_data, void *call_data)
 
   LttvExecutionSubmode submode;
 
-  submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[
-      ltt_event_get_unsigned(e, f)];
+	guint nb_syscalls = ((LttvTraceState *)(s->parent.t_context))->nb_syscalls;
+	guint syscall = ltt_event_get_unsigned(e, f);
+	
+	if(syscall < nb_syscalls) {
+	  submode = ((LttvTraceState *)(s->parent.t_context))->syscall_names[
+  	    syscall];
+	} else {
+		/* Fixup an incomplete syscall table */
+		GString *string = g_string_new("");
+    g_string_printf(string, "syscall %u", syscall);
+		submode = g_quark_from_string(string->str);
+		g_string_free(string, TRUE);
+	}
   push_state(s, LTTV_STATE_SYSCALL, submode);
   return FALSE;
 }
diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h
index dbd197ea..f374db20 100644
--- a/ltt/branches/poly/lttv/lttv/state.h
+++ b/ltt/branches/poly/lttv/lttv/state.h
@@ -265,6 +265,7 @@ struct _LttvTraceState {
   /* Block/char devices, locks, memory pages... */
   GQuark *eventtype_names;
   GQuark *syscall_names;
+	guint  nb_syscalls;
   GQuark *trap_names;
   GQuark *irq_names;
   GQuark *soft_irq_names;
-- 
2.34.1