tid = bt_ctf_get_int64(bt_ctf_get_field(event,
scope, "_tid"));
if (bt_ctf_field_get_error()) {
- fprintf(stderr, "Missing tid context info\n");
- return -1ULL;
+ tid = bt_ctf_get_int64(bt_ctf_get_field(event,
+ scope, "_vtid"));
+ if (bt_ctf_field_get_error()) {
+ fprintf(stderr, "Missing tid context info\n");
+ return -1ULL;
+ }
}
return tid;
pid = bt_ctf_get_int64(bt_ctf_get_field(event,
scope, "_pid"));
if (bt_ctf_field_get_error()) {
- fprintf(stderr, "Missing pid context info\n");
- return -1ULL;
+ /* Try UST pid */
+ pid = bt_ctf_get_int64(bt_ctf_get_field(event,
+ scope, "_vpid"));
+ if (bt_ctf_field_get_error()) {
+ fprintf(stderr, "Missing pid context info\n");
+ return -1ULL;
+ }
}
return pid;
ppid = bt_ctf_get_int64(bt_ctf_get_field(event,
scope, "_ppid"));
if (bt_ctf_field_get_error()) {
- fprintf(stderr, "Missing ppid context info\n");
return -1ULL;
}
uint64_t get_context_vtid(const struct bt_ctf_event *event)
{
- const struct definition *scope;
+ const struct bt_definition *scope;
uint64_t vtid;
scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
uint64_t get_context_vpid(const struct bt_ctf_event *event)
{
- const struct definition *scope;
+ const struct bt_definition *scope;
uint64_t vpid;
scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
uint64_t get_context_vppid(const struct bt_ctf_event *event)
{
- const struct definition *scope;
+ const struct bt_definition *scope;
uint64_t vppid;
scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
return comm;
}
+char *get_context_hostname(const struct bt_ctf_event *event)
+{
+ const struct bt_definition *scope;
+ char *hostname;
+
+ scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+ hostname = bt_ctf_get_char_array(bt_ctf_get_field(event,
+ scope, "_hostname"));
+ if (bt_ctf_field_get_error()) {
+ return NULL;
+ }
+
+ return hostname;
+}
+
/*
* To get the parent process, put the pid in the tid field
* because the parent process gets pid = tid
*/
-struct processtop *find_process_tid(struct lttngtop *ctx, int tid, char *comm)
+struct processtop *find_process_tid(struct lttngtop *ctx, int tid, const char *comm)
{
struct processtop *tmp;
}
struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
- unsigned long timestamp)
+ unsigned long timestamp, char *hostname)
{
struct processtop *newproc;
-
- if (opt_tid && !lookup_tid_list(tid))
- return NULL;
+ struct host *host;
/* if the PID already exists, we just rename the process */
/* FIXME : need to integrate with clone/fork/exit to be accurate */
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(newproc);
+ }
ctx->nbnewthreads++;
ctx->nbthreads++;
}
newproc->comm = strdup(comm);
+ if (hostname) {
+ host = lookup_hostname_list(hostname);
+ if (!host)
+ host = add_hostname_list(hostname, 0);
+ if (!newproc->host || (newproc->host != host))
+ newproc->host = host;
+ if (is_hostname_filtered(hostname)) {
+ add_filter_tid_list(newproc);
+ }
+ }
return newproc;
}
struct processtop* update_proc(struct processtop* proc, int pid, int tid,
- int ppid, int vpid, int vtid, int vppid, char *comm)
+ int ppid, int vpid, int vtid, int vppid, char *comm, char *hostname)
{
+ struct host *host;
+
if (proc) {
proc->pid = pid;
proc->tid = tid;
free(proc->comm);
proc->comm = strdup(comm);
}
+ if (hostname && !proc->host) {
+ host = lookup_hostname_list(hostname);
+ if (!host)
+ host = add_hostname_list(hostname, 0);
+ if (!proc->host || (proc->host != host))
+ proc->host = host;
+ if (is_hostname_filtered(hostname)) {
+ add_filter_tid_list(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, NULL, timestamp, hostname);
}
void add_thread(struct processtop *parent, struct processtop *thread)
void rotate_perfcounter() {
int i;
struct processtop *tmp;
+
for (i = 0; i < lttngtop.process_table->len; i++) {
tmp = g_ptr_array_index(lttngtop.process_table, i);
g_hash_table_foreach(tmp->perf, reset_perf_counter, NULL);
struct processtop *tmp, *tmp2, *new;
struct cputime *tmpcpu, *newcpu;
struct files *tmpfile, *newfile;
+ struct kprobes *tmpprobe, *newprobe;
dst = g_new0(struct lttngtop, 1);
dst->start = start;
dst->process_table = g_ptr_array_new();
dst->files_table = g_ptr_array_new();
dst->cpu_table = g_ptr_array_new();
+ dst->kprobes_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);
if (tmpfile != NULL) {
memcpy(newfile, tmpfile, sizeof(struct files));
- newfile->name = strdup(tmpfile->name);
+ if (tmpfile->name)
+ newfile->name = strdup(tmpfile->name);
+ else
+ newfile->name = NULL;
newfile->ref = new;
g_ptr_array_add(new->process_files_table,
newfile);
*/
g_ptr_array_add(dst->cpu_table, newcpu);
}
+ 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 */
for (i = 0; i < dst->process_table->len; i++) {
struct processtop *proc;
unsigned long timestamp;
int64_t pid, tid, ppid, vtid, vpid, vppid;
- char *procname;
+ char *procname = NULL, *hostname = NULL;
timestamp = bt_ctf_get_timestamp(call_data);
if (timestamp == -1ULL)
ppid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
scope, "_ppid"));
if (bt_ctf_field_get_error()) {
- fprintf(stderr, "Missing ppid context info\n");
- goto error;
+ goto end;
}
tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
scope, "_tid"));
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);
+ proc = add_proc(<tngtop, tid, procname, timestamp, hostname);
+ update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, hostname);
if (proc) {
free(proc->comm);
proc->pid = pid;
}
+end:
return BT_CB_OK;
error:
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);
+}
+
+struct host *lookup_hostname_list(const char *hostname)
+{
+ if (!hostname || !global_host_list)
+ return NULL;
+
+ 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(struct processtop *proc)
+{
+ unsigned long *hash_tid;
+
+ hash_tid = malloc(sizeof(unsigned long));
+ *hash_tid = proc->tid;
+ g_hash_table_insert(global_filter_list,
+ (gpointer) (unsigned long) hash_tid, proc);
+}
+
+void remove_filter_tid_list(int tid)
+{
+ g_hash_table_remove(global_filter_list,
+ (gpointer) (unsigned long) &tid);
+}
+
+struct host *add_hostname_list(char *hostname, int filter)
+{
+ struct host *host;
+
+ host = lookup_hostname_list(hostname);
+ if (host)
+ return host;
+
+ host = g_new0(struct host, 1);
+ host->hostname = strdup(hostname);
+ host->filter = filter;
+ g_hash_table_insert(global_host_list,
+ (gpointer) host->hostname,
+ (gpointer) host);
+
+ return host;
+}
+
+void update_hostname_filter(struct host *host)
+{
+ struct processtop *tmp;
+ int i;
+
+ for (i = 0; i < lttngtop.process_table->len; i++) {
+ tmp = g_ptr_array_index(lttngtop.process_table, i);
+ if (tmp->host == host) {
+ if (host->filter)
+ add_filter_tid_list(tmp);
+ else
+ remove_filter_tid_list(tmp->tid);
+ }
+ }
+}
+
+char *lookup_procname(const char *procname)
+{
+ if (!procname || !global_procname_list)
+ return NULL;
+
+ return g_hash_table_lookup(global_procname_list, (gpointer) procname);
+}
+
+char *add_procname_list(char *procname, int filter)
+{
+ char *proc;
+
+ proc = lookup_procname(procname);
+ if (proc)
+ return proc;
+
+ proc = strdup(procname);
+ g_hash_table_insert(global_procname_list,
+ (gpointer) procname, (gpointer) procname);
+
+ return proc;
}
projects / lttngtop.git / blobdiff