projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: move lttng_payload[_view] to libcommon
[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 8c1776072c35d1aae2206007c70bd193a60cd89e..8b78e627f88d545515fbd2125ffd7aa448e7efff 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-7,7
+7,6
@@
*/
#include "bin/lttng-sessiond/tracker.h"
*/
#include "bin/lttng-sessiond/tracker.h"
-#include "common/sessiond-comm/payload.h"
#include "lttng/lttng-error.h"
#include "lttng/tracker.h"
#define _LGPL_SOURCE
#include "lttng/lttng-error.h"
#include "lttng/tracker.h"
#define _LGPL_SOURCE
@@
-27,8
+26,8
@@
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
-#include <common/
sessiond-comm/
payload.h>
-#include <common/
sessiond-comm/
payload-view.h>
+#include <common/payload.h>
+#include <common/payload-view.h>
#include <common/trace-chunk.h>
#include <lttng/location-internal.h>
#include <lttng/trigger/trigger-internal.h>
#include <common/trace-chunk.h>
#include <lttng/location-internal.h>
#include <lttng/trigger/trigger-internal.h>
@@
-819,8
+818,7
@@
end:
return nb_event;
error:
return nb_event;
error:
- /* Negate the error code to differentiate the size from an error */
- return -ret;
+ return ret;
}
/*
}
/*
@@
-3187,19
+3185,19
@@
enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
enum lttng_error_code ret_code;
lttng_dynamic_buffer_init(&payload);
enum lttng_error_code ret_code;
lttng_dynamic_buffer_init(&payload);
- if (cmd_ctx->lsm
->
u.create_session.home_dir_size >=
+ if (cmd_ctx->lsm
.
u.create_session.home_dir_size >=
LTTNG_PATH_MAX) {
ret_code = LTTNG_ERR_INVALID;
goto error;
}
LTTNG_PATH_MAX) {
ret_code = LTTNG_ERR_INVALID;
goto error;
}
- if (cmd_ctx->lsm
->
u.create_session.session_descriptor_size >
+ if (cmd_ctx->lsm
.
u.create_session.session_descriptor_size >
LTTNG_SESSION_DESCRIPTOR_MAX_LEN) {
ret_code = LTTNG_ERR_INVALID;
goto error;
}
LTTNG_SESSION_DESCRIPTOR_MAX_LEN) {
ret_code = LTTNG_ERR_INVALID;
goto error;
}
- payload_size = cmd_ctx->lsm
->
u.create_session.home_dir_size +
- cmd_ctx->lsm
->
u.create_session.session_descriptor_size;
+ payload_size = cmd_ctx->lsm
.
u.create_session.home_dir_size +
+ cmd_ctx->lsm
.
u.create_session.session_descriptor_size;
ret = lttng_dynamic_buffer_set_size(&payload, payload_size);
if (ret) {
ret_code = LTTNG_ERR_NOMEM;
ret = lttng_dynamic_buffer_set_size(&payload, payload_size);
if (ret) {
ret_code = LTTNG_ERR_NOMEM;
@@
-3216,11
+3214,11
@@
enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
home_dir_view = lttng_buffer_view_from_dynamic_buffer(
&payload,
0,
home_dir_view = lttng_buffer_view_from_dynamic_buffer(
&payload,
0,
- cmd_ctx->lsm
->
u.create_session.home_dir_size);
+ cmd_ctx->lsm
.
u.create_session.home_dir_size);
session_descriptor_view = lttng_buffer_view_from_dynamic_buffer(
&payload,
session_descriptor_view = lttng_buffer_view_from_dynamic_buffer(
&payload,
- cmd_ctx->lsm
->
u.create_session.home_dir_size,
- cmd_ctx->lsm
->
u.create_session.session_descriptor_size);
+ cmd_ctx->lsm
.
u.create_session.home_dir_size,
+ cmd_ctx->lsm
.
u.create_session.session_descriptor_size);
ret = lttng_session_descriptor_create_from_buffer(
&session_descriptor_view, &session_descriptor);
ret = lttng_session_descriptor_create_from_buffer(
&session_descriptor_view, &session_descriptor);
@@
-4366,7
+4364,7
@@
int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
struct lttng_payload trigger_payload;
lttng_payload_init(&trigger_payload);
struct lttng_payload trigger_payload;
lttng_payload_init(&trigger_payload);
- trigger_len = (size_t) cmd_ctx->lsm
->
u.trigger.length;
+ trigger_len = (size_t) cmd_ctx->lsm
.
u.trigger.length;
ret = lttng_dynamic_buffer_set_size(
&trigger_payload.buffer, trigger_len);
if (ret) {
ret = lttng_dynamic_buffer_set_size(
&trigger_payload.buffer, trigger_len);
if (ret) {
@@
-4416,7
+4414,7
@@
int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
struct lttng_payload trigger_payload;
lttng_payload_init(&trigger_payload);
struct lttng_payload trigger_payload;
lttng_payload_init(&trigger_payload);
- trigger_len = (size_t) cmd_ctx->lsm
->
u.trigger.length;
+ trigger_len = (size_t) cmd_ctx->lsm
.
u.trigger.length;
ret = lttng_dynamic_buffer_set_size(
&trigger_payload.buffer, trigger_len);
if (ret) {
ret = lttng_dynamic_buffer_set_size(
&trigger_payload.buffer, trigger_len);
if (ret) {
This page took
0.028193 seconds
and
5
git commands to generate.