tmp = lttng_event_create();
if (!tmp) {
ret_code = LTTNG_ERR_NOMEM;
- goto end;
+ goto error;
}
if (lttng_strncpy(tmp->name, uevent->attr.name,
LTTNG_SYMBOL_NAME_LEN)) {
ret_code = LTTNG_ERR_FATAL;
lttng_event_destroy(tmp);
- goto end;
+ goto error;
}
tmp->name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
/*
* Command LTTNG_ADD_CONTEXT processed by the client thread.
*/
-int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
- char *channel_name, const struct lttng_event_context *ctx, int kwpipe)
+
+int cmd_add_context(struct command_ctx *cmd_ctx, int sock, int kwpipe)
{
+ struct lttng_event_context *ctx = NULL;
int ret, chan_kern_created = 0, chan_ust_created = 0;
- char *app_ctx_provider_name = NULL, *app_ctx_name = NULL;
+ struct lttng_dynamic_buffer buffer;
+ struct lttng_buffer_view view;
+ size_t context_len;
+ ssize_t sock_recv_len;
+ enum lttng_domain_type domain = cmd_ctx->lsm->domain.type;
+ struct ltt_session *session = cmd_ctx->session;
+ const char *channel_name = cmd_ctx->lsm->u.context.channel_name;
+
+ lttng_dynamic_buffer_init(&buffer);
+
+ context_len = (size_t) cmd_ctx->lsm->u.context.length;
+ ret = lttng_dynamic_buffer_set_size(&buffer, context_len);
+ if (ret) {
+ ret = LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ sock_recv_len = lttcomm_recv_unix_sock(sock, buffer.data, context_len);
+ if (sock_recv_len < 0 || sock_recv_len != context_len) {
+ ERR("Failed to receive \"add context\" command payload");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ view = lttng_buffer_view_from_dynamic_buffer(&buffer, 0, -1);
+
+ if (lttng_event_context_create_from_buffer(&view, &ctx) !=
+ context_len) {
+ ERR("Invalid event context payload received in \"add context\" command");
+ ret = LTTNG_ERR_INVALID;
+ goto end;
+ }
/*
* Don't try to add a context if the session has been started at
* some point in time before. The tracer does not allow it and would
* result in a corrupted trace.
*/
- if (session->has_been_started) {
+ if (cmd_ctx->session->has_been_started) {
ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
goto end;
}
- if (ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
- app_ctx_provider_name = ctx->u.app_ctx.provider_name;
- app_ctx_name = ctx->u.app_ctx.ctx_name;
- }
-
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
assert(session->kernel_session);
}
ret = context_ust_add(usess, domain, ctx, channel_name);
- free(app_ctx_provider_name);
- free(app_ctx_name);
- app_ctx_name = NULL;
- app_ctx_provider_name = NULL;
if (ret != LTTNG_OK) {
goto error;
}
trace_ust_destroy_channel(uchan);
}
end:
- free(app_ctx_provider_name);
- free(app_ctx_name);
+ lttng_event_context_destroy(ctx);
return ret;
}
/*
* Command LTTNG_LIST_TRACEPOINT_FIELDS processed by the client thread.
*/
-ssize_t cmd_list_tracepoint_fields(enum lttng_domain_type domain,
- struct lttng_event_field **fields)
+enum lttng_error_code cmd_list_tracepoint_fields(enum lttng_domain_type domain,
+ struct lttng_dynamic_buffer *buffer, unsigned int *nb_fields)
{
+ enum lttng_error_code ret_code;
int ret;
- ssize_t nb_fields = 0;
+ unsigned int i;
+ struct lttng_event_field *fields = NULL;
switch (domain) {
case LTTNG_DOMAIN_UST:
- nb_fields = ust_app_list_event_fields(fields);
- if (nb_fields < 0) {
- ret = LTTNG_ERR_UST_LIST_FAIL;
+ ret = ust_app_list_event_fields(&fields);
+ if (ret < 0) {
+ ret_code = LTTNG_ERR_UST_LIST_FAIL;
goto error;
}
break;
case LTTNG_DOMAIN_KERNEL:
default: /* fall-through */
- ret = LTTNG_ERR_UND;
+ ret_code = LTTNG_ERR_UND;
goto error;
}
- return nb_fields;
+ *nb_fields = ret;
+
+ for (i = 0; i < *nb_fields; i++) {
+ ret = lttng_event_field_serialize(&fields[i], buffer);
+ if (ret) {
+ ret_code = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ }
+
+ ret_code = LTTNG_OK;
error:
- /* Return negative value to differentiate return code */
- return -ret;
+ free(fields);
+ return ret_code;
}
enum lttng_error_code cmd_list_syscalls(