#include <lttng/lttng-error.h>
#include <lttng/userspace-probe-internal.hpp>
+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)
{
struct lttng_event *new_event;
struct lttng_event_extended *new_event_extended;
- new_event = (lttng_event *) zmalloc(sizeof(*event));
+ new_event = zmalloc<lttng_event>();
if (!new_event) {
PERROR("Error allocating event structure");
goto end;
* 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<lttng_event_extended>();
if (!new_event_extended) {
PERROR("Error allocating event extended structure");
goto error;
{
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));
comm = (typeof(comm)) comm_view.buffer.data;
offset += sizeof(*comm);
- local_attr = (struct lttng_event_probe_attr *) zmalloc(
- sizeof(*local_attr));
+ local_attr = zmalloc<lttng_event_probe_attr>();
if (local_attr == NULL) {
ret = -1;
goto end;
comm = (typeof(comm)) view->buffer.data;
offset += sizeof(*comm);
- local_attr = (struct lttng_event_function_attr *) zmalloc(
- sizeof(*local_attr));
+ local_attr = zmalloc<lttng_event_function_attr>();
if (local_attr == NULL) {
ret = -1;
goto end;
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(
+ local_exclusions = zmalloc<lttng_event_exclusion>(
sizeof(struct lttng_event_exclusion) + size);
if (!local_exclusions) {
ret = -1;
goto end;
}
- local_bytecode = (struct lttng_bytecode *) zmalloc(
- event_comm->bytecode_len);
+ local_bytecode = zmalloc<lttng_bytecode>(event_comm->bytecode_len);
if (!local_bytecode) {
ret = -1;
goto end;
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,
- };
+ 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. */
comm = (typeof(comm)) comm_view.data;
offset += sizeof(*comm);
- local_context = (struct lttng_event_context *)
- zmalloc(sizeof(*local_context));
+ local_context = zmalloc<lttng_event_context>();
if (!local_context) {
ret = -1;
goto end;
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);
offset += sizeof(*comm);
}
- local_event_field = (struct lttng_event_field *)
- zmalloc(sizeof(*local_event_field));
+ local_event_field = zmalloc<lttng_event_field>();
if (!local_event_field) {
ret = -1;
goto end;
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));
+ struct event_list_element *element = zmalloc<event_list_element>();
if (!element) {
ret_code = LTTNG_ERR_NOMEM;
assert(view);
assert(event_field_list);
- list = (struct lttng_dynamic_pointer_array *) zmalloc(sizeof(*list));
+ list = zmalloc<lttng_dynamic_pointer_array>();
if (!list) {
ret_code = LTTNG_ERR_NOMEM;
goto end;