#include "notification-thread.h"
#include "notification-thread-commands.h"
#include <common/error.h>
-#include <common/futex.h>
#include <unistd.h>
#include <stdint.h>
#include <inttypes.h>
{
memset(cmd, 0, sizeof(*cmd));
CDS_INIT_LIST_HEAD(&cmd->cmd_list_node);
+ lttng_waiter_init(&cmd->reply_waiter);
}
static
int ret;
uint64_t notification_counter = 1;
- futex_nto1_prepare(&cmd->reply_futex);
-
pthread_mutex_lock(&handle->cmd_queue.lock);
/* Add to queue. */
cds_list_add_tail(&cmd->cmd_list_node,
&handle->cmd_queue.list);
/* Wake-up thread. */
- ret = write(handle->cmd_queue.event_fd,
+ ret = write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
¬ification_counter, sizeof(notification_counter));
if (ret < 0) {
PERROR("write to notification thread's queue event fd");
}
pthread_mutex_unlock(&handle->cmd_queue.lock);
- futex_nto1_wait(&cmd->reply_futex);
+ lttng_waiter_wait(&cmd->reply_waiter);
return 0;
error_unlock_queue:
pthread_mutex_unlock(&handle->cmd_queue.lock);
init_notification_thread_command(&cmd);
cmd.type = NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL;
- cmd.parameters.add_channel.session_name = session_name;
- cmd.parameters.add_channel.uid = uid;
- cmd.parameters.add_channel.gid = gid;
- cmd.parameters.add_channel.channel_name = channel_name;
- cmd.parameters.add_channel.key.key = key;
- cmd.parameters.add_channel.key.domain = domain;
- cmd.parameters.add_channel.capacity = capacity;
+ cmd.parameters.add_channel.session.name = session_name;
+ cmd.parameters.add_channel.session.uid = uid;
+ cmd.parameters.add_channel.session.gid = gid;
+ cmd.parameters.add_channel.channel.name = channel_name;
+ cmd.parameters.add_channel.channel.key = key;
+ cmd.parameters.add_channel.channel.domain = domain;
+ cmd.parameters.add_channel.channel.capacity = capacity;
ret = run_command_wait(handle, &cmd);
if (ret) {