fix mistake in last commit
[lttv.git] / ltt / branches / poly / lttv / modules / text / textDump.c
index 2cd60264aa15d1c9263a018433dbee713507a875..4fcd5b5c49abd779a51c962b19cddf55c705541a 100644 (file)
 #include <lttv/print.h>
 #include <ltt/ltt.h>
 #include <ltt/event.h>
-#include <ltt/type.h>
 #include <ltt/trace.h>
-#include <ltt/facility.h>
 #include <stdio.h>
 
 static gboolean
-  a_field_names,
+  a_no_field_names,
   a_state,
   a_cpu_stats,
-  a_process_stats;
+  a_process_stats,
+  a_path_output;
 
 static char
   *a_file_name = NULL;
@@ -58,6 +57,74 @@ static LttvHooks
 
 
 static void 
+print_path_tree(FILE *fp, GString *indent, LttvAttribute *tree)
+{
+  int i, nb, saved_length;
+
+  LttvAttribute *subtree;
+
+  LttvAttributeName name;
+
+  LttvAttributeValue value;
+
+  LttvAttributeType type;
+
+  gboolean is_named;
+
+  saved_length = indent->len;
+  nb = lttv_attribute_get_number(tree);
+  for(i = 0 ; i < nb ; i++) {
+    type = lttv_attribute_get(tree, i, &name, &value, &is_named);
+    if(is_named) {
+      g_string_sprintfa(indent, "/%s", g_quark_to_string(name));
+    } else {
+      g_string_sprintfa(indent, "/%s", name);
+    }
+
+    switch(type) {
+      case LTTV_INT:
+       fprintf(fp, "%s: %d\n", indent->str, *value.v_int);
+        break;
+      case LTTV_UINT:
+       fprintf(fp, "%s: %d\n", indent->str, *value.v_int);
+        break;
+      case LTTV_LONG:
+       fprintf(fp, "%s: %ld\n", indent->str, *value.v_ulong);
+        break;
+      case LTTV_ULONG:
+       fprintf(fp, "%s: %lu\n", indent->str, *value.v_ulong);
+        break;
+      case LTTV_FLOAT:
+       fprintf(fp, "%s: %f\n", indent->str, (double) *value.v_float);
+        break;
+      case LTTV_DOUBLE:
+        fprintf(fp, "%s: %f\n", indent->str, *value.v_double);
+        break;
+      case LTTV_TIME:
+       fprintf(fp, "%s: %lu.%09lu\n", indent->str, value.v_time->tv_sec, value.v_time->tv_nsec);
+        break;
+      case LTTV_POINTER:
+       fprintf(fp, "%s: POINTER\n", indent->str);
+        break;
+      case LTTV_STRING:
+       fprintf(fp, "%s: %s\n", indent->str, *value.v_string);
+        break;
+      case LTTV_GOBJECT:
+        if(LTTV_IS_ATTRIBUTE(*(value.v_gobject))) {
+          subtree = (LttvAttribute*) *(value.v_gobject);
+          print_path_tree(fp, indent, subtree);
+        } else {
+         fprintf(fp, "%s: GOBJECT\n", indent->str);
+       }
+        break;
+      case LTTV_NONE:
+        break;
+    }
+    g_string_truncate(indent, saved_length);
+  }
+}
+
+static void
 print_tree(FILE *fp, GString *indent, LttvAttribute *tree)
 {
   int i, nb, saved_length;
@@ -126,7 +193,6 @@ print_tree(FILE *fp, GString *indent, LttvAttribute *tree)
   }
 }
 
-
 static void
 print_stats(FILE *fp, LttvTracesetStats *tscs)
 {
@@ -143,7 +209,11 @@ print_stats(FILE *fp, LttvTracesetStats *tscs)
   if(tscs->stats == NULL) return;
   indent = g_string_new("");
   fprintf(fp, "Traceset statistics:\n\n");
-  print_tree(fp, indent, tscs->stats);
+  if(a_path_output) {
+    print_path_tree(fp, indent, tscs->stats);
+  } else {
+    print_tree(fp, indent, tscs->stats);
+  }
 
   ts = tscs->parent.parent.ts;
   nb = lttv_traceset_number(ts);
@@ -159,14 +229,18 @@ print_stats(FILE *fp, LttvTracesetStats *tscs)
       start_time.tv_nsec);
 #endif //FIXME
     saved_length = indent->len;
-    indent = g_string_append(indent, "  ");
-    print_tree(fp, indent, tcs->stats);
+    if(a_path_output) {
+      g_string_sprintfa(indent, "/trace%i", i);
+      print_path_tree(fp, indent, tcs->stats);
+    } else {
+      g_string_append(indent, "  ");
+      print_tree(fp, indent, tcs->stats);
+    }
     g_string_truncate(indent, saved_length);
   }
   g_string_free(indent, TRUE);
 }
 
-
 /* Insert the hooks before and after each trace and tracefile, and for each
    event. Print a global header. */
 
@@ -202,7 +276,7 @@ static gboolean write_traceset_footer(void *hook_data, void *call_data)
   fprintf(a_file,"End trace set\n\n");
 
   if(LTTV_IS_TRACESET_STATS(tc)) {
-    lttv_stats_sum_traceset((LttvTracesetStats *)tc);
+    lttv_stats_sum_traceset((LttvTracesetStats *)tc, ltt_time_infinite);
     print_stats(a_file, (LttvTracesetStats *)tc);
   }
 
@@ -229,6 +303,8 @@ static gboolean write_trace_header(void *hook_data, void *call_data)
 
 static int write_event_content(void *hook_data, void *call_data)
 {
+  gboolean result;
+
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
   
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
@@ -247,8 +323,9 @@ static int write_event_content(void *hook_data, void *call_data)
 
   e = ltt_tracefile_get_event(tfc->tf);
 
-  g_assert(lttv_iattribute_find_by_path(attributes, "filter/lttv_filter",
-      LTTV_POINTER, &value_filter));
+  result = lttv_iattribute_find_by_path(attributes, "filter/lttv_filter",
+      LTTV_POINTER, &value_filter);
+  g_assert(result);
   filter = (LttvFilter*)*(value_filter.v_pointer);
 
   /*
@@ -256,17 +333,18 @@ static int write_event_content(void *hook_data, void *call_data)
    */
   if(filter->head != NULL)
     if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
-                               tfc->t_context->t,tfc))
+                               tfc->t_context->t,tfc,NULL,NULL))
       return FALSE;
   
-  lttv_event_to_string(e, a_string, TRUE, a_field_names, tfs);
-  g_string_append_printf(a_string,"\n");  
+  lttv_event_to_string(e, a_string, TRUE, !a_no_field_names, tfs);
 
   if(a_state) {
     g_string_append_printf(a_string, " %s ",
         g_quark_to_string(process->state->s));
   }
 
+  g_string_append_printf(a_string,"\n");
+
   fputs(a_string->str, a_file);
   return FALSE;
 }
@@ -274,6 +352,8 @@ static int write_event_content(void *hook_data, void *call_data)
 
 static void init()
 {
+  gboolean result;
+
   LttvAttributeValue value;
 
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
@@ -288,14 +368,14 @@ static void init()
       "file name", 
       LTTV_OPT_STRING, &a_file_name, NULL, NULL);
 
-  a_field_names = FALSE;
-  lttv_option_add("field_names", 'l', 
-      "write the field names for each event", 
+  a_no_field_names = FALSE;
+  lttv_option_add("field_names", 's', 
+      "do not write the field names for each event", 
       "", 
-      LTTV_OPT_NONE, &a_field_names, NULL, NULL);
+      LTTV_OPT_NONE, &a_no_field_names, NULL, NULL);
 
   a_state = FALSE;
-  lttv_option_add("process_state", 's', 
+  lttv_option_add("process_state", 'r', 
       "write the pid and state for each event", 
       "", 
       LTTV_OPT_NONE, &a_state, NULL, NULL);
@@ -312,25 +392,39 @@ static void init()
       "", 
       LTTV_OPT_NONE, &a_process_stats, NULL, NULL);
 
-  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event",
-      LTTV_POINTER, &value));
-  g_assert((event_hook = *(value.v_pointer)) != NULL);
+  a_path_output = FALSE;
+  lttv_option_add("path_output", 'a',
+      "print the process stats in path format, for easy grepping",
+      "",
+      LTTV_OPT_NONE, &a_path_output, NULL, NULL);
+
+  result = lttv_iattribute_find_by_path(attributes, "hooks/event",
+      LTTV_POINTER, &value);
+  g_assert(result);
+  event_hook = *(value.v_pointer);
+  g_assert(event_hook);
   lttv_hooks_add(event_hook, write_event_content, NULL, LTTV_PRIO_DEFAULT);
 
-  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before",
-      LTTV_POINTER, &value));
-  g_assert((before_trace = *(value.v_pointer)) != NULL);
+  result = lttv_iattribute_find_by_path(attributes, "hooks/trace/before",
+      LTTV_POINTER, &value);
+  g_assert(result);
+  before_trace = *(value.v_pointer);
+  g_assert(before_trace);
   lttv_hooks_add(before_trace, write_trace_header, NULL, LTTV_PRIO_DEFAULT);
 
-  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before",
-      LTTV_POINTER, &value));
-  g_assert((before_traceset = *(value.v_pointer)) != NULL);
+  result = lttv_iattribute_find_by_path(attributes, "hooks/traceset/before",
+      LTTV_POINTER, &value);
+  g_assert(result);
+  before_traceset = *(value.v_pointer);
+  g_assert(before_traceset);
   lttv_hooks_add(before_traceset, write_traceset_header, NULL,
       LTTV_PRIO_DEFAULT);
 
-  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after",
-      LTTV_POINTER, &value));
-  g_assert((after_traceset = *(value.v_pointer)) != NULL);
+  result = lttv_iattribute_find_by_path(attributes, "hooks/traceset/after",
+      LTTV_POINTER, &value);
+  g_assert(result);
+  after_traceset = *(value.v_pointer);
+  g_assert(after_traceset);
   lttv_hooks_add(after_traceset, write_traceset_footer, NULL,
       LTTV_PRIO_DEFAULT);
 }
@@ -349,15 +443,17 @@ static void destroy()
 
   lttv_option_remove("process_stats");
 
+  lttv_option_remove("path_output");
+
   g_string_free(a_string, TRUE);
 
   lttv_hooks_remove_data(event_hook, write_event_content, NULL);
 
   lttv_hooks_remove_data(before_trace, write_trace_header, NULL);
 
-  lttv_hooks_remove_data(before_trace, write_traceset_header, NULL);
+  lttv_hooks_remove_data(before_traceset, write_traceset_header, NULL);
 
-  lttv_hooks_remove_data(before_trace, write_traceset_footer, NULL);
+  lttv_hooks_remove_data(after_traceset, write_traceset_footer, NULL);
 }
 
 
This page took 0.026254 seconds and 4 git commands to generate.