projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: sessiond: fix comments to match with behavior
[lttng-tools.git]
/
src
/
common
/
evaluation.c
diff --git
a/src/common/evaluation.c
b/src/common/evaluation.c
index e936bdd91db3b12f1aeab97603df36649529b4f1..d8a68a7840429b44bf73679bd3b0abc1b30f6273 100644
(file)
--- a/
src/common/evaluation.c
+++ b/
src/common/evaluation.c
@@
-9,6
+9,7
@@
#include <lttng/condition/buffer-usage-internal.h>
#include <lttng/condition/session-consumed-size-internal.h>
#include <lttng/condition/session-rotation-internal.h>
#include <lttng/condition/buffer-usage-internal.h>
#include <lttng/condition/session-consumed-size-internal.h>
#include <lttng/condition/session-rotation-internal.h>
+#include <lttng/condition/event-rule-internal.h>
#include <common/macros.h>
#include <common/error.h>
#include <stdbool.h>
#include <common/macros.h>
#include <common/error.h>
#include <stdbool.h>
@@
-53,17
+54,24
@@
ssize_t lttng_evaluation_create_from_payload(
{
ssize_t ret, evaluation_size = 0;
const struct lttng_evaluation_comm *evaluation_comm;
{
ssize_t ret, evaluation_size = 0;
const struct lttng_evaluation_comm *evaluation_comm;
- struct lttng_payload_view evaluation_view = src_view ?
+ struct lttng_payload_view evaluation_comm_view =
+ lttng_payload_view_from_view(
+ src_view, 0, sizeof(*evaluation_comm));
+ struct lttng_payload_view evaluation_view =
lttng_payload_view_from_view(src_view,
lttng_payload_view_from_view(src_view,
- sizeof(*evaluation_comm), -1) :
- (typeof(evaluation_view)) {};
+ sizeof(*evaluation_comm), -1);
if (!src_view || !evaluation) {
ret = -1;
goto end;
}
if (!src_view || !evaluation) {
ret = -1;
goto end;
}
- evaluation_comm = (typeof(evaluation_comm)) src_view->buffer.data;
+ if (!lttng_payload_view_is_valid(&evaluation_comm_view)) {
+ ret = -1;
+ goto end;
+ }
+
+ evaluation_comm = (typeof(evaluation_comm)) evaluation_comm_view.buffer.data;
evaluation_size += sizeof(*evaluation_comm);
switch ((enum lttng_condition_type) evaluation_comm->type) {
evaluation_size += sizeof(*evaluation_comm);
switch ((enum lttng_condition_type) evaluation_comm->type) {
@@
-107,6
+115,13
@@
ssize_t lttng_evaluation_create_from_payload(
}
evaluation_size += ret;
break;
}
evaluation_size += ret;
break;
+ case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
+ ret = lttng_evaluation_event_rule_create_from_payload(&evaluation_view, evaluation);
+ if (ret < 0) {
+ goto end;
+ }
+ evaluation_size += ret;
+ break;
default:
ERR("Attempted to create evaluation of unknown type (%i)",
(int) evaluation_comm->type);
default:
ERR("Attempted to create evaluation of unknown type (%i)",
(int) evaluation_comm->type);
This page took
0.025396 seconds
and
4
git commands to generate.