projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: add brackets to lttng-live-plugin.c
[babeltrace.git]
/
formats
/
lttng-live
/
lttng-live-comm.c
diff --git
a/formats/lttng-live/lttng-live-comm.c
b/formats/lttng-live/lttng-live-comm.c
index 76dc6bbb14bc2ea6a045cd2ddb8072365fb9416c..3970ac22ee6ed43fa33dae4664061cc478811836 100644
(file)
--- a/
formats/lttng-live/lttng-live-comm.c
+++ b/
formats/lttng-live/lttng-live-comm.c
@@
-676,14
+676,18
@@
retry:
ret = append_metadata(ctx, stream);
if (ret)
goto error;
ret = append_metadata(ctx, stream);
if (ret)
goto error;
- goto retry;
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
}
if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
+ printf_verbose("get_data_packet: new streams needed\n");
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
- g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
- ctx->bt_ctx);
+ g_hash_table_foreach(ctx->session->ctf_traces,
+ add_traces, ctx->bt_ctx);
+ }
+ if (rp.flags & (LTTNG_VIEWER_FLAG_NEW_METADATA
+ | LTTNG_VIEWER_FLAG_NEW_STREAM)) {
+ goto retry;
}
fprintf(stderr, "[error] get_data_packet: error\n");
ret = -1;
}
fprintf(stderr, "[error] get_data_packet: error\n");
ret = -1;
@@
-745,7
+749,7
@@
retry:
goto error;
}
assert(ret_len == len);
goto error;
}
assert(ret_len == len);
-
+ ret = 0;
end:
error:
return ret;
end:
error:
return ret;
@@
-991,8
+995,8
@@
retry:
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
ret = ask_new_streams(ctx);
if (ret < 0)
goto error;
- g_hash_table_foreach(ctx->session->ctf_traces,
add_traces,
- ctx->bt_ctx);
+ g_hash_table_foreach(ctx->session->ctf_traces,
+
add_traces,
ctx->bt_ctx);
}
break;
case LTTNG_VIEWER_INDEX_RETRY:
}
break;
case LTTNG_VIEWER_INDEX_RETRY:
@@
-1463,8
+1467,9
@@
void lttng_live_read(struct lttng_live_ctx *ctx)
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
- if (!sout->parent.event_cb)
+ if (!sout->parent.event_cb)
{
goto end_free;
goto end_free;
+ }
ret = lttng_live_create_viewer_session(ctx);
if (ret < 0) {
ret = lttng_live_create_viewer_session(ctx);
if (ret < 0) {
@@
-1491,13
+1496,16
@@
void lttng_live_read(struct lttng_live_ctx *ctx)
int flags;
while (!ctx->session->stream_count) {
int flags;
while (!ctx->session->stream_count) {
- if (ctx->session_ids->len == 0)
+ if (ctx->session_ids->len == 0)
{
goto end_free;
goto end_free;
+ }
ret = ask_new_streams(ctx);
ret = ask_new_streams(ctx);
- if (ret < 0)
+ if (ret < 0)
{
goto end_free;
goto end_free;
- if (!ctx->session->stream_count)
+ }
+ if (!ctx->session->stream_count) {
(void) poll(NULL, 0, ACTIVE_POLL_DELAY);
(void) poll(NULL, 0, ACTIVE_POLL_DELAY);
+ }
}
g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
}
g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
This page took
0.02507 seconds
and
4
git commands to generate.