*
*/
-#include "common/compat/string.h"
-#include "common/macros.h"
-#include "lttng/lttng-error.h"
-#include <assert.h>
-#include <common/buffer-view.h>
-#include <common/dynamic-array.h>
-#include <common/dynamic-buffer.h>
-#include <common/error.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/align.h>
+#include <common/align.hpp>
+#include <common/buffer-view.hpp>
+#include <common/compat/string.hpp>
+#include <common/dynamic-array.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+
#include <lttng/constant.h>
-#include <lttng/event-internal.h>
+#include <lttng/event-internal.hpp>
#include <lttng/event.h>
-#include <lttng/userspace-probe-internal.h>
-#include <stdint.h>
-#include <string.h>
+#include <lttng/lttng-error.h>
+#include <lttng/userspace-probe-internal.hpp>
struct event_list_element {
struct lttng_event *event;
{
int ret;
size_t symbol_name_len;
- struct lttng_event_probe_attr_comm comm = { 0 };
+ struct lttng_event_probe_attr_comm comm = {};
- symbol_name_len = lttng_strnlen(probe->symbol_name, LTTNG_SYMBOL_NAME_LEN);
- if (symbol_name_len == LTTNG_SYMBOL_NAME_LEN) {
+ 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;
goto end;
size_t symbol_name_len;
struct lttng_event_function_attr_comm comm = { 0 };
- symbol_name_len = lttng_strnlen(function->symbol_name, LTTNG_SYMBOL_NAME_LEN);
- if (symbol_name_len == LTTNG_SYMBOL_NAME_LEN) {
+ 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;
goto end;
}
ret = lttng_strncpy(local_attr->symbol_name, name,
- LTTNG_SYMBOL_NAME_LEN);
+ sizeof(local_attr->symbol_name));
if (ret) {
ret = -1;
goto end;
local_attr = NULL;
ret = offset;
end:
+ free(local_attr);
return ret;
}
}
ret = lttng_strncpy(local_attr->symbol_name, name,
- LTTNG_SYMBOL_NAME_LEN);
+ sizeof(local_attr->symbol_name));
if (ret) {
ret = -1;
goto end;
local_attr = NULL;
ret = offset;
end:
+ free(local_attr);
return ret;
}
goto end;
}
- ret = lttng_strncpy(local_exclusions->names[i],
- string, LTTNG_SYMBOL_NAME_LEN);
+ 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;
goto end;
}
- ret = lttng_strncpy(
- local_event->name, name, LTTNG_SYMBOL_NAME_LEN);
+ ret = lttng_strncpy(local_event->name, name,
+ sizeof(local_event->name));
if (ret) {
ret = -1;
goto end;
}
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 = %lu", 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;
}
unsigned int i;
size_t header_offset, size_before_payload;
size_t name_len;
- struct lttng_event_comm event_comm = { 0 };
+ struct lttng_event_comm event_comm = {};
struct lttng_event_comm *header;
assert(event);
/* Save the header location for later in-place header update. */
header_offset = payload->buffer.size;
- name_len = lttng_strnlen(event->name, LTTNG_SYMBOL_NAME_LEN);
- if (name_len == LTTNG_SYMBOL_NAME_LEN) {
+ name_len = lttng_strnlen(event->name, sizeof(event->name));
+ if (name_len == sizeof(event->name)) {
/* Event name is not NULL-terminated. */
ret = -1;
goto end;
const struct lttng_payload_view *view,
struct lttng_event_context *event_ctx)
{
- ssize_t ret, offset = 0;
+ 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(
event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER);
if (!lttng_buffer_view_is_valid(&comm_view)) {
- ret = -1;
+ consumed = -1;
goto end;
}
name_len);
if (!lttng_buffer_view_is_valid(&provider_name_view)) {
- ret = -1;
+ consumed = -1;
goto end;
}
if (!lttng_buffer_view_contains_string(
&provider_name_view, name, name_len)) {
- ret = -1;
+ consumed = -1;
goto end;
}
- lttng_strncpy(event_ctx->u.perf_counter.name, name, name_len);
+ ret = lttng_strncpy(event_ctx->u.perf_counter.name, name,
+ sizeof(event_ctx->u.perf_counter.name));
+ if (ret) {
+ consumed = -1;
+ goto end;
+ }
offset += name_len;
}
event_ctx->u.perf_counter.config = comm->config;
event_ctx->u.perf_counter.type = comm->type;
- ret = offset;
+ consumed = offset;
end:
- return ret;
+ return consumed;
}
ssize_t lttng_event_context_create_from_payload(
struct lttng_payload *payload)
{
int ret;
- struct lttng_event_context_app_comm comm = { 0 };
+ struct lttng_event_context_app_comm comm = {};
size_t provider_len, ctx_len;
const char *provider_name;
const char *ctx_name;
}
/* Include the null terminator. */
- comm.provider_name_len = provider_len + 1;
+ provider_len += 1;
+ comm.provider_name_len = provider_len;
ctx_len = strlen(ctx_name);
if (ctx_len == 0) {
}
/* Include the null terminator. */
- comm.ctx_name_len = ctx_len + 1;
+ ctx_len += 1;
+ comm.ctx_name_len = ctx_len;
/* Header */
ret = lttng_dynamic_buffer_append(&payload->buffer, &comm,
struct lttng_payload *payload)
{
int ret;
- struct lttng_event_context_perf_counter_comm comm = { 0 };
+ struct lttng_event_context_perf_counter_comm comm = {};
assert(payload);
assert(context);
comm.config = context->config;
comm.type = context->type;
- comm.name_len = lttng_strnlen(context->name, LTTNG_SYMBOL_NAME_LEN);
+ comm.name_len = lttng_strnlen(context->name, sizeof(context->name));
- if (comm.name_len == LTTNG_SYMBOL_NAME_LEN) {
+ if (comm.name_len == sizeof(context->name)) {
ret = -1;
goto end;
}
assert(name);
assert(event);
- if (lttng_strncpy(local_event_field->field_name, name , LTTNG_SYMBOL_NAME_LEN)) {
+ if (lttng_strncpy(local_event_field->field_name, name,
+ sizeof(local_event_field->field_name))) {
ret = -1;
goto end;
}
int ret;
size_t header_offset, size_before_event;
size_t name_len;
- struct lttng_event_field_comm event_field_comm = { 0 };
+ struct lttng_event_field_comm event_field_comm = {};
struct lttng_event_field_comm *header;
assert(field);
/* Save the header location for later in-place header update. */
header_offset = payload->buffer.size;
- name_len = strnlen(field->field_name, LTTNG_SYMBOL_NAME_LEN);
- if (name_len == LTTNG_SYMBOL_NAME_LEN) {
+ name_len = strnlen(field->field_name, sizeof(field->field_name));
+ if (name_len == sizeof(field->field_name)) {
/* Event name is not NULL-terminated. */
ret = -1;
goto end;
/* The basic struct lttng_event */
storage_req = event_count * sizeof(struct lttng_event);
+ /* The struct·lttng_event_extended */
+ storage_req += event_count * sizeof(struct lttng_event_extended);
+
for (i = 0; i < event_count; i++) {
int probe_storage_req = 0;
const struct event_list_element *element = (const struct event_list_element *)
probe_storage_req = ret;
}
- /* The struct·lttng_event_extended */
- storage_req += event_count *
- sizeof(struct lttng_event_extended);
-
if (element->filter_expression) {
storage_req += strlen(element->filter_expression) + 1;
}
projects / lttng-tools.git / blobdiff