fix compat with babeltrace API change at commit 03798a93f959f6c694fe98f5647481947607c604

[lttngtop.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index 5887933bf69e87e6302496c97ca695a4a5c2ba6b..5cc9bca14aff3342fa33baefb88f26599acaafb0 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -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
@@ -100,6 +100,12 @@ char *get_context_comm(const struct bt_ctf_event *event)
        return comm;
 }
 
+/*
+ * To get the parent process, put the pid in the tid field
+ * because the parent process gets pid = tid
+ *
+ * FIXME : char *comm useful ???
+ */
 struct processtop *find_process_tid(struct lttngtop *ctx, int tid, char *comm)
 {
        gint i;
@@ -132,6 +138,7 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
                newproc->fileread = 0;
                newproc->filewrite = 0;
                newproc->syscall_info = NULL;
+               newproc->threadparent = NULL;
                newproc->threads = g_ptr_array_new();
                newproc->perf = g_hash_table_new(g_str_hash, g_str_equal);
                g_ptr_array_add(ctx->process_table, newproc);
@@ -185,6 +192,16 @@ struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
        return add_proc(ctx, tid, comm, timestamp);
 }
 
+struct processtop *get_proc_pid(struct lttngtop *ctx, int tid, int pid,
+               unsigned long timestamp)
+{
+       struct processtop *tmp;
+       tmp = find_process_tid(ctx, tid, NULL);
+       if (tmp && tmp->pid == pid)
+               return tmp;
+       return add_proc(ctx, tid, "Unknown", timestamp);
+}
+
 void add_thread(struct processtop *parent, struct processtop *thread)
 {
        gint i;
@@ -258,7 +275,7 @@ void reset_perf_counter(gpointer key, gpointer value, gpointer user_data)
 void copy_perf_counter(gpointer key, gpointer value, gpointer new_table)
 {
        struct perfcounter *newperf;
-       
+
        newperf = g_new0(struct perfcounter, 1);
        newperf->count = ((struct perfcounter *) value)->count;
        newperf->visible = ((struct perfcounter *) value)->visible;
@@ -343,11 +360,9 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
        dst->process_table = g_ptr_array_new();
        dst->files_table = g_ptr_array_new();
        dst->cpu_table = g_ptr_array_new();
-       dst->perf_list = g_hash_table_new(g_str_hash, g_str_equal);
 
        rotate_cputime(end);
 
-       g_hash_table_foreach(lttngtop.perf_list, copy_perf_counter, dst->perf_list);
        for (i = 0; i < lttngtop.process_table->len; i++) {
                tmp = g_ptr_array_index(lttngtop.process_table, i);
                new = g_new0(struct processtop, 1);
@@ -445,3 +460,72 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
        return dst;
 }
 
+
+enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
+               void *private_data)
+{
+       const struct definition *scope;
+       struct processtop *proc;
+       unsigned long timestamp;
+       int64_t pid, tid;
+       char *procname;
+
+       timestamp = bt_ctf_get_real_timestamp(call_data);
+       if (timestamp == -1ULL)
+               goto error;
+
+       scope = bt_ctf_get_top_level_scope(call_data,
+                        BT_EVENT_FIELDS);
+       pid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+                            scope, "_pid"));
+       if (bt_ctf_field_get_error()) {
+               fprintf(stderr, "Missing pid context info\n");
+               goto error;
+       }
+
+       scope = bt_ctf_get_top_level_scope(call_data,
+                       BT_EVENT_FIELDS);
+       tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+                               scope, "_tid"));
+       if (bt_ctf_field_get_error()) {
+               fprintf(stderr, "Missing tid context info\n");
+               goto error;
+       }
+
+       /*
+        * FIXME
+        * I first tried with bt_ctf_get_string but doesn`t work at all
+        * It couldn`t find the field _name because it is an integer in
+        * the metadata and not a string like _filename for the
+        * statedump_file_descriptor
+        */
+       scope = bt_ctf_get_top_level_scope(call_data,
+                       BT_EVENT_FIELDS);
+       procname = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
+                               scope, "_name"));
+       if (bt_ctf_field_get_error()) {
+               fprintf(stderr, "Missing process name context info\n");
+               goto error;
+       }
+
+       proc = find_process_tid(&lttngtop, tid, procname);
+       if (proc == NULL)
+               proc = add_proc(&lttngtop, tid, procname, timestamp);
+
+       free(proc->comm);
+       proc->comm = strdup(procname);
+       proc->pid = pid;
+
+       /*
+        * FIXME
+        * I would like to free procname because it is duplicated
+        * when the process is created but it segfaults...
+        *
+        * free(procname);
+        */
+
+       return BT_CB_OK;
+
+error:
+       return BT_CB_ERROR_STOP;
+}