projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use MT-safe strtok_r in spawn viewer library helper
[lttng-tools.git]
/
src
/
common
/
actions
/
rotate-session.c
diff --git
a/src/common/actions/rotate-session.c
b/src/common/actions/rotate-session.c
index 98806230a7b504fb622e09621239ad72a37bb0d1..a492876607a4e68c53cf640f82cc8f08cd3f16d8 100644
(file)
--- a/
src/common/actions/rotate-session.c
+++ b/
src/common/actions/rotate-session.c
@@
-13,7
+13,7
@@
#include <lttng/action/rotate-session.h>
#define IS_ROTATE_SESSION_ACTION(action) \
#include <lttng/action/rotate-session.h>
#define IS_ROTATE_SESSION_ACTION(action) \
- (lttng_action_get_type
_const
(action) == LTTNG_ACTION_TYPE_ROTATE_SESSION)
+ (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_ROTATE_SESSION)
struct lttng_action_rotate_session {
struct lttng_action parent;
struct lttng_action_rotate_session {
struct lttng_action parent;
@@
-95,7
+95,7
@@
end:
return is_equal;
}
static int lttng_action_rotate_session_serialize(
return is_equal;
}
static int lttng_action_rotate_session_serialize(
- struct lttng_action *action, struct lttng_
dynamic_buffer *buf
)
+ struct lttng_action *action, struct lttng_
payload *payload
)
{
struct lttng_action_rotate_session *action_rotate_session;
struct lttng_action_rotate_session_comm comm;
{
struct lttng_action_rotate_session *action_rotate_session;
struct lttng_action_rotate_session_comm comm;
@@
-103,7
+103,7
@@
static int lttng_action_rotate_session_serialize(
int ret;
assert(action);
int ret;
assert(action);
- assert(
buf
);
+ assert(
payload
);
action_rotate_session = action_rotate_session_from_action(action);
action_rotate_session = action_rotate_session_from_action(action);
@@
-115,13
+115,14
@@
static int lttng_action_rotate_session_serialize(
session_name_len = strlen(action_rotate_session->session_name) + 1;
comm.session_name_len = session_name_len;
session_name_len = strlen(action_rotate_session->session_name) + 1;
comm.session_name_len = session_name_len;
- ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm));
+ ret = lttng_dynamic_buffer_append(
+ &payload->buffer, &comm, sizeof(comm));
if (ret) {
ret = -1;
goto end;
}
if (ret) {
ret = -1;
goto end;
}
- ret = lttng_dynamic_buffer_append(
buf
,
+ ret = lttng_dynamic_buffer_append(
&payload->buffer
,
action_rotate_session->session_name, session_name_len);
if (ret) {
ret = -1;
action_rotate_session->session_name, session_name_len);
if (ret) {
ret = -1;
@@
-150,8
+151,8
@@
end:
return;
}
return;
}
-ssize_t lttng_action_rotate_session_create_from_
buffer
(
-
const struct lttng_buffer
_view *view,
+ssize_t lttng_action_rotate_session_create_from_
payload
(
+
struct lttng_payload
_view *view,
struct lttng_action **p_action)
{
ssize_t consumed_len;
struct lttng_action **p_action)
{
ssize_t consumed_len;
@@
-166,11
+167,11
@@
ssize_t lttng_action_rotate_session_create_from_buffer(
goto end;
}
goto end;
}
- comm = (
const struct lttng_action_rotate_session_comm *) view->
data;
+ comm = (
typeof(comm)) view->buffer.
data;
session_name = (const char *) &comm->data;
if (!lttng_buffer_view_contains_string(
session_name = (const char *) &comm->data;
if (!lttng_buffer_view_contains_string(
-
view
, session_name, comm->session_name_len)) {
+
&view->buffer
, session_name, comm->session_name_len)) {
consumed_len = -1;
goto end;
}
consumed_len = -1;
goto end;
}
@@
-182,8
+183,7
@@
ssize_t lttng_action_rotate_session_create_from_buffer(
goto end;
}
goto end;
}
- consumed_len = sizeof(struct lttng_action_rotate_session_comm) +
- comm->session_name_len;
+ consumed_len = sizeof(*comm) + comm->session_name_len;
*p_action = action;
action = NULL;
*p_action = action;
action = NULL;
This page took
0.025106 seconds
and
4
git commands to generate.