X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon.c;h=cde69a0b0a0eab09521aeb30f1d74e3513093864;hb=2479719885485a6b991b47898d0c77a63f6b9513;hp=2c9c1fef1fa172dd075ac97b9349929d654b2492;hpb=b7194a4ebee2f959e0d2c02f78c3fbb81711ffd6;p=lttngtop.git diff --git a/src/common.c b/src/common.c index 2c9c1fe..cde69a0 100644 --- a/src/common.c +++ b/src/common.c @@ -164,9 +164,13 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm, { struct processtop *newproc; + if (opt_pid && tid != opt_pid) + return NULL; + /* if the PID already exists, we just rename the process */ /* FIXME : need to integrate with clone/fork/exit to be accurate */ newproc = find_process_tid(ctx, tid, comm); + if (!newproc) { newproc = g_new0(struct processtop, 1); newproc->tid = tid; @@ -255,6 +259,9 @@ void add_thread(struct processtop *parent, struct processtop *thread) gint i; struct processtop *tmp; + if (!parent) + return; + for (i = 0; i < parent->threads->len; i++) { tmp = g_ptr_array_index(parent->threads, i); if (tmp == thread) @@ -569,13 +576,6 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, 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, @@ -590,17 +590,11 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, proc = add_proc(<tngtop, tid, procname, timestamp); update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname); - 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); - */ + if (proc) { + free(proc->comm); + proc->comm = strdup(procname); + proc->pid = pid; + } return BT_CB_OK;