projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't delete ctf trace while in snapshot mode
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 43d7891a21aeefc4079fd89b953836f4f425b837..482ca3e758a334052676fb5e823ed3dc5c6bc56a 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-729,7
+729,7
@@
static void try_close_stream(struct relay_session *session,
pthread_mutex_unlock(&session->viewer_ready_lock);
ret = stream_close(session, stream);
pthread_mutex_unlock(&session->viewer_ready_lock);
ret = stream_close(session, stream);
- if (
!re
t) {
+ if (
ret || session->snapsho
t) {
/* Already close thus the ctf trace is being or has been destroyed. */
goto end;
}
/* Already close thus the ctf trace is being or has been destroyed. */
goto end;
}
@@
-1849,7
+1849,7
@@
int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
node.node) {
if (stream->session_id == session_id &&
cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
node.node) {
if (stream->session_id == session_id &&
- !stream->data_pending_check_done) {
+ !stream->data_pending_check_done
&& !stream->terminated_flag
) {
is_data_inflight = 1;
DBG("Data is still in flight for stream %" PRIu64,
stream->stream_handle);
is_data_inflight = 1;
DBG("Data is still in flight for stream %" PRIu64,
stream->stream_handle);
This page took
0.023272 seconds
and
4
git commands to generate.