X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=e3e814be972b26d5f7e099644e52ec667a7f7852;hp=02d72bb6e023b252da6be57af4330d138baa9a3b;hb=ea5d1dc99544231b4e2085ad706fcc1fa6260faa;hpb=906c08f6245d165f7ccc3d0336714b425169d406 diff --git a/src/common.c b/src/common.c index 02d72bb..e3e814b 100644 --- a/src/common.c +++ b/src/common.c @@ -234,6 +234,12 @@ struct processtop* update_proc(struct processtop* proc, int pid, int tid, free(proc->comm); proc->comm = strdup(comm); } + if (hostname && !proc->hostname) { + proc->hostname = strdup(hostname); + if (lookup_hostname_list(hostname)) { + add_filter_tid_list(tid, proc); + } + } } return proc; } @@ -261,9 +267,11 @@ struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm, unsigned long timestamp, char *hostname) { struct processtop *tmp; + tmp = find_process_tid(ctx, tid, comm); - if (tmp && strcmp(tmp->comm, comm) == 0) + if (tmp && strcmp(tmp->comm, comm) == 0) { return tmp; + } return add_proc(ctx, tid, comm, timestamp, hostname); } @@ -565,7 +573,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, struct processtop *proc; unsigned long timestamp; int64_t pid, tid, ppid, vtid, vpid, vppid; - char *procname; + char *procname, *hostname = NULL; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) @@ -618,12 +626,17 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, fprintf(stderr, "Missing process name context info\n"); goto error; } + /* + hostname = bt_ctf_get_char_array(bt_ctf_get_field(call_data, + scope, "_hostname")); + if (bt_ctf_field_get_error()) { + } + */ proc = find_process_tid(<tngtop, tid, procname); - /* FIXME : hostname NULL */ if (proc == NULL) - proc = add_proc(<tngtop, tid, procname, timestamp, NULL); - update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, NULL); + proc = add_proc(<tngtop, tid, procname, timestamp, hostname); + update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, hostname); if (proc) { free(proc->comm); @@ -656,26 +669,26 @@ struct tm format_timestamp(uint64_t timestamp) int *lookup_tid_list(int tid) { - if (!tid_list) + if (!tid_filter_list) return NULL; - return g_hash_table_lookup(tid_list, (gpointer) &tid); + return g_hash_table_lookup(tid_filter_list, (gpointer) &tid); } char *lookup_hostname_list(const char *hostname) { - if (!hostname || !hostname_list) + if (!hostname || !hostname_filter_list) return NULL; - return g_hash_table_lookup(hostname_list, (gpointer) hostname); + return g_hash_table_lookup(hostname_filter_list, (gpointer) hostname); } void remove_hostname_list(const char *hostname) { - if (!hostname || !hostname_list) + if (!hostname || !hostname_filter_list) return; - g_hash_table_remove(hostname_list, (gpointer) hostname); + g_hash_table_remove(hostname_filter_list, (gpointer) hostname); } int *lookup_filter_tid_list(int tid)