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 5cbdc0da6e015b4037d6308d379724368ec91d7e..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]));
@@
-636,15
+638,7
@@
static int parse_options(int argc, char **argv)
toggle_filter = 1;
tmp_str = strtok(opt_hostname, ",");
while (tmp_str) {
toggle_filter = 1;
tmp_str = strtok(opt_hostname, ",");
while (tmp_str) {
-// char *new_str = strdup(tmp_str);
- struct host *host;
-
- host = g_new0(struct host, 1);
- host->hostname = strdup(tmp_str);
- host->filter = 1;
- g_hash_table_insert(global_host_list,
- (gpointer) host->hostname,
- (gpointer) host);
+ add_hostname_list(tmp_str, 1);
tmp_str = strtok(NULL, ",");
}
break;
tmp_str = strtok(NULL, ",");
}
break;
@@
-993,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
@@
-1099,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");
@@
-1314,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);
}
@@
-1375,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.023226 seconds
and
4
git commands to generate.