memcpy(&event_param, &sw->event_param,
sizeof(event_param));
- memcpy(event_param.name,
+ strncpy(event_param.name,
desc->name,
sizeof(event_param.name));
+ event_param.name[sizeof(event_param.name) - 1] = '\0';
/* create event */
ret = ltt_event_create(sw->chan,
- &event_param, NULL,
- &ev);
+ &event_param, &ev);
if (ret) {
DBG("Error creating event");
continue;
}
cds_list_add(&ev->wildcard_list,
&sw->events);
+ lttng_filter_event_link_bytecode(ev,
+ sw->filter_bytecode);
}
}
}
event->id = chan->free_event_id++;
ret |= _ltt_event_metadata_statedump(chan->session, chan,
event);
+ lttng_filter_event_link_bytecode(event,
+ event->filter_bytecode);
}
return ret;
}
*/
int ltt_event_create(struct ltt_channel *chan,
struct lttng_ust_event *event_param,
- void (*filter)(struct ltt_event *event),
struct ltt_event **_event)
{
const struct lttng_event_desc *desc = NULL; /* silence gcc */
goto cache_error;
}
event->chan = chan;
- event->filter = filter;
/*
* used_event_id counts the maximum number of event IDs that can
* register if all probes register.
}
cds_list_del(&event->list);
lttng_destroy_context(event->ctx);
+ free(event->filter_bytecode);
+ free(event->filter_data);
free(event);
}
{
int ret = 0;
+ if (field->nowrite)
+ return 0;
+
switch (field->type.atype) {
case atype_integer:
ret = lttng_metadata_printf(session,
if (ret)
goto end;
+ if (event->desc->u.ext.model_emf_uri) {
+ ret = lttng_metadata_printf(session,
+ " model.emf.uri = \"%s\";\n",
+ *(event->desc->u.ext.model_emf_uri));
+ if (ret)
+ goto end;
+ }
+
if (event->ctx) {
ret = lttng_metadata_printf(session,
" context := struct {\n");
"struct packet_context {\n"
" uint64_clock_monotonic_t timestamp_begin;\n"
" uint64_clock_monotonic_t timestamp_end;\n"
+ " uint64_t content_size;\n"
+ " uint64_t packet_size;\n"
" unsigned long events_discarded;\n"
- " uint32_t content_size;\n"
- " uint32_t packet_size;\n"
" uint32_t cpu_id;\n"
"};\n\n"
);
struct ltt_event *event;
int ret = 0;
char procname[LTTNG_UST_PROCNAME_LEN] = "";
+ char hostname[HOST_NAME_MAX];
if (!CMM_ACCESS_ONCE(session->active))
return 0;
goto end;
/* ignore error, just use empty string if error. */
+ hostname[0] = '\0';
+ ret = gethostname(hostname, sizeof(hostname));
+ if (ret && errno == ENAMETOOLONG)
+ hostname[HOST_NAME_MAX - 1] = '\0';
lttng_ust_getprocname(procname);
procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
ret = lttng_metadata_printf(session,
"env {\n"
+ " hostname = \"%s\";\n"
" vpid = %d;\n"
" procname = \"%s\";\n"
" domain = \"ust\";\n"
" tracer_minor = %u;\n"
" tracer_patchlevel = %u;\n"
"};\n\n",
+ hostname,
(int) getpid(),
procname,
LTTNG_UST_MAJOR_VERSION,
cds_list_del(&wildcard->entry->list);
free(wildcard->entry);
}
+ free(wildcard->filter_bytecode);
free(wildcard);
}