projects
/
lttng-tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
706ef69
)
Cleanup: remove superfluous argument to consumed size create
author
Jérémie Galarneau
<jeremie.galarneau@efficios.com>
Fri, 17 Aug 2018 17:25:33 +0000
(13:25 -0400)
committer
Jérémie Galarneau
<jeremie.galarneau@efficios.com>
Thu, 23 Aug 2018 00:18:09 +0000
(20:18 -0400)
include/lttng/condition/session-consumed-size-internal.h
patch
|
blob
|
blame
|
history
src/bin/lttng-sessiond/notification-thread-events.c
patch
|
blob
|
blame
|
history
src/common/session-consumed-size.c
patch
|
blob
|
blame
|
history
diff --git
a/include/lttng/condition/session-consumed-size-internal.h
b/include/lttng/condition/session-consumed-size-internal.h
index e2a741ecb2eb238ddbe2511a044d2e939dd75b9b..65ac706687fe9489f35a18defb8603da0c3ddd37 100644
(file)
--- a/
include/lttng/condition/session-consumed-size-internal.h
+++ b/
include/lttng/condition/session-consumed-size-internal.h
@@
-50,7
+50,7
@@
struct lttng_evaluation_session_consumed_size_comm {
LTTNG_HIDDEN
struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
LTTNG_HIDDEN
struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
-
enum lttng_condition_type type,
uint64_t consumed);
+ uint64_t consumed);
LTTNG_HIDDEN
ssize_t lttng_condition_session_consumed_size_create_from_buffer(
LTTNG_HIDDEN
ssize_t lttng_condition_session_consumed_size_create_from_buffer(
diff --git
a/src/bin/lttng-sessiond/notification-thread-events.c
b/src/bin/lttng-sessiond/notification-thread-events.c
index 33876874bb6f2ac75d194f464cc09f12f450096f..e915b33b55631e4035052d4e66a46056dca464c7 100644
(file)
--- a/
src/bin/lttng-sessiond/notification-thread-events.c
+++ b/
src/bin/lttng-sessiond/notification-thread-events.c
@@
-2344,7
+2344,6
@@
int evaluate_condition(const struct lttng_condition *condition,
break;
case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
*evaluation = lttng_evaluation_session_consumed_size_create(
break;
case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
*evaluation = lttng_evaluation_session_consumed_size_create(
- condition_type,
latest_session_consumed_total);
break;
default:
latest_session_consumed_total);
break;
default:
diff --git
a/src/common/session-consumed-size.c
b/src/common/session-consumed-size.c
index f29176f8df91e08ca166d74a04f1ff0f12f2ae6c..6ff1c24866cd93da6c02bb60920a27004f027bce 100644
(file)
--- a/
src/common/session-consumed-size.c
+++ b/
src/common/session-consumed-size.c
@@
-258,7
+258,6
@@
error:
static
struct lttng_evaluation *create_evaluation_from_buffer(
static
struct lttng_evaluation *create_evaluation_from_buffer(
- enum lttng_condition_type type,
const struct lttng_buffer_view *view)
{
const struct lttng_evaluation_session_consumed_size_comm *comm =
const struct lttng_buffer_view *view)
{
const struct lttng_evaluation_session_consumed_size_comm *comm =
@@
-269,7
+268,7
@@
struct lttng_evaluation *create_evaluation_from_buffer(
goto end;
}
goto end;
}
- evaluation = lttng_evaluation_session_consumed_size_create(
type,
+ evaluation = lttng_evaluation_session_consumed_size_create(
comm->session_consumed);
end:
return evaluation;
comm->session_consumed);
end:
return evaluation;
@@
-288,8
+287,7
@@
ssize_t lttng_evaluation_session_consumed_size_create_from_buffer(
goto error;
}
goto error;
}
- evaluation = create_evaluation_from_buffer(
- LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE, view);
+ evaluation = create_evaluation_from_buffer(view);
if (!evaluation) {
ret = -1;
goto error;
if (!evaluation) {
ret = -1;
goto error;
@@
-428,7
+426,7
@@
void lttng_evaluation_session_consumed_size_destroy(
LTTNG_HIDDEN
struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
LTTNG_HIDDEN
struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
-
enum lttng_condition_type type,
uint64_t consumed)
+ uint64_t consumed)
{
struct lttng_evaluation_session_consumed_size *consumed_eval;
{
struct lttng_evaluation_session_consumed_size *consumed_eval;
@@
-437,7
+435,7
@@
struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
goto end;
}
goto end;
}
- consumed_eval->parent.type =
type
;
+ consumed_eval->parent.type =
LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE
;
consumed_eval->session_consumed = consumed;
consumed_eval->parent.serialize = lttng_evaluation_session_consumed_size_serialize;
consumed_eval->parent.destroy = lttng_evaluation_session_consumed_size_destroy;
consumed_eval->session_consumed = consumed;
consumed_eval->parent.serialize = lttng_evaluation_session_consumed_size_serialize;
consumed_eval->parent.destroy = lttng_evaluation_session_consumed_size_destroy;
This page took
0.030653 seconds
and
4
git commands to generate.