fix add_proc with hostname

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>

diff --git a/src/common.c b/src/common.c
index 02d72bb6e023b252da6be57af4330d138baa9a3b..021f2f1217b2316bd383e1a1ec146df492b70fd4 100644 (file)
--- 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(&lttngtop, tid, procname);
-       /* FIXME : hostname NULL */
        if (proc == NULL)
-               proc = add_proc(&lttngtop, tid, procname, timestamp, NULL);
-       update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, NULL);
+               proc = add_proc(&lttngtop, tid, procname, timestamp, hostname);
+       update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, hostname);
 
        if (proc) {
                free(proc->comm);

diff --git a/src/cputop.c b/src/cputop.c
index 7df54696afdcb186159bab40ca6b34ba5b37ec73..65cafb5fdb992703a01c0d72422207be724caa45 100644 (file)
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -55,7 +55,7 @@ enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
        uint64_t cpu_id;
        char *prev_comm, *next_comm;
        int prev_tid, next_tid;
-       char *hostname;
+       char *hostname = NULL;
 
        timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
@@ -90,7 +90,6 @@ enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
                fprintf(stderr, "Missing next_tid context info\n");
                goto error;
        }
-       hostname = get_context_hostname(call_data);
 
        cpu_id = get_cpu_id(call_data);
 

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 2672c8f74bcffd91dac9c58c47eda1ca9239f2a7..51c5a98743c6aebd6821dd8c9b34974e5569f898 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -1214,7 +1214,8 @@ int setup_live_tracing()
                chan.attr.subbuf_size = 32768;
                chan.attr.num_subbuf = 8;
        } else {
-               chan.attr.subbuf_size = 1048576; /* 1MB */
+               //chan.attr.subbuf_size = 1048576; /* 1MB */
+               chan.attr.subbuf_size = 2097152; /* 1MB */
                chan.attr.num_subbuf = 4;
        }
        chan.attr.switch_timer_interval = 0;