X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fstart-session.cpp;h=f9138f51a56f8b20fd2aee980ea800d779b0e758;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=739540189e24dbb3882345007b6579103e572552;hpb=60f1b42d6280b6bd386abb726dca4fd3b31d8491;p=lttng-tools.git diff --git a/src/common/actions/start-session.cpp b/src/common/actions/start-session.cpp index 739540189..f9138f51a 100644 --- a/src/common/actions/start-session.cpp +++ b/src/common/actions/start-session.cpp @@ -291,7 +291,7 @@ end: struct lttng_action *lttng_action_start_session_create(void) { - struct lttng_action *action = NULL; + struct lttng_action_start_session *action_start = NULL; struct lttng_rate_policy *policy = NULL; enum lttng_action_status status; @@ -301,12 +301,13 @@ struct lttng_action *lttng_action_start_session_create(void) goto end; } - action = (lttng_action *) zmalloc(sizeof(struct lttng_action_start_session)); - if (!action) { + action_start = zmalloc(); + if (!action_start) { goto end; } - lttng_action_init(action, LTTNG_ACTION_TYPE_START_SESSION, + lttng_action_init(&action_start->parent, + LTTNG_ACTION_TYPE_START_SESSION, lttng_action_start_session_validate, lttng_action_start_session_serialize, lttng_action_start_session_is_equal, @@ -315,16 +316,17 @@ struct lttng_action *lttng_action_start_session_create(void) lttng_action_generic_add_error_query_results, lttng_action_start_session_mi_serialize); - status = lttng_action_start_session_set_rate_policy(action, policy); + status = lttng_action_start_session_set_rate_policy( + &action_start->parent, policy); if (status != LTTNG_ACTION_STATUS_OK) { - free(action); - action = NULL; + lttng_action_destroy(&action_start->parent); + action_start = NULL; goto end; } end: lttng_rate_policy_destroy(policy); - return action; + return &action_start->parent; } enum lttng_action_status lttng_action_start_session_set_session_name(