X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent.cpp;h=6b22fecf52799f1bd7a26fc97f84d5ab0db18fef;hp=358d058411cf5ce862ff44815b59f52ff5aa4a0d;hb=HEAD;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f diff --git a/src/common/event.cpp b/src/common/event.cpp index 358d05841..a6d48eaf7 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -20,11 +20,13 @@ #include #include +namespace { struct event_list_element { struct lttng_event *event; struct lttng_event_exclusion *exclusions; char *filter_expression; }; +} /* namespace */ static void event_list_destructor(void *ptr) { @@ -41,7 +43,7 @@ struct lttng_event *lttng_event_copy(const struct lttng_event *event) struct lttng_event *new_event; struct lttng_event_extended *new_event_extended; - new_event = (lttng_event *) zmalloc(sizeof(*event)); + new_event = zmalloc(); if (!new_event) { PERROR("Error allocating event structure"); goto end; @@ -54,7 +56,7 @@ struct lttng_event *lttng_event_copy(const struct lttng_event *event) * We need to create a new extended since the previous pointer is now * invalid. */ - new_event_extended = (lttng_event_extended *) zmalloc(sizeof(*new_event_extended)); + new_event_extended = zmalloc(); if (!new_event_extended) { PERROR("Error allocating event extended structure"); goto error; @@ -65,20 +67,18 @@ end: return new_event; error: free(new_event); - new_event = NULL; + new_event = nullptr; goto end; } -static int lttng_event_probe_attr_serialize( - const struct lttng_event_probe_attr *probe, - struct lttng_payload *payload) +static int lttng_event_probe_attr_serialize(const struct lttng_event_probe_attr *probe, + struct lttng_payload *payload) { int ret; size_t symbol_name_len; struct lttng_event_probe_attr_comm comm = {}; - symbol_name_len = lttng_strnlen( - probe->symbol_name, sizeof(probe->symbol_name)); + symbol_name_len = lttng_strnlen(probe->symbol_name, sizeof(probe->symbol_name)); if (symbol_name_len == sizeof(probe->symbol_name)) { /* Not null-termintated. */ ret = -1; @@ -92,29 +92,27 @@ static int lttng_event_probe_attr_serialize( comm.addr = probe->addr; comm.offset = probe->addr; - ret = lttng_dynamic_buffer_append( - &payload->buffer, &comm, sizeof(comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm)); if (ret < 0) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append( - &payload->buffer, probe->symbol_name, symbol_name_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, probe->symbol_name, symbol_name_len); end: return ret; } -static int lttng_event_function_attr_serialize( - const struct lttng_event_function_attr *function, - struct lttng_payload *payload) +static int lttng_event_function_attr_serialize(const struct lttng_event_function_attr *function, + struct lttng_payload *payload) { int ret; size_t symbol_name_len; - struct lttng_event_function_attr_comm comm = { 0 }; + struct lttng_event_function_attr_comm comm; + + comm.symbol_name_len = 0; - symbol_name_len = lttng_strnlen( - function->symbol_name, sizeof(function->symbol_name)); + symbol_name_len = lttng_strnlen(function->symbol_name, sizeof(function->symbol_name)); if (symbol_name_len == sizeof(function->symbol_name)) { /* Not null-termintated. */ ret = -1; @@ -126,28 +124,26 @@ static int lttng_event_function_attr_serialize( comm.symbol_name_len = (uint32_t) symbol_name_len; - ret = lttng_dynamic_buffer_append( - &payload->buffer, &comm, sizeof(comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm)); if (ret < 0) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, - function->symbol_name, symbol_name_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, function->symbol_name, symbol_name_len); end: return ret; } -static ssize_t lttng_event_probe_attr_create_from_payload( - struct lttng_payload_view *view, - struct lttng_event_probe_attr **probe_attr) +static ssize_t +lttng_event_probe_attr_create_from_payload(struct lttng_payload_view *view, + struct lttng_event_probe_attr **probe_attr) { ssize_t ret, offset = 0; const struct lttng_event_probe_attr_comm *comm; - struct lttng_event_probe_attr *local_attr = NULL; - struct lttng_payload_view comm_view = lttng_payload_view_from_view( - view, offset, sizeof(*comm)); + struct lttng_event_probe_attr *local_attr = nullptr; + struct lttng_payload_view comm_view = + lttng_payload_view_from_view(view, offset, sizeof(*comm)); if (!lttng_payload_view_is_valid(&comm_view)) { ret = -1; @@ -157,9 +153,8 @@ static ssize_t lttng_event_probe_attr_create_from_payload( comm = (typeof(comm)) comm_view.buffer.data; offset += sizeof(*comm); - local_attr = (struct lttng_event_probe_attr *) zmalloc( - sizeof(*local_attr)); - if (local_attr == NULL) { + local_attr = zmalloc(); + if (local_attr == nullptr) { ret = -1; goto end; } @@ -170,8 +165,7 @@ static ssize_t lttng_event_probe_attr_create_from_payload( { const char *name; struct lttng_payload_view name_view = - lttng_payload_view_from_view(view, offset, - comm->symbol_name_len); + lttng_payload_view_from_view(view, offset, comm->symbol_name_len); if (!lttng_payload_view_is_valid(&name_view)) { ret = -1; @@ -180,14 +174,13 @@ static ssize_t lttng_event_probe_attr_create_from_payload( name = name_view.buffer.data; - if (!lttng_buffer_view_contains_string(&name_view.buffer, name, - comm->symbol_name_len)) { + if (!lttng_buffer_view_contains_string( + &name_view.buffer, name, comm->symbol_name_len)) { ret = -1; goto end; } - ret = lttng_strncpy(local_attr->symbol_name, name, - sizeof(local_attr->symbol_name)); + ret = lttng_strncpy(local_attr->symbol_name, name, sizeof(local_attr->symbol_name)); if (ret) { ret = -1; goto end; @@ -197,22 +190,22 @@ static ssize_t lttng_event_probe_attr_create_from_payload( } *probe_attr = local_attr; - local_attr = NULL; + local_attr = nullptr; ret = offset; end: free(local_attr); return ret; } -static ssize_t lttng_event_function_attr_create_from_payload( - struct lttng_payload_view *view, - struct lttng_event_function_attr **function_attr) +static ssize_t +lttng_event_function_attr_create_from_payload(struct lttng_payload_view *view, + struct lttng_event_function_attr **function_attr) { ssize_t ret, offset = 0; const struct lttng_event_function_attr_comm *comm; - struct lttng_event_function_attr *local_attr = NULL; - struct lttng_payload_view comm_view = lttng_payload_view_from_view( - view, offset, sizeof(*comm)); + struct lttng_event_function_attr *local_attr = nullptr; + struct lttng_payload_view comm_view = + lttng_payload_view_from_view(view, offset, sizeof(*comm)); if (!lttng_payload_view_is_valid(&comm_view)) { ret = -1; @@ -222,9 +215,8 @@ static ssize_t lttng_event_function_attr_create_from_payload( comm = (typeof(comm)) view->buffer.data; offset += sizeof(*comm); - local_attr = (struct lttng_event_function_attr *) zmalloc( - sizeof(*local_attr)); - if (local_attr == NULL) { + local_attr = zmalloc(); + if (local_attr == nullptr) { ret = -1; goto end; } @@ -232,8 +224,7 @@ static ssize_t lttng_event_function_attr_create_from_payload( { const char *name; struct lttng_payload_view name_view = - lttng_payload_view_from_view(view, offset, - comm->symbol_name_len); + lttng_payload_view_from_view(view, offset, comm->symbol_name_len); if (!lttng_payload_view_is_valid(&name_view)) { ret = -1; @@ -242,14 +233,13 @@ static ssize_t lttng_event_function_attr_create_from_payload( name = name_view.buffer.data; - if (!lttng_buffer_view_contains_string(&name_view.buffer, name, - comm->symbol_name_len)) { + if (!lttng_buffer_view_contains_string( + &name_view.buffer, name, comm->symbol_name_len)) { ret = -1; goto end; } - ret = lttng_strncpy(local_attr->symbol_name, name, - sizeof(local_attr->symbol_name)); + ret = lttng_strncpy(local_attr->symbol_name, name, sizeof(local_attr->symbol_name)); if (ret) { ret = -1; goto end; @@ -259,26 +249,25 @@ static ssize_t lttng_event_function_attr_create_from_payload( } *function_attr = local_attr; - local_attr = NULL; + local_attr = nullptr; ret = offset; end: free(local_attr); return ret; } -static ssize_t lttng_event_exclusions_create_from_payload( - struct lttng_payload_view *view, - uint32_t count, - struct lttng_event_exclusion **exclusions) +static ssize_t lttng_event_exclusions_create_from_payload(struct lttng_payload_view *view, + uint32_t count, + struct lttng_event_exclusion **exclusions) { ssize_t ret, offset = 0; - size_t size = (count * LTTNG_SYMBOL_NAME_LEN); + const size_t size = (count * LTTNG_SYMBOL_NAME_LEN); uint32_t i; const struct lttng_event_exclusion_comm *comm; struct lttng_event_exclusion *local_exclusions; - local_exclusions = (struct lttng_event_exclusion *) zmalloc( - sizeof(struct lttng_event_exclusion) + size); + local_exclusions = + zmalloc(sizeof(struct lttng_event_exclusion) + size); if (!local_exclusions) { ret = -1; goto end; @@ -290,8 +279,7 @@ static ssize_t lttng_event_exclusions_create_from_payload( const char *string; struct lttng_buffer_view string_view; const struct lttng_buffer_view comm_view = - lttng_buffer_view_from_view(&view->buffer, - offset, sizeof(*comm)); + lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm)); if (!lttng_buffer_view_is_valid(&comm_view)) { ret = -1; @@ -301,8 +289,7 @@ static ssize_t lttng_event_exclusions_create_from_payload( comm = (typeof(comm)) comm_view.data; offset += sizeof(*comm); - string_view = lttng_buffer_view_from_view( - &view->buffer, offset, comm->len); + string_view = lttng_buffer_view_from_view(&view->buffer, offset, comm->len); if (!lttng_buffer_view_is_valid(&string_view)) { ret = -1; @@ -311,14 +298,14 @@ static ssize_t lttng_event_exclusions_create_from_payload( string = string_view.data; - if (!lttng_buffer_view_contains_string( - &string_view, string, comm->len)) { + if (!lttng_buffer_view_contains_string(&string_view, string, comm->len)) { ret = -1; goto end; } - ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(local_exclusions, i), string, - sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(local_exclusions, i))); + ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(local_exclusions, i), + string, + sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(local_exclusions, i))); if (ret) { ret = -1; goto end; @@ -328,7 +315,7 @@ static ssize_t lttng_event_exclusions_create_from_payload( } *exclusions = local_exclusions; - local_exclusions = NULL; + local_exclusions = nullptr; ret = offset; end: free(local_exclusions); @@ -336,21 +323,20 @@ end: } ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, - struct lttng_event **out_event, - struct lttng_event_exclusion **out_exclusion, - char **out_filter_expression, - struct lttng_bytecode **out_bytecode) + struct lttng_event **out_event, + struct lttng_event_exclusion **out_exclusion, + char **out_filter_expression, + struct lttng_bytecode **out_bytecode) { ssize_t ret, offset = 0; - struct lttng_event *local_event = NULL; - struct lttng_event_exclusion *local_exclusions = NULL; - struct lttng_bytecode *local_bytecode = NULL; - char *local_filter_expression = NULL; + struct lttng_event *local_event = nullptr; + struct lttng_event_exclusion *local_exclusions = nullptr; + struct lttng_bytecode *local_bytecode = nullptr; + char *local_filter_expression = nullptr; const struct lttng_event_comm *event_comm; - struct lttng_event_function_attr *local_function_attr = NULL; - struct lttng_event_probe_attr *local_probe_attr = NULL; - struct lttng_userspace_probe_location *local_userspace_probe_location = - NULL; + struct lttng_event_function_attr *local_function_attr = nullptr; + struct lttng_event_probe_attr *local_probe_attr = nullptr; + struct lttng_userspace_probe_location *local_userspace_probe_location = nullptr; /* * Only event is obligatory, the other output argument are optional and @@ -361,8 +347,7 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, { struct lttng_payload_view comm_view = - lttng_payload_view_from_view(view, offset, - sizeof(*event_comm)); + lttng_payload_view_from_view(view, offset, sizeof(*event_comm)); if (!lttng_payload_view_is_valid(&comm_view)) { ret = -1; @@ -375,7 +360,7 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, } local_event = lttng_event_create(); - if (local_event == NULL) { + if (local_event == nullptr) { ret = -1; goto end; } @@ -383,15 +368,14 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, local_event->type = (enum lttng_event_type) event_comm->event_type; local_event->loglevel_type = (enum lttng_loglevel_type) event_comm->loglevel_type; local_event->loglevel = event_comm->loglevel; - local_event->enabled = event_comm->enabled; + local_event->enabled = !!event_comm->enabled; local_event->pid = event_comm->pid; local_event->flags = (enum lttng_event_flag) event_comm->flags; { const char *name; const struct lttng_buffer_view name_view = - lttng_buffer_view_from_view(&view->buffer, - offset, event_comm->name_len); + lttng_buffer_view_from_view(&view->buffer, offset, event_comm->name_len); if (!lttng_buffer_view_is_valid(&name_view)) { ret = -1; @@ -400,14 +384,12 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, name = (const char *) name_view.data; - if (!lttng_buffer_view_contains_string( - &name_view, name, event_comm->name_len)) { + if (!lttng_buffer_view_contains_string(&name_view, name, event_comm->name_len)) { ret = -1; goto end; } - ret = lttng_strncpy(local_event->name, name, - sizeof(local_event->name)); + ret = lttng_strncpy(local_event->name, name, sizeof(local_event->name)); if (ret) { ret = -1; goto end; @@ -423,16 +405,15 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, { struct lttng_payload_view exclusions_view = - lttng_payload_view_from_view( - view, offset, -1); + lttng_payload_view_from_view(view, offset, -1); if (!lttng_payload_view_is_valid(&exclusions_view)) { ret = -1; goto end; } - ret = lttng_event_exclusions_create_from_payload(&exclusions_view, - event_comm->exclusion_count, &local_exclusions); + ret = lttng_event_exclusions_create_from_payload( + &exclusions_view, event_comm->exclusion_count, &local_exclusions); if (ret < 0) { ret = -1; goto end; @@ -460,9 +441,8 @@ deserialize_filter_expression: { const char *filter_expression_buffer; - struct lttng_buffer_view filter_expression_view = - lttng_buffer_view_from_view(&view->buffer, offset, - event_comm->filter_expression_len); + struct lttng_buffer_view filter_expression_view = lttng_buffer_view_from_view( + &view->buffer, offset, event_comm->filter_expression_len); if (!lttng_buffer_view_is_valid(&filter_expression_view)) { ret = -1; @@ -472,15 +452,14 @@ deserialize_filter_expression: filter_expression_buffer = filter_expression_view.data; if (!lttng_buffer_view_contains_string(&filter_expression_view, - filter_expression_buffer, - event_comm->filter_expression_len)) { + filter_expression_buffer, + event_comm->filter_expression_len)) { ret = -1; goto end; } - local_filter_expression = lttng_strndup( - filter_expression_buffer, - event_comm->filter_expression_len); + local_filter_expression = + lttng_strndup(filter_expression_buffer, event_comm->filter_expression_len); if (!local_filter_expression) { ret = -1; goto end; @@ -502,25 +481,21 @@ deserialize_filter_expression: /* Bytecode */ { struct lttng_payload_view bytecode_view = - lttng_payload_view_from_view(view, offset, - event_comm->bytecode_len); + lttng_payload_view_from_view(view, offset, event_comm->bytecode_len); if (!lttng_payload_view_is_valid(&bytecode_view)) { ret = -1; goto end; } - local_bytecode = (struct lttng_bytecode *) zmalloc( - event_comm->bytecode_len); + local_bytecode = zmalloc(event_comm->bytecode_len); if (!local_bytecode) { ret = -1; goto end; } - memcpy(local_bytecode, bytecode_view.buffer.data, - event_comm->bytecode_len); - if ((local_bytecode->len + sizeof(*local_bytecode)) != - event_comm->bytecode_len) { + memcpy(local_bytecode, bytecode_view.buffer.data, event_comm->bytecode_len); + if ((local_bytecode->len + sizeof(*local_bytecode)) != event_comm->bytecode_len) { ret = -1; goto end; } @@ -535,9 +510,8 @@ deserialize_event_type_payload: /* Fallthrough */ case LTTNG_EVENT_PROBE: { - struct lttng_payload_view probe_attr_view = - lttng_payload_view_from_view(view, offset, - event_comm->lttng_event_probe_attr_len); + struct lttng_payload_view probe_attr_view = lttng_payload_view_from_view( + view, offset, event_comm->lttng_event_probe_attr_len); if (event_comm->lttng_event_probe_attr_len == 0) { ret = -1; @@ -549,25 +523,23 @@ deserialize_event_type_payload: goto end; } - ret = lttng_event_probe_attr_create_from_payload( - &probe_attr_view, &local_probe_attr); + ret = lttng_event_probe_attr_create_from_payload(&probe_attr_view, + &local_probe_attr); if (ret < 0 || ret != event_comm->lttng_event_probe_attr_len) { ret = -1; goto end; } /* Copy to the local event. */ - memcpy(&local_event->attr.probe, local_probe_attr, - sizeof(local_event->attr.probe)); + memcpy(&local_event->attr.probe, local_probe_attr, sizeof(local_event->attr.probe)); offset += ret; break; } case LTTNG_EVENT_FUNCTION_ENTRY: { - struct lttng_payload_view function_attr_view = - lttng_payload_view_from_view(view, offset, - event_comm->lttng_event_function_attr_len); + struct lttng_payload_view function_attr_view = lttng_payload_view_from_view( + view, offset, event_comm->lttng_event_function_attr_len); if (event_comm->lttng_event_function_attr_len == 0) { ret = -1; @@ -579,16 +551,17 @@ deserialize_event_type_payload: goto end; } - ret = lttng_event_function_attr_create_from_payload( - &function_attr_view, &local_function_attr); + ret = lttng_event_function_attr_create_from_payload(&function_attr_view, + &local_function_attr); if (ret < 0 || ret != event_comm->lttng_event_function_attr_len) { ret = -1; goto end; } /* Copy to the local event. */ - memcpy(&local_event->attr.ftrace, local_function_attr, - sizeof(local_event->attr.ftrace)); + memcpy(&local_event->attr.ftrace, + local_function_attr, + sizeof(local_event->attr.ftrace)); offset += ret; @@ -597,23 +570,21 @@ deserialize_event_type_payload: case LTTNG_EVENT_USERSPACE_PROBE: { struct lttng_payload_view userspace_probe_location_view = - lttng_payload_view_from_view(view, offset, - event_comm->userspace_probe_location_len); + lttng_payload_view_from_view( + view, offset, event_comm->userspace_probe_location_len); if (event_comm->userspace_probe_location_len == 0) { ret = -1; goto end; } - if (!lttng_payload_view_is_valid( - &userspace_probe_location_view)) { + if (!lttng_payload_view_is_valid(&userspace_probe_location_view)) { ret = -1; goto end; } ret = lttng_userspace_probe_location_create_from_payload( - &userspace_probe_location_view, - &local_userspace_probe_location); + &userspace_probe_location_view, &local_userspace_probe_location); if (ret < 0) { WARN("Failed to create a userspace probe location from the received buffer"); ret = -1; @@ -621,14 +592,17 @@ deserialize_event_type_payload: } if (ret != event_comm->userspace_probe_location_len) { - WARN("Userspace probe location from the received buffer is not the advertised length: header length = %" PRIu32 ", payload length = %zd", event_comm->userspace_probe_location_len, ret); + WARN("Userspace probe location from the received buffer is not the advertised length: header length = %" PRIu32 + ", payload length = %zd", + event_comm->userspace_probe_location_len, + ret); ret = -1; goto end; } /* Attach the probe location to the event. */ - ret = lttng_event_set_userspace_probe_location( - local_event, local_userspace_probe_location); + ret = lttng_event_set_userspace_probe_location(local_event, + local_userspace_probe_location); if (ret) { ret = LTTNG_ERR_PROBE_LOCATION_INVAL; goto end; @@ -638,7 +612,7 @@ deserialize_event_type_payload: * Userspace probe location object ownership transfered to the * event object. */ - local_userspace_probe_location = NULL; + local_userspace_probe_location = nullptr; offset += event_comm->userspace_probe_location_len; break; } @@ -659,21 +633,21 @@ deserialize_event_type_payload: /* Transfer ownership to the caller. */ *out_event = local_event; - local_event = NULL; + local_event = nullptr; if (out_bytecode) { *out_bytecode = local_bytecode; - local_bytecode = NULL; + local_bytecode = nullptr; } if (out_exclusion) { *out_exclusion = local_exclusions; - local_exclusions = NULL; + local_exclusions = nullptr; } if (out_filter_expression) { *out_filter_expression = local_filter_expression; - local_filter_expression = NULL; + local_filter_expression = nullptr; } ret = offset; @@ -689,12 +663,12 @@ end: } int lttng_event_serialize(const struct lttng_event *event, - unsigned int exclusion_count, - char **exclusion_list, - char *filter_expression, - size_t bytecode_len, - struct lttng_bytecode *bytecode, - struct lttng_payload *payload) + unsigned int exclusion_count, + const char *const *exclusion_list, + const char *filter_expression, + size_t bytecode_len, + struct lttng_bytecode *bytecode, + struct lttng_payload *payload) { int ret; unsigned int i; @@ -743,31 +717,28 @@ int lttng_event_serialize(const struct lttng_event *event, event_comm.flags = (int32_t) event->flags; if (filter_expression) { - event_comm.filter_expression_len = - strlen(filter_expression) + 1; + event_comm.filter_expression_len = strlen(filter_expression) + 1; } /* Header */ - ret = lttng_dynamic_buffer_append( - &payload->buffer, &event_comm, sizeof(event_comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &event_comm, sizeof(event_comm)); if (ret) { goto end; } /* Event name */ - ret = lttng_dynamic_buffer_append( - &payload->buffer, event->name, name_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, event->name, name_len); if (ret) { goto end; } /* Exclusions */ for (i = 0; i < exclusion_count; i++) { - const size_t exclusion_len = lttng_strnlen( - *(exclusion_list + i), LTTNG_SYMBOL_NAME_LEN); - const struct lttng_event_exclusion_comm exclusion_header = { - .len = (uint32_t) exclusion_len + 1, - }; + const size_t exclusion_len = + lttng_strnlen(*(exclusion_list + i), LTTNG_SYMBOL_NAME_LEN); + struct lttng_event_exclusion_comm exclusion_header = {}; + + exclusion_header.len = (uint32_t) exclusion_len + 1; if (exclusion_len == LTTNG_SYMBOL_NAME_LEN) { /* Exclusion is not NULL-terminated. */ @@ -775,14 +746,14 @@ int lttng_event_serialize(const struct lttng_event *event, goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, - &exclusion_header, sizeof(exclusion_header)); + ret = lttng_dynamic_buffer_append( + &payload->buffer, &exclusion_header, sizeof(exclusion_header)); if (ret) { goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, - *(exclusion_list + i), exclusion_len + 1); + ret = lttng_dynamic_buffer_append( + &payload->buffer, *(exclusion_list + i), exclusion_len + 1); if (ret) { goto end; } @@ -790,9 +761,8 @@ int lttng_event_serialize(const struct lttng_event *event, /* Filter expression and its bytecode */ if (filter_expression) { - ret = lttng_dynamic_buffer_append(&payload->buffer, - filter_expression, - event_comm.filter_expression_len); + ret = lttng_dynamic_buffer_append( + &payload->buffer, filter_expression, event_comm.filter_expression_len); if (ret) { goto end; } @@ -802,8 +772,7 @@ int lttng_event_serialize(const struct lttng_event *event, * for listing. */ if (bytecode) { - ret = lttng_dynamic_buffer_append(&payload->buffer, - bytecode, bytecode_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, bytecode, bytecode_len); if (ret) { goto end; } @@ -823,32 +792,28 @@ int lttng_event_serialize(const struct lttng_event *event, goto end; } - header = (struct lttng_event_comm *) ((char *) payload->buffer.data + - header_offset); - header->lttng_event_probe_attr_len = - payload->buffer.size - size_before_payload; + header = + (struct lttng_event_comm *) ((char *) payload->buffer.data + header_offset); + header->lttng_event_probe_attr_len = payload->buffer.size - size_before_payload; break; case LTTNG_EVENT_FUNCTION_ENTRY: - ret = lttng_event_function_attr_serialize( - &event->attr.ftrace, payload); + ret = lttng_event_function_attr_serialize(&event->attr.ftrace, payload); if (ret) { ret = -1; goto end; } /* Update the lttng_event_function_attr len. */ - header = (struct lttng_event_comm *) ((char *) payload->buffer.data + - header_offset); - header->lttng_event_function_attr_len = - payload->buffer.size - size_before_payload; + header = + (struct lttng_event_comm *) ((char *) payload->buffer.data + header_offset); + header->lttng_event_function_attr_len = payload->buffer.size - size_before_payload; break; case LTTNG_EVENT_USERSPACE_PROBE: { const struct lttng_event_extended *ev_ext = - (const struct lttng_event_extended *) - event->extended.ptr; + (const struct lttng_event_extended *) event->extended.ptr; assert(event->extended.ptr); assert(ev_ext->probe_location); @@ -859,8 +824,8 @@ int lttng_event_serialize(const struct lttng_event *event, * lttng_userspace_probe_location_serialize returns the * number of bytes that were appended to the buffer. */ - ret = lttng_userspace_probe_location_serialize( - ev_ext->probe_location, payload); + ret = lttng_userspace_probe_location_serialize(ev_ext->probe_location, + payload); if (ret < 0) { goto end; } @@ -871,7 +836,7 @@ int lttng_event_serialize(const struct lttng_event *event, header = (struct lttng_event_comm *) ((char *) payload->buffer.data + header_offset); header->userspace_probe_location_len = - payload->buffer.size - size_before_payload; + payload->buffer.size - size_before_payload; } break; } @@ -888,16 +853,15 @@ end: return ret; } -static ssize_t lttng_event_context_app_populate_from_payload( - const struct lttng_payload_view *view, - struct lttng_event_context *event_ctx) +static ssize_t lttng_event_context_app_populate_from_payload(const struct lttng_payload_view *view, + struct lttng_event_context *event_ctx) { ssize_t ret, offset = 0; const struct lttng_event_context_app_comm *comm; - char *provider_name = NULL, *context_name = NULL; + char *provider_name = nullptr, *context_name = nullptr; size_t provider_name_len, context_name_len; - const struct lttng_buffer_view comm_view = lttng_buffer_view_from_view( - &view->buffer, offset, sizeof(*comm)); + const struct lttng_buffer_view comm_view = + lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm)); assert(event_ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT); @@ -924,9 +888,7 @@ static ssize_t lttng_event_context_app_populate_from_payload( { const char *name; const struct lttng_buffer_view provider_name_view = - lttng_buffer_view_from_view(&view->buffer, - offset, - provider_name_len); + lttng_buffer_view_from_view(&view->buffer, offset, provider_name_len); if (!lttng_buffer_view_is_valid(&provider_name_view)) { ret = -1; @@ -935,8 +897,8 @@ static ssize_t lttng_event_context_app_populate_from_payload( name = provider_name_view.data; - if (!lttng_buffer_view_contains_string(&provider_name_view, - name, provider_name_len)) { + if (!lttng_buffer_view_contains_string( + &provider_name_view, name, provider_name_len)) { ret = -1; goto end; } @@ -953,9 +915,7 @@ static ssize_t lttng_event_context_app_populate_from_payload( { const char *name; const struct lttng_buffer_view context_name_view = - lttng_buffer_view_from_view( - &view->buffer, offset, - context_name_len); + lttng_buffer_view_from_view(&view->buffer, offset, context_name_len); if (!lttng_buffer_view_is_valid(&context_name_view)) { ret = -1; @@ -964,8 +924,7 @@ static ssize_t lttng_event_context_app_populate_from_payload( name = context_name_view.data; - if (!lttng_buffer_view_contains_string(&context_name_view, name, - context_name_len)) { + if (!lttng_buffer_view_contains_string(&context_name_view, name, context_name_len)) { ret = -1; goto end; } @@ -982,8 +941,8 @@ static ssize_t lttng_event_context_app_populate_from_payload( /* Transfer ownership of the strings */ event_ctx->u.app_ctx.provider_name = provider_name; event_ctx->u.app_ctx.ctx_name = context_name; - provider_name = NULL; - context_name = NULL; + provider_name = nullptr; + context_name = nullptr; ret = offset; end: @@ -993,21 +952,20 @@ end: return ret; } -static ssize_t lttng_event_context_perf_counter_populate_from_payload( - const struct lttng_payload_view *view, - struct lttng_event_context *event_ctx) +static ssize_t +lttng_event_context_perf_counter_populate_from_payload(const struct lttng_payload_view *view, + struct lttng_event_context *event_ctx) { int ret; ssize_t consumed, offset = 0; const struct lttng_event_context_perf_counter_comm *comm; size_t name_len; - const struct lttng_buffer_view comm_view = lttng_buffer_view_from_view( - &view->buffer, offset, sizeof(*comm)); + const struct lttng_buffer_view comm_view = + lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm)); assert(event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_COUNTER || - event_ctx->ctx == - LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER || - event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER); + event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER || + event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER); if (!lttng_buffer_view_is_valid(&comm_view)) { consumed = -1; @@ -1022,9 +980,7 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload( { const char *name; const struct lttng_buffer_view provider_name_view = - lttng_buffer_view_from_view( - &view->buffer, offset, - name_len); + lttng_buffer_view_from_view(&view->buffer, offset, name_len); if (!lttng_buffer_view_is_valid(&provider_name_view)) { consumed = -1; @@ -1033,14 +989,14 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload( name = provider_name_view.data; - if (!lttng_buffer_view_contains_string( - &provider_name_view, name, name_len)) { + if (!lttng_buffer_view_contains_string(&provider_name_view, name, name_len)) { consumed = -1; goto end; } - ret = lttng_strncpy(event_ctx->u.perf_counter.name, name, - sizeof(event_ctx->u.perf_counter.name)); + ret = lttng_strncpy(event_ctx->u.perf_counter.name, + name, + sizeof(event_ctx->u.perf_counter.name)); if (ret) { consumed = -1; goto end; @@ -1057,15 +1013,14 @@ end: return consumed; } -ssize_t lttng_event_context_create_from_payload( - struct lttng_payload_view *view, - struct lttng_event_context **event_ctx) +ssize_t lttng_event_context_create_from_payload(struct lttng_payload_view *view, + struct lttng_event_context **event_ctx) { ssize_t ret, offset = 0; const struct lttng_event_context_comm *comm; - struct lttng_event_context *local_context = NULL; - struct lttng_buffer_view comm_view = lttng_buffer_view_from_view( - &view->buffer, offset, sizeof(*comm)); + struct lttng_event_context *local_context = nullptr; + struct lttng_buffer_view comm_view = + lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm)); assert(event_ctx); assert(view); @@ -1078,8 +1033,7 @@ ssize_t lttng_event_context_create_from_payload( comm = (typeof(comm)) comm_view.data; offset += sizeof(*comm); - local_context = (struct lttng_event_context *) - zmalloc(sizeof(*local_context)); + local_context = zmalloc(); if (!local_context) { ret = -1; goto end; @@ -1089,18 +1043,18 @@ ssize_t lttng_event_context_create_from_payload( { struct lttng_payload_view subtype_view = - lttng_payload_view_from_view(view, offset, -1); + lttng_payload_view_from_view(view, offset, -1); switch (local_context->ctx) { case LTTNG_EVENT_CONTEXT_APP_CONTEXT: - ret = lttng_event_context_app_populate_from_payload( - &subtype_view, local_context); + ret = lttng_event_context_app_populate_from_payload(&subtype_view, + local_context); break; case LTTNG_EVENT_CONTEXT_PERF_COUNTER: case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER: case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER: - ret = lttng_event_context_perf_counter_populate_from_payload( - &subtype_view, local_context); + ret = lttng_event_context_perf_counter_populate_from_payload(&subtype_view, + local_context); break; default: /* Nothing else to deserialize. */ @@ -1116,7 +1070,7 @@ ssize_t lttng_event_context_create_from_payload( offset += ret; *event_ctx = local_context; - local_context = NULL; + local_context = nullptr; ret = offset; end: @@ -1124,9 +1078,8 @@ end: return ret; } -static int lttng_event_context_app_serialize( - struct lttng_event_context *context, - struct lttng_payload *payload) +static int lttng_event_context_app_serialize(struct lttng_event_context *context, + struct lttng_payload *payload) { int ret; struct lttng_event_context_app_comm comm = {}; @@ -1167,22 +1120,19 @@ static int lttng_event_context_app_serialize( comm.ctx_name_len = ctx_len; /* Header */ - ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, - sizeof(comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm)); if (ret) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, provider_name, - provider_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, provider_name, provider_len); if (ret) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, ctx_name, - ctx_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, ctx_name, ctx_len); if (ret) { ret = -1; goto end; @@ -1192,9 +1142,8 @@ end: return ret; } -static int lttng_event_context_perf_counter_serialize( - struct lttng_event_perf_counter_ctx *context, - struct lttng_payload *payload) +static int lttng_event_context_perf_counter_serialize(struct lttng_event_perf_counter_ctx *context, + struct lttng_payload *payload) { int ret; struct lttng_event_context_perf_counter_comm comm = {}; @@ -1215,15 +1164,13 @@ static int lttng_event_context_perf_counter_serialize( comm.name_len += 1; /* Header */ - ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, - sizeof(comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm)); if (ret) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, context->name, - comm.name_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, context->name, comm.name_len); if (ret) { ret = -1; goto end; @@ -1234,10 +1181,12 @@ end: } int lttng_event_context_serialize(struct lttng_event_context *context, - struct lttng_payload *payload) + struct lttng_payload *payload) { int ret; - struct lttng_event_context_comm context_comm = { 0 }; + struct lttng_event_context_comm context_comm; + + context_comm.type = 0; assert(context); assert(payload); @@ -1245,8 +1194,7 @@ int lttng_event_context_serialize(struct lttng_event_context *context, context_comm.type = (uint32_t) context->ctx; /* Header */ - ret = lttng_dynamic_buffer_append( - &payload->buffer, &context_comm, sizeof(context_comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &context_comm, sizeof(context_comm)); if (ret) { goto end; } @@ -1258,8 +1206,7 @@ int lttng_event_context_serialize(struct lttng_event_context *context, case LTTNG_EVENT_CONTEXT_PERF_COUNTER: case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER: case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER: - ret = lttng_event_context_perf_counter_serialize( - &context->u.perf_counter, payload); + ret = lttng_event_context_perf_counter_serialize(&context->u.perf_counter, payload); break; default: /* Nothing else to serialize. */ @@ -1293,33 +1240,30 @@ void lttng_event_context_destroy(struct lttng_event_context *context) * the extension field of the lttng_event struct and simply copies what it can * to the internal struct lttng_event of a lttng_event_field. */ -static void lttng_event_field_populate_lttng_event_from_event( - const struct lttng_event *src, struct lttng_event *destination) +static void lttng_event_field_populate_lttng_event_from_event(const struct lttng_event *src, + struct lttng_event *destination) { memcpy(destination, src, sizeof(*destination)); /* Remove all possible dynamic data from the destination event rule. */ - destination->extended.ptr = NULL; + destination->extended.ptr = nullptr; } -ssize_t lttng_event_field_create_from_payload( - struct lttng_payload_view *view, - struct lttng_event_field **field) +ssize_t lttng_event_field_create_from_payload(struct lttng_payload_view *view, + struct lttng_event_field **field) { ssize_t ret, offset = 0; - struct lttng_event_field *local_event_field = NULL; - struct lttng_event *event = NULL; + struct lttng_event_field *local_event_field = nullptr; + struct lttng_event *event = nullptr; const struct lttng_event_field_comm *comm; - const char* name = NULL; + const char *name = nullptr; assert(field); assert(view); { const struct lttng_buffer_view comm_view = - lttng_buffer_view_from_view( - &view->buffer, offset, - sizeof(*comm)); + lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm)); if (!lttng_buffer_view_is_valid(&comm_view)) { ret = -1; @@ -1331,8 +1275,7 @@ ssize_t lttng_event_field_create_from_payload( offset += sizeof(*comm); } - local_event_field = (struct lttng_event_field *) - zmalloc(sizeof(*local_event_field)); + local_event_field = zmalloc(); if (!local_event_field) { ret = -1; goto end; @@ -1344,9 +1287,7 @@ ssize_t lttng_event_field_create_from_payload( /* Field name */ { const struct lttng_buffer_view name_view = - lttng_buffer_view_from_view( - &view->buffer, offset, - comm->name_len); + lttng_buffer_view_from_view(&view->buffer, offset, comm->name_len); if (!lttng_buffer_view_is_valid(&name_view)) { ret = -1; @@ -1355,8 +1296,7 @@ ssize_t lttng_event_field_create_from_payload( name = name_view.data; - if (!lttng_buffer_view_contains_string(&name_view, - name_view.data, comm->name_len)) { + if (!lttng_buffer_view_contains_string(&name_view, name_view.data, comm->name_len)) { ret = -1; goto end; } @@ -1373,17 +1313,15 @@ ssize_t lttng_event_field_create_from_payload( /* Event */ { struct lttng_payload_view event_view = - lttng_payload_view_from_view( - view, offset, - comm->event_len); + lttng_payload_view_from_view(view, offset, comm->event_len); if (!lttng_payload_view_is_valid(&event_view)) { ret = -1; goto end; } - ret = lttng_event_create_from_payload(&event_view, &event, NULL, - NULL, NULL); + ret = lttng_event_create_from_payload( + &event_view, &event, nullptr, nullptr, nullptr); if (ret != comm->event_len) { ret = -1; goto end; @@ -1395,17 +1333,16 @@ ssize_t lttng_event_field_create_from_payload( assert(name); assert(event); - if (lttng_strncpy(local_event_field->field_name, name, - sizeof(local_event_field->field_name))) { + if (lttng_strncpy( + local_event_field->field_name, name, sizeof(local_event_field->field_name))) { ret = -1; goto end; } - lttng_event_field_populate_lttng_event_from_event( - event, &local_event_field->event); + lttng_event_field_populate_lttng_event_from_event(event, &local_event_field->event); *field = local_event_field; - local_event_field = NULL; + local_event_field = nullptr; ret = offset; end: lttng_event_destroy(event); @@ -1414,7 +1351,7 @@ end: } int lttng_event_field_serialize(const struct lttng_event_field *field, - struct lttng_payload *payload) + struct lttng_payload *payload) { int ret; size_t header_offset, size_before_event; @@ -1439,44 +1376,39 @@ int lttng_event_field_serialize(const struct lttng_event_field *field, name_len += 1; event_field_comm.type = field->type; - event_field_comm.nowrite = (uint8_t)field->nowrite; + event_field_comm.nowrite = (uint8_t) field->nowrite; event_field_comm.name_len = name_len; /* Header */ ret = lttng_dynamic_buffer_append( - &payload->buffer, &event_field_comm, - sizeof(event_field_comm)); + &payload->buffer, &event_field_comm, sizeof(event_field_comm)); if (ret) { goto end; } /* Field name */ - ret = lttng_dynamic_buffer_append(&payload->buffer, field->field_name, - name_len); + ret = lttng_dynamic_buffer_append(&payload->buffer, field->field_name, name_len); if (ret) { goto end; } size_before_event = payload->buffer.size; - ret = lttng_event_serialize( - &field->event, 0, NULL, NULL, 0, 0, payload); + ret = lttng_event_serialize(&field->event, 0, nullptr, nullptr, 0, nullptr, payload); if (ret) { ret = -1; goto end; } /* Update the event len. */ - header = (struct lttng_event_field_comm *) - ((char *) payload->buffer.data + - header_offset); + header = (struct lttng_event_field_comm *) ((char *) payload->buffer.data + header_offset); header->event_len = payload->buffer.size - size_before_event; end: return ret; } -static enum lttng_error_code compute_flattened_size( - struct lttng_dynamic_pointer_array *events, size_t *size) +static enum lttng_error_code compute_flattened_size(struct lttng_dynamic_pointer_array *events, + size_t *size) { enum lttng_error_code ret_code; int ret = 0; @@ -1495,16 +1427,14 @@ static enum lttng_error_code compute_flattened_size( for (i = 0; i < event_count; i++) { int probe_storage_req = 0; - const struct event_list_element *element = (const struct event_list_element *) - lttng_dynamic_pointer_array_get_pointer( - events, i); - const struct lttng_userspace_probe_location *location = NULL; + const struct event_list_element *element = + (const struct event_list_element *) lttng_dynamic_pointer_array_get_pointer( + events, i); + const struct lttng_userspace_probe_location *location = nullptr; - location = lttng_event_get_userspace_probe_location( - element->event); + location = lttng_event_get_userspace_probe_location(element->event); if (location) { - ret = lttng_userspace_probe_location_flatten( - location, NULL); + ret = lttng_userspace_probe_location_flatten(location, nullptr); if (ret < 0) { ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; goto end; @@ -1518,8 +1448,7 @@ static enum lttng_error_code compute_flattened_size( } if (element->exclusions) { - storage_req += element->exclusions->count * - LTTNG_SYMBOL_NAME_LEN; + storage_req += element->exclusions->count * LTTNG_SYMBOL_NAME_LEN; } /* Padding to ensure the flat probe is aligned. */ @@ -1556,9 +1485,8 @@ end: * - padding to align to 64-bits * - flattened version of userspace_probe_location */ -static enum lttng_error_code flatten_lttng_events( - struct lttng_dynamic_pointer_array *events, - struct lttng_event **flattened_events) +static enum lttng_error_code flatten_lttng_events(struct lttng_dynamic_pointer_array *events, + struct lttng_event **flattened_events) { enum lttng_error_code ret_code; int ret, i; @@ -1581,8 +1509,7 @@ static enum lttng_error_code flatten_lttng_events( * We must ensure that "local_flattened_events" is never resized so as * to preserve the validity of the flattened objects. */ - ret = lttng_dynamic_buffer_set_capacity( - &local_flattened_events, storage_req); + ret = lttng_dynamic_buffer_set_capacity(&local_flattened_events, storage_req); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1590,17 +1517,17 @@ static enum lttng_error_code flatten_lttng_events( /* Start by laying the struct lttng_event */ for (i = 0; i < nb_events; i++) { - const struct event_list_element *element = (const struct event_list_element *) - lttng_dynamic_pointer_array_get_pointer( - events, i); + const struct event_list_element *element = + (const struct event_list_element *) lttng_dynamic_pointer_array_get_pointer( + events, i); if (!element) { ret_code = LTTNG_ERR_FATAL; goto end; } - ret = lttng_dynamic_buffer_append(&local_flattened_events, - element->event, sizeof(struct lttng_event)); + ret = lttng_dynamic_buffer_append( + &local_flattened_events, element->event, sizeof(struct lttng_event)); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1608,21 +1535,23 @@ static enum lttng_error_code flatten_lttng_events( } for (i = 0; i < nb_events; i++) { - const struct event_list_element *element = (const struct event_list_element *) - lttng_dynamic_pointer_array_get_pointer(events, i); - struct lttng_event *event = (struct lttng_event *) - (local_flattened_events.data + (sizeof(struct lttng_event) * i)); + const struct event_list_element *element = + (const struct event_list_element *) lttng_dynamic_pointer_array_get_pointer( + events, i); + struct lttng_event *event = + (struct lttng_event *) (local_flattened_events.data + + (sizeof(struct lttng_event) * i)); struct lttng_event_extended *event_extended = - (struct lttng_event_extended *) - (local_flattened_events.data + local_flattened_events.size); - const struct lttng_userspace_probe_location *location = NULL; + (struct lttng_event_extended *) (local_flattened_events.data + + local_flattened_events.size); + const struct lttng_userspace_probe_location *location = nullptr; assert(element); /* Insert struct lttng_event_extended. */ ret = lttng_dynamic_buffer_set_size(&local_flattened_events, - local_flattened_events.size + - sizeof(*event_extended)); + local_flattened_events.size + + sizeof(*event_extended)); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1634,11 +1563,9 @@ static enum lttng_error_code flatten_lttng_events( const size_t len = strlen(element->filter_expression) + 1; event_extended->filter_expression = - local_flattened_events.data + - local_flattened_events.size; + local_flattened_events.data + local_flattened_events.size; ret = lttng_dynamic_buffer_append( - &local_flattened_events, - element->filter_expression, len); + &local_flattened_events, element->filter_expression, len); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1647,17 +1574,14 @@ static enum lttng_error_code flatten_lttng_events( /* Insert exclusions. */ if (element->exclusions) { - event_extended->exclusions.count = - element->exclusions->count; + event_extended->exclusions.count = element->exclusions->count; event_extended->exclusions.strings = - local_flattened_events.data + - local_flattened_events.size; + local_flattened_events.data + local_flattened_events.size; - ret = lttng_dynamic_buffer_append( - &local_flattened_events, - element->exclusions->names, - element->exclusions->count * - LTTNG_SYMBOL_NAME_LEN); + ret = lttng_dynamic_buffer_append(&local_flattened_events, + element->exclusions->names, + element->exclusions->count * + LTTNG_SYMBOL_NAME_LEN); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1666,20 +1590,20 @@ static enum lttng_error_code flatten_lttng_events( /* Insert padding to align to 64-bits. */ ret = lttng_dynamic_buffer_set_size(&local_flattened_events, - lttng_align_ceil(local_flattened_events.size, - sizeof(uint64_t))); + lttng_align_ceil(local_flattened_events.size, + sizeof(uint64_t))); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; } - location = lttng_event_get_userspace_probe_location( - element->event); + location = lttng_event_get_userspace_probe_location(element->event); if (location) { - event_extended->probe_location = (struct lttng_userspace_probe_location *) - (local_flattened_events.data + local_flattened_events.size); - ret = lttng_userspace_probe_location_flatten( - location, &local_flattened_events); + event_extended->probe_location = (struct lttng_userspace_probe_location + *) (local_flattened_events.data + + local_flattened_events.size); + ret = lttng_userspace_probe_location_flatten(location, + &local_flattened_events); if (ret < 0) { ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; goto end; @@ -1696,10 +1620,10 @@ end: return ret_code; } -static enum lttng_error_code event_list_create_from_payload( - struct lttng_payload_view *view, - unsigned int count, - struct lttng_dynamic_pointer_array *event_list) +static enum lttng_error_code +event_list_create_from_payload(struct lttng_payload_view *view, + unsigned int count, + struct lttng_dynamic_pointer_array *event_list) { enum lttng_error_code ret_code; int ret; @@ -1712,9 +1636,8 @@ static enum lttng_error_code event_list_create_from_payload( for (i = 0; i < count; i++) { ssize_t event_size; struct lttng_payload_view event_view = - lttng_payload_view_from_view(view, offset, -1); - struct event_list_element *element = - (struct event_list_element *) zmalloc(sizeof(*element)); + lttng_payload_view_from_view(view, offset, -1); + struct event_list_element *element = zmalloc(); if (!element) { ret_code = LTTNG_ERR_NOMEM; @@ -1725,8 +1648,7 @@ static enum lttng_error_code event_list_create_from_payload( * Lifetime and management of the object is now bound to the * array. */ - ret = lttng_dynamic_pointer_array_add_pointer( - event_list, element); + ret = lttng_dynamic_pointer_array_add_pointer(event_list, element); if (ret) { event_list_destructor(element); ret_code = LTTNG_ERR_NOMEM; @@ -1738,9 +1660,10 @@ static enum lttng_error_code event_list_create_from_payload( * care about it. */ event_size = lttng_event_create_from_payload(&event_view, - &element->event, - &element->exclusions, - &element->filter_expression, NULL); + &element->event, + &element->exclusions, + &element->filter_expression, + nullptr); if (event_size < 0) { ret_code = LTTNG_ERR_INVALID; goto end; @@ -1761,9 +1684,7 @@ end: } enum lttng_error_code lttng_events_create_and_flatten_from_payload( - struct lttng_payload_view *payload, - unsigned int count, - struct lttng_event **events) + struct lttng_payload_view *payload, unsigned int count, struct lttng_event **events) { enum lttng_error_code ret = LTTNG_OK; struct lttng_dynamic_pointer_array local_events; @@ -1773,10 +1694,9 @@ enum lttng_error_code lttng_events_create_and_flatten_from_payload( /* Deserialize the events. */ { struct lttng_payload_view events_view = - lttng_payload_view_from_view(payload, 0, -1); + lttng_payload_view_from_view(payload, 0, -1); - ret = event_list_create_from_payload( - &events_view, count, &local_events); + ret = event_list_create_from_payload(&events_view, count, &local_events); if (ret != LTTNG_OK) { goto end; } @@ -1792,9 +1712,9 @@ end: return ret; } -static enum lttng_error_code flatten_lttng_event_fields( - struct lttng_dynamic_pointer_array *event_fields, - struct lttng_event_field **flattened_event_fields) +static enum lttng_error_code +flatten_lttng_event_fields(struct lttng_dynamic_pointer_array *event_fields, + struct lttng_event_field **flattened_event_fields) { int ret, i; enum lttng_error_code ret_code; @@ -1823,8 +1743,7 @@ static enum lttng_error_code flatten_lttng_event_fields( * We must ensure that "local_flattened_event_fields" is never resized * so as to preserve the validity of the flattened objects. */ - ret = lttng_dynamic_buffer_set_capacity( - &local_flattened_event_fields, storage_req); + ret = lttng_dynamic_buffer_set_capacity(&local_flattened_event_fields, storage_req); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1832,16 +1751,15 @@ static enum lttng_error_code flatten_lttng_event_fields( for (i = 0; i < nb_event_field; i++) { const struct lttng_event_field *element = - (const struct lttng_event_field *) - lttng_dynamic_pointer_array_get_pointer( - event_fields, i); + (const struct lttng_event_field *) lttng_dynamic_pointer_array_get_pointer( + event_fields, i); if (!element) { ret_code = LTTNG_ERR_FATAL; goto end; } - ret = lttng_dynamic_buffer_append(&local_flattened_event_fields, - element, sizeof(struct lttng_event_field)); + ret = lttng_dynamic_buffer_append( + &local_flattened_event_fields, element, sizeof(struct lttng_event_field)); if (ret) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1857,20 +1775,20 @@ end: return ret_code; } -static enum lttng_error_code event_field_list_create_from_payload( - struct lttng_payload_view *view, - unsigned int count, - struct lttng_dynamic_pointer_array **event_field_list) +static enum lttng_error_code +event_field_list_create_from_payload(struct lttng_payload_view *view, + unsigned int count, + struct lttng_dynamic_pointer_array **event_field_list) { enum lttng_error_code ret_code; int ret, offset = 0; unsigned int i; - struct lttng_dynamic_pointer_array *list = NULL; + struct lttng_dynamic_pointer_array *list = nullptr; assert(view); assert(event_field_list); - list = (struct lttng_dynamic_pointer_array *) zmalloc(sizeof(*list)); + list = zmalloc(); if (!list) { ret_code = LTTNG_ERR_NOMEM; goto end; @@ -1880,12 +1798,11 @@ static enum lttng_error_code event_field_list_create_from_payload( for (i = 0; i < count; i++) { ssize_t event_field_size; - struct lttng_event_field *field = NULL; + struct lttng_event_field *field = nullptr; struct lttng_payload_view event_field_view = - lttng_payload_view_from_view(view, offset, -1); + lttng_payload_view_from_view(view, offset, -1); - event_field_size = lttng_event_field_create_from_payload( - &event_field_view, &field); + event_field_size = lttng_event_field_create_from_payload(&event_field_view, &field); if (event_field_size < 0) { ret_code = LTTNG_ERR_INVALID; goto end; @@ -1908,7 +1825,7 @@ static enum lttng_error_code event_field_list_create_from_payload( } *event_field_list = list; - list = NULL; + list = nullptr; ret_code = LTTNG_OK; end: @@ -1921,15 +1838,12 @@ end: } enum lttng_error_code lttng_event_fields_create_and_flatten_from_payload( - struct lttng_payload_view *view, - unsigned int count, - struct lttng_event_field **fields) + struct lttng_payload_view *view, unsigned int count, struct lttng_event_field **fields) { enum lttng_error_code ret_code; - struct lttng_dynamic_pointer_array *local_event_fields = NULL; + struct lttng_dynamic_pointer_array *local_event_fields = nullptr; - ret_code = event_field_list_create_from_payload( - view, count, &local_event_fields); + ret_code = event_field_list_create_from_payload(view, count, &local_event_fields); if (ret_code != LTTNG_OK) { goto end; }