int ret;
pid_t pid;
+ DBG("Spawning kconsumerd");
+
pid = fork();
if (pid == 0) {
/*
* Exec kconsumerd.
*/
- execlp("kconsumerd", "kconsumerd", "--daemonize", NULL);
+ execlp("kconsumerd", "kconsumerd", "--quiet", NULL);
if (errno != 0) {
perror("kernel start consumer exec");
}
{
int ret;
- DBG("Spawning kconsumerd");
-
pthread_mutex_lock(&kconsumerd_pid_mutex);
- if (kconsumerd_pid == 0) {
- ret = spawn_kconsumerd();
- if (ret < 0) {
- ERR("Spawning kconsumerd failed");
- ret = LTTCOMM_KERN_CONSUMER_FAIL;
- pthread_mutex_unlock(&kconsumerd_pid_mutex);
- goto error;
- }
+ if (kconsumerd_pid != 0) {
+ goto end;
+ }
- /* Setting up the global kconsumerd_pid */
- kconsumerd_pid = ret;
+ ret = spawn_kconsumerd();
+ if (ret < 0) {
+ ERR("Spawning kconsumerd failed");
+ ret = LTTCOMM_KERN_CONSUMER_FAIL;
+ pthread_mutex_unlock(&kconsumerd_pid_mutex);
+ goto error;
}
+
+ /* Setting up the global kconsumerd_pid */
+ kconsumerd_pid = ret;
pthread_mutex_unlock(&kconsumerd_pid_mutex);
DBG("Kconsumerd pid %d", ret);
goto error;
}
+end:
+ pthread_mutex_unlock(&kconsumerd_pid_mutex);
return 0;
error:
switch (cmd_ctx->lsm->cmd_type) {
case LTTNG_CREATE_SESSION:
case LTTNG_LIST_SESSIONS:
+ case KERNEL_LIST_EVENTS:
case UST_LIST_APPS:
break;
default:
case KERNEL_CREATE_STREAM:
case KERNEL_DISABLE_EVENT:
case KERNEL_ENABLE_EVENT:
+ case KERNEL_LIST_EVENTS:
case KERNEL_OPEN_METADATA:
case KERNEL_START_TRACE:
case KERNEL_STOP_TRACE:
ret = LTTCOMM_OK;
break;
}
+ case KERNEL_LIST_EVENTS:
+ {
+ char *event_list;
+ ssize_t size;
+
+ size = kernel_list_events(kernel_tracer_fd, &event_list);
+ if (size < 0) {
+ ret = LTTCOMM_KERN_LIST_FAIL;
+ goto error;
+ }
+
+ /*
+ * Setup lttng message with payload size set to the event list size in
+ * bytes and then copy list into the llm payload.
+ */
+ ret = setup_lttng_msg(cmd_ctx, size);
+ if (ret < 0) {
+ goto setup_error;
+ }
+
+ /* Copy event list into message payload */
+ memcpy(cmd_ctx->llm->payload, event_list, size);
+
+ free(event_list);
+
+ ret = LTTCOMM_OK;
+ break;
+ }
case KERNEL_OPEN_METADATA:
{
/* Setup lttng message with no payload */
ret = mkdir(LTTNG_RUNDIR, S_IRWXU | S_IRWXG );
if (ret < 0) {
- ERR("Unable to create " LTTNG_RUNDIR);
- goto error;
+ if (errno != EEXIST) {
+ ERR("Unable to create " LTTNG_RUNDIR);
+ goto error;
+ } else {
+ ret = 0;
+ }
}
error: