Basic support to display vPID and vTID

[lttngtop.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index bff5b00715685b312c7ad3745811776b7a473e3d..fd941bde92673530019ffe921d03ec1054686617 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -84,6 +84,51 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
        return ppid;
 }
 
+uint64_t get_context_vtid(const struct bt_ctf_event *event)
+{
+       const struct definition *scope;
+       uint64_t vtid;
+
+       scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+       vtid = bt_ctf_get_int64(bt_ctf_get_field(event,
+                               scope, "_vtid"));
+       if (bt_ctf_field_get_error()) {
+               return -1ULL;
+       }
+
+       return vtid;
+}
+
+uint64_t get_context_vpid(const struct bt_ctf_event *event)
+{
+       const struct definition *scope;
+       uint64_t vpid;
+
+       scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+       vpid = bt_ctf_get_int64(bt_ctf_get_field(event,
+                               scope, "_vpid"));
+       if (bt_ctf_field_get_error()) {
+               return -1ULL;
+       }
+
+       return vpid;
+}
+
+uint64_t get_context_vppid(const struct bt_ctf_event *event)
+{
+       const struct definition *scope;
+       uint64_t vppid;
+
+       scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+       vppid = bt_ctf_get_int64(bt_ctf_get_field(event,
+                               scope, "_vppid"));
+       if (bt_ctf_field_get_error()) {
+               return -1ULL;
+       }
+
+       return vppid;
+}
+
 char *get_context_comm(const struct bt_ctf_event *event)
 {
        const struct bt_definition *scope;
@@ -103,20 +148,15 @@ char *get_context_comm(const struct bt_ctf_event *event)
 /*
  * 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;
        struct processtop *tmp;
 
-       for (i = 0; i < ctx->process_table->len; i++) {
-               tmp = g_ptr_array_index(ctx->process_table, i);
-               if (tmp && tmp->tid == tid)
-                       return tmp;
-       }
-       return NULL;
+       tmp = g_hash_table_lookup(ctx->process_hash_table,
+                       (gconstpointer) (unsigned long) tid);
+
+       return tmp;
 }
 
 struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
@@ -142,6 +182,8 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
                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);
+               g_hash_table_insert(ctx->process_hash_table,
+                               (gpointer) (unsigned long) tid, newproc);
 
                ctx->nbnewthreads++;
                ctx->nbthreads++;
@@ -152,12 +194,15 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 }
 
 struct processtop* update_proc(struct processtop* proc, int pid, int tid,
-               int ppid, char *comm)
+               int ppid, int vpid, int vtid, int vppid, char *comm)
 {
        if (proc) {
                proc->pid = pid;
                proc->tid = tid;
                proc->ppid = ppid;
+               proc->vpid = vpid;
+               proc->vtid = vtid;
+               proc->vppid = vppid;
                if (strcmp(proc->comm, comm) != 0) {
                        free(proc->comm);
                        proc->comm = strdup(comm);
@@ -175,6 +220,9 @@ void death_proc(struct lttngtop *ctx, int tid, char *comm,
 {
        struct processtop *tmp;
        tmp = find_process_tid(ctx, tid, comm);
+
+       g_hash_table_remove(ctx->process_hash_table,
+                       (gpointer) (unsigned long) tid);
        if (tmp && strcmp(tmp->comm, comm) == 0) {
                tmp->death = timestamp;
                ctx->nbdeadthreads++;
@@ -283,6 +331,11 @@ void copy_perf_counter(gpointer key, gpointer value, gpointer new_table)
        g_hash_table_insert((GHashTable *) new_table, strdup(key), newperf);
 }
 
+void copy_process_table(gpointer key, gpointer value, gpointer new_table)
+{
+       g_hash_table_insert((GHashTable *) new_table, key, value);
+}
+
 void rotate_perfcounter() {
        int i;
        struct processtop *tmp;
@@ -360,6 +413,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->process_hash_table = g_hash_table_new(g_direct_hash, g_direct_equal);
+       g_hash_table_foreach(lttngtop.process_hash_table, copy_process_table,
+                       dst->process_hash_table);
 
        rotate_cputime(end);