projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compat with lttng-tools 2.1 rc6
[lttngtop.git]
/
src
/
lttngtop.c
diff --git
a/src/lttngtop.c
b/src/lttngtop.c
index 26da96786455021678a80a6fecd50448a9baa49b..dd48a88fd90049a8e95c94dac70fc48334c99097 100644
(file)
--- a/
src/lttngtop.c
+++ b/
src/lttngtop.c
@@
-162,6
+162,7
@@
void print_fields(struct bt_ctf_event *event)
{
unsigned int cnt, i;
const struct definition *const * list;
{
unsigned int cnt, i;
const struct definition *const * list;
+ const struct declaration *l;
const struct definition *scope;
enum ctf_type_id type;
const char *str;
const struct definition *scope;
enum ctf_type_id type;
const char *str;
@@
-173,9
+174,10
@@
void print_fields(struct bt_ctf_event *event)
if (i != 0)
printf(", ");
printf("%s = ", bt_ctf_field_name(list[i]));
if (i != 0)
printf(", ");
printf("%s = ", bt_ctf_field_name(list[i]));
- type = bt_ctf_field_type(list[i]);
+ l = bt_ctf_get_decl_from_def(list[i]);
+ type = bt_ctf_field_type(l);
if (type == CTF_TYPE_INTEGER) {
if (type == CTF_TYPE_INTEGER) {
- if (bt_ctf_get_int_signedness(l
ist[i]
) == 0)
+ if (bt_ctf_get_int_signedness(l) == 0)
printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
else
printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
else
printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
@@
-218,16
+220,6
@@
enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
if (!lookup_filter_tid_list(pid))
goto end;
if (!lookup_filter_tid_list(pid))
goto end;
- /*
- if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname)))
- goto end;
- if (!opt_hostname && (opt_tid && !lookup_tid_list(pid)))
- goto end;
- if ((opt_tid && !lookup_tid_list(pid)) &&
- (opt_hostname && !lookup_hostname_list(hostname)))
- goto end;
- */
-
cpu_id = get_cpu_id(call_data);
procname = get_context_comm(call_data);
cpu_id = get_cpu_id(call_data);
procname = get_context_comm(call_data);
@@
-458,7
+450,7
@@
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
/* find or create the current process */
child = find_process_tid(<tngtop, tid, comm);
if (!child)
/* find or create the current process */
child = find_process_tid(<tngtop, tid, comm);
if (!child)
- child = add_proc(<tngtop, tid, comm, timestamp);
+ child = add_proc(<tngtop, tid, comm, timestamp
, hostname
);
if (!child)
goto end;
update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
if (!child)
goto end;
update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
@@
-467,7
+459,7
@@
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
/* find or create the parent */
parent = find_process_tid(<tngtop, pid, comm);
if (!parent) {
/* find or create the parent */
parent = find_process_tid(<tngtop, pid, comm);
if (!parent) {
- parent = add_proc(<tngtop, pid, comm, timestamp);
+ parent = add_proc(<tngtop, pid, comm, timestamp
, hostname
);
if (parent)
parent->pid = pid;
}
if (parent)
parent->pid = pid;
}
@@
-491,6
+483,7
@@
void init_lttngtop()
copies = g_ptr_array_new();
global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
global_filter_list = g_hash_table_new(g_str_hash, g_str_equal);
copies = g_ptr_array_new();
global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
global_filter_list = g_hash_table_new(g_str_hash, g_str_equal);
+ global_host_list = g_hash_table_new(g_str_hash, g_str_equal);
sem_init(&goodtodisplay, 0, 0);
sem_init(&goodtoupdate, 0, 1);
sem_init(&goodtodisplay, 0, 0);
sem_init(&goodtoupdate, 0, 1);
@@
-630,27
+623,22
@@
static int parse_options(int argc, char **argv)
break;
case OPT_PID:
toggle_filter = 1;
break;
case OPT_PID:
toggle_filter = 1;
- tid_list = g_hash_table_new(g_str_hash,
+ tid_
filter_
list = g_hash_table_new(g_str_hash,
g_str_equal);
tmp_str = strtok(opt_tid, ",");
while (tmp_str) {
tid = malloc(sizeof(int));
*tid = atoi(tmp_str);
g_str_equal);
tmp_str = strtok(opt_tid, ",");
while (tmp_str) {
tid = malloc(sizeof(int));
*tid = atoi(tmp_str);
- g_hash_table_insert(tid_list,
+ g_hash_table_insert(tid_
filter_
list,
(gpointer) tid, tid);
tmp_str = strtok(NULL, ",");
}
break;
case OPT_HOSTNAME:
toggle_filter = 1;
(gpointer) tid, tid);
tmp_str = strtok(NULL, ",");
}
break;
case OPT_HOSTNAME:
toggle_filter = 1;
- hostname_list = g_hash_table_new(g_str_hash,
- g_str_equal);
tmp_str = strtok(opt_hostname, ",");
while (tmp_str) {
tmp_str = strtok(opt_hostname, ",");
while (tmp_str) {
- char *new_str = strdup(tmp_str);
- g_hash_table_insert(hostname_list,
- (gpointer) new_str,
- (gpointer) new_str);
+ add_hostname_list(tmp_str, 1);
tmp_str = strtok(NULL, ",");
}
break;
tmp_str = strtok(NULL, ",");
}
break;
@@
-999,7
+987,7
@@
ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
}
/* splice the subbuffer to the tracefile */
}
/* splice the subbuffer to the tracefile */
- ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
+ ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len
, 0
);
if (ret < 0) {
/*
* display the error but continue processing to try
if (ret < 0) {
/*
* display the error but continue processing to try
@@
-1105,14
+1093,14
@@
int setup_consumer(char *command_sock_path, pthread_t *threads,
helper_lttng_consumer_init();
/* Create the thread to manage the receive of fd */
helper_lttng_consumer_init();
/* Create the thread to manage the receive of fd */
- ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_
receive_fds
,
+ ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_
sessiond_poll
,
(void *) ctx);
if (ret != 0) {
perror("pthread_create receive fd");
goto end;
}
/* Create thread to manage the polling/writing of traces */
(void *) ctx);
if (ret != 0) {
perror("pthread_create receive fd");
goto end;
}
/* Create thread to manage the polling/writing of traces */
- ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_
poll_fds
,
+ ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_
metadata_poll
,
(void *) ctx);
if (ret != 0) {
perror("pthread_create poll fd");
(void *) ctx);
if (ret != 0) {
perror("pthread_create poll fd");
@@
-1214,7
+1202,8
@@
int setup_live_tracing()
chan.attr.subbuf_size = 32768;
chan.attr.num_subbuf = 8;
} else {
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;
chan.attr.num_subbuf = 4;
}
chan.attr.switch_timer_interval = 0;
@@
-1319,9
+1308,14
@@
int main(int argc, char **argv)
reload_trace = 0;
live_consume(&bt_ctx);
iter_trace(bt_ctx);
reload_trace = 0;
live_consume(&bt_ctx);
iter_trace(bt_ctx);
+ /*
+ * FIXME : pb with cleanup in libbabeltrace
ret = bt_context_remove_trace(bt_ctx, 0);
ret = bt_context_remove_trace(bt_ctx, 0);
- if (ret != 0)
+ if (ret != 0)
{
fprintf(stderr, "error removing trace\n");
fprintf(stderr, "error removing trace\n");
+ goto error;
+ }
+ */
if (bt_ctx) {
bt_context_put(bt_ctx);
}
if (bt_ctx) {
bt_context_put(bt_ctx);
}
@@
-1380,4
+1374,7
@@
end:
bt_context_put(bt_ctx);
return 0;
bt_context_put(bt_ctx);
return 0;
+
+error:
+ return -1;
}
}
This page took
0.02462 seconds
and
4
git commands to generate.