}
struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
- unsigned long timestamp)
+ unsigned long timestamp, char *hostname)
{
struct processtop *newproc;
g_ptr_array_add(ctx->process_table, newproc);
g_hash_table_insert(ctx->process_hash_table,
(gpointer) (unsigned long) tid, newproc);
-
+ if (lookup_tid_list(tid)) {
+ add_filter_tid_list(tid, newproc);
+ }
ctx->nbnewthreads++;
ctx->nbthreads++;
}
newproc->comm = strdup(comm);
+ if (hostname) {
+ if (newproc->hostname && strcmp(newproc->hostname, hostname) != 0) {
+ free(newproc->hostname);
+ }
+ newproc->hostname = strdup(hostname);
+ if (is_hostname_filtered(hostname)) {
+ add_filter_tid_list(tid, newproc);
+ }
+ }
return newproc;
}
free(proc->comm);
proc->comm = strdup(comm);
}
- if (hostname) {
- if (proc->hostname && strcmp(proc->hostname, hostname) != 0) {
- free(proc->hostname);
- }
+ if (hostname && !proc->hostname) {
proc->hostname = strdup(hostname);
+ if (is_hostname_filtered(hostname)) {
+ add_filter_tid_list(tid, proc);
+ }
}
}
return proc;
}
struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
- unsigned long timestamp)
+ 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);
+ }
+ return add_proc(ctx, tid, comm, timestamp, hostname);
}
struct processtop *get_proc_pid(struct lttngtop *ctx, int tid, int pid,
- unsigned long timestamp)
+ unsigned long timestamp, char *hostname)
{
struct processtop *tmp;
tmp = find_process_tid(ctx, tid, NULL);
if (tmp && tmp->pid == pid)
return tmp;
- return add_proc(ctx, tid, "Unknown", timestamp);
+ return add_proc(ctx, tid, "Unknown", timestamp, hostname);
}
void add_thread(struct processtop *parent, struct processtop *thread)
*/
g_ptr_array_add(dst->cpu_table, newcpu);
}
- for (i = 0; i < lttngtop.kprobes_table->len; i++) {
- tmpprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
- newprobe = g_new0(struct kprobes, 1);
- memcpy(newprobe, tmpprobe, sizeof(struct kprobes));
- tmpprobe->count = 0;
- g_ptr_array_add(dst->kprobes_table, newprobe);
+ if (lttngtop.kprobes_table) {
+ for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+ tmpprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+ newprobe = g_new0(struct kprobes, 1);
+ memcpy(newprobe, tmpprobe, sizeof(struct kprobes));
+ tmpprobe->count = 0;
+ g_ptr_array_add(dst->kprobes_table, newprobe);
+ }
}
/* FIXME : better algo */
/* create the threads index if required */
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)
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);
if (proc == NULL)
- proc = add_proc(<tngtop, tid, procname, timestamp);
- 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);
int *lookup_tid_list(int tid)
{
- return g_hash_table_lookup(tid_list, (gpointer) &tid);
+ if (!tid_filter_list)
+ return NULL;
+
+ return g_hash_table_lookup(tid_filter_list, (gpointer) &tid);
}
-char *lookup_hostname_list(const char *hostname)
+struct host *lookup_hostname_list(const char *hostname)
{
- if (!hostname)
+ if (!hostname || !global_host_list)
return NULL;
- return g_hash_table_lookup(hostname_list, (gpointer) hostname);
+ return g_hash_table_lookup(global_host_list, (gpointer) hostname);
+}
+
+int is_hostname_filtered(const char *hostname)
+{
+ struct host *host;
+
+ host = lookup_hostname_list(hostname);
+ if (host)
+ return host->filter;
+ return 0;
+}
+
+int *lookup_filter_tid_list(int tid)
+{
+ return g_hash_table_lookup(global_filter_list, (gpointer) &tid);
+}
+
+void add_filter_tid_list(int tid, struct processtop *newproc)
+{
+ unsigned long *hash_tid;
+
+ hash_tid = malloc(sizeof(unsigned long));
+ *hash_tid = tid;
+ g_hash_table_insert(global_filter_list,
+ (gpointer) (unsigned long) hash_tid, newproc);
+}
+
+void remove_filter_tid_list(int tid)
+{
+ g_hash_table_remove(global_filter_list,
+ (gpointer) (unsigned long) &tid);
}