X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=f741a29b536d20a74e9d96a38ef0136b3c5782c8;hp=c01aee273aae54f3113a6a44ee6a1894bb9c311d;hb=2e0a1190d76a53891ca22cfd6082d9b45581d83e;hpb=e05a35a69ff03f10bba459a07dc26684049f1bc9 diff --git a/src/common.c b/src/common.c index c01aee2..f741a29 100644 --- 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 @@ -23,7 +23,7 @@ uint64_t get_cpu_id(const struct bt_ctf_event *event) { - const struct definition *scope; + const struct bt_definition *scope; uint64_t cpu_id; scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT); @@ -38,7 +38,7 @@ uint64_t get_cpu_id(const struct bt_ctf_event *event) uint64_t get_context_tid(const struct bt_ctf_event *event) { - const struct definition *scope; + const struct bt_definition *scope; uint64_t tid; scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT); @@ -54,7 +54,7 @@ uint64_t get_context_tid(const struct bt_ctf_event *event) uint64_t get_context_pid(const struct bt_ctf_event *event) { - const struct definition *scope; + const struct bt_definition *scope; uint64_t pid; scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT); @@ -70,7 +70,7 @@ uint64_t get_context_pid(const struct bt_ctf_event *event) uint64_t get_context_ppid(const struct bt_ctf_event *event) { - const struct definition *scope; + const struct bt_definition *scope; uint64_t ppid; scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT); @@ -86,7 +86,7 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event) char *get_context_comm(const struct bt_ctf_event *event) { - const struct definition *scope; + const struct bt_definition *scope; char *comm; scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT); @@ -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); @@ -400,7 +415,6 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end) * the current process list after the copy */ if (tmp->death > 0 && tmp->death < end) { - fprintf(stderr, "removing : %ld : %d %s\n", end, tmp->tid, tmp->comm); g_ptr_array_remove(lttngtop.process_table, tmp); /* FIXME : TRUE does not mean clears the object in it */ g_ptr_array_free(tmp->threads, TRUE); @@ -446,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 bt_definition *scope; + struct processtop *proc; + unsigned long timestamp; + int64_t pid, tid; + char *procname; + + timestamp = bt_ctf_get_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(<tngtop, tid, procname); + if (proc == NULL) + proc = add_proc(<tngtop, 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; +}