API sync babeltrace

[lttngtop.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index 5887933bf69e87e6302496c97ca695a4a5c2ba6b..d4f89f3e8970e69e5ef60cf81beebb540727f6fe 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "common.h"
 
-uint64_t get_cpu_id(const struct bt_ctf_event *event)
+uint64_t get_cpu_id(const struct ctf_event_definition *event)
 {
        const struct definition *scope;
        uint64_t cpu_id;
@@ -36,7 +36,7 @@ uint64_t get_cpu_id(const struct bt_ctf_event *event)
        return cpu_id;
 }
 
-uint64_t get_context_tid(const struct bt_ctf_event *event)
+uint64_t get_context_tid(const struct ctf_event_definition *event)
 {
        const struct definition *scope;
        uint64_t tid;
@@ -52,7 +52,7 @@ uint64_t get_context_tid(const struct bt_ctf_event *event)
        return tid;
 }
 
-uint64_t get_context_pid(const struct bt_ctf_event *event)
+uint64_t get_context_pid(const struct ctf_event_definition *event)
 {
        const struct definition *scope;
        uint64_t pid;
@@ -68,7 +68,7 @@ uint64_t get_context_pid(const struct bt_ctf_event *event)
        return pid;
 }
 
-uint64_t get_context_ppid(const struct bt_ctf_event *event)
+uint64_t get_context_ppid(const struct ctf_event_definition *event)
 {
        const struct definition *scope;
        uint64_t ppid;
@@ -84,7 +84,7 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
        return ppid;
 }
 
-char *get_context_comm(const struct bt_ctf_event *event)
+char *get_context_comm(const struct ctf_event_definition *event)
 {
        const struct definition *scope;
        char *comm;
@@ -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;