X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=fd941bde92673530019ffe921d03ec1054686617;hp=5cc9bca14aff3342fa33baefb88f26599acaafb0;hb=1402044a1577c9b62b60f64fdb48ae9524be458c;hpb=094632060f50c0a268794c70e0650167c5c51fb8 diff --git a/src/common.c b/src/common.c index 5cc9bca..fd941bd 100644 --- a/src/common.c +++ b/src/common.c @@ -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); @@ -84,9 +84,54 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event) return ppid; } -char *get_context_comm(const struct bt_ctf_event *event) +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; char *comm; scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT); @@ -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); @@ -464,13 +520,13 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end) enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, void *private_data) { - const struct definition *scope; + const struct bt_definition *scope; struct processtop *proc; unsigned long timestamp; int64_t pid, tid; char *procname; - timestamp = bt_ctf_get_real_timestamp(call_data); + timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; @@ -529,3 +585,20 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, error: return BT_CB_ERROR_STOP; } + +struct tm format_timestamp(uint64_t timestamp) +{ + struct tm tm; + uint64_t ts_sec = 0, ts_nsec; + time_t time_s; + + ts_nsec = timestamp; + ts_sec += ts_nsec / NSEC_PER_SEC; + ts_nsec = ts_nsec % NSEC_PER_SEC; + + time_s = (time_t) ts_sec; + + localtime_r(&time_s, &tm); + + return tm; +}