projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force usage of assert() condition when NDEBUG is defined
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
viewer-session.c
diff --git
a/src/bin/lttng-relayd/viewer-session.c
b/src/bin/lttng-relayd/viewer-session.c
index 3a92071a29f18841782b69edf4d29e3ea7747ab4..b2aba61bc73f63571381a361fd6b711284ce1afb 100644
(file)
--- a/
src/bin/lttng-relayd/viewer-session.c
+++ b/
src/bin/lttng-relayd/viewer-session.c
@@
-37,10
+37,14
@@
int viewer_session_set_trace_chunk_copy(struct relay_viewer_session *vsession,
int ret = 0;
struct lttng_trace_chunk *viewer_chunk;
int ret = 0;
struct lttng_trace_chunk *viewer_chunk;
-
assert(relay_session
_trace_chunk);
-
assert(!vsession->current_trace_chunk)
;
+
lttng_trace_chunk_put(vsession->current
_trace_chunk);
+
vsession->current_trace_chunk = NULL
;
DBG("Copying relay session's current trace chunk to the viewer session");
DBG("Copying relay session's current trace chunk to the viewer session");
+ if (!relay_session_trace_chunk) {
+ goto end;
+ }
+
viewer_chunk = lttng_trace_chunk_copy(relay_session_trace_chunk);
if (!viewer_chunk) {
ERR("Failed to create a viewer trace chunk from the relay session's current chunk");
viewer_chunk = lttng_trace_chunk_copy(relay_session_trace_chunk);
if (!viewer_chunk) {
ERR("Failed to create a viewer trace chunk from the relay session's current chunk");
@@
-73,8
+77,7
@@
enum lttng_viewer_attach_return_code viewer_session_attach(
} else {
int ret;
} else {
int ret;
- assert(session->current_trace_chunk);
- assert(!vsession->current_trace_chunk);
+ LTTNG_ASSERT(!vsession->current_trace_chunk);
session->viewer_attached = true;
ret = viewer_session_set_trace_chunk_copy(vsession,
session->viewer_attached = true;
ret = viewer_session_set_trace_chunk_copy(vsession,
This page took
0.027061 seconds
and
4
git commands to generate.