projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: cmd_rotate_session: introduce command argument
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 1977353e9f6bec04c7fc74fc8eaaf84584bb017a..7af855eacb14e13b204730cdd2848f888c3bc352 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-2715,7
+2715,8
@@
int cmd_start_trace(struct ltt_session *session)
* was produced as the session was stopped, so the
* rotation should happen on reception of the command.
*/
* was produced as the session was stopped, so the
* rotation should happen on reception of the command.
*/
- ret = cmd_rotate_session(session, NULL, true);
+ ret = cmd_rotate_session(session, NULL, true,
+ LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-3329,7
+3330,8
@@
int cmd_destroy_session(struct ltt_session *session,
* Perform a last rotation on destruction if rotations have
* occurred during the session's lifetime.
*/
* Perform a last rotation on destruction if rotations have
* occurred during the session's lifetime.
*/
- ret = cmd_rotate_session(session, NULL, false);
+ ret = cmd_rotate_session(session, NULL, false,
+ LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
if (ret != LTTNG_OK) {
ERR("Failed to perform an implicit rotation as part of the destruction of session \"%s\": %s",
session->name, lttng_strerror(-ret));
if (ret != LTTNG_OK) {
ERR("Failed to perform an implicit rotation as part of the destruction of session \"%s\": %s",
session->name, lttng_strerror(-ret));
@@
-3348,7
+3350,8
@@
int cmd_destroy_session(struct ltt_session *session,
* emitted and no renaming of the current trace chunk takes
* place.
*/
* emitted and no renaming of the current trace chunk takes
* place.
*/
- ret = cmd_rotate_session(session, NULL, true);
+ ret = cmd_rotate_session(session, NULL, true,
+ LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION);
if (ret != LTTNG_OK) {
ERR("Failed to perform a quiet rotation as part of the destruction of session \"%s\": %s",
session->name, lttng_strerror(-ret));
if (ret != LTTNG_OK) {
ERR("Failed to perform a quiet rotation as part of the destruction of session \"%s\": %s",
session->name, lttng_strerror(-ret));
@@
-4707,8
+4710,8
@@
enum lttng_error_code snapshot_record(struct ltt_session *session,
}
}
}
}
- if (session_close_trace_chunk(
-
session, session->current_trace_chunk, NULL
, NULL)) {
+ if (session_close_trace_chunk(
session, session->current_trace_chunk,
+
LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION
, NULL)) {
/*
* Don't goto end; make sure the chunk is closed for the session
* to allow future snapshots.
/*
* Don't goto end; make sure the chunk is closed for the session
* to allow future snapshots.
@@
-4902,7
+4905,8
@@
int cmd_set_session_shm_path(struct ltt_session *session,
*/
int cmd_rotate_session(struct ltt_session *session,
struct lttng_rotate_session_return *rotate_return,
*/
int cmd_rotate_session(struct ltt_session *session,
struct lttng_rotate_session_return *rotate_return,
- bool quiet_rotation)
+ bool quiet_rotation,
+ enum lttng_trace_chunk_command_type command)
{
int ret;
uint64_t ongoing_rotation_chunk_id;
{
int ret;
uint64_t ongoing_rotation_chunk_id;
@@
-5022,11
+5026,7
@@
int cmd_rotate_session(struct ltt_session *session,
assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
ret = session_close_trace_chunk(session, chunk_being_archived,
assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
ret = session_close_trace_chunk(session, chunk_being_archived,
- quiet_rotation ?
- NULL :
- &((enum lttng_trace_chunk_command_type){
- LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}),
- session->last_chunk_path);
+ command, session->last_chunk_path);
if (ret) {
cmd_ret = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
goto error;
if (ret) {
cmd_ret = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
goto error;
This page took
0.025315 seconds
and
5
git commands to generate.