size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
- int **shm_fd, int **wait_fd,
+ int **shm_fd, char **shm_path,
+ int **wait_fd, char **wait_pipe_path,
uint64_t **memory_map_size,
struct ltt_channel *chan_priv_init)
{
chan_priv_init,
buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval,
- shm_fd, wait_fd, memory_map_size);
+ shm_fd, shm_path, wait_fd, wait_pipe_path,
+ memory_map_size);
if (!handle)
return NULL;
ltt_chan = priv;
return ltt_chan;
}
+static
+int ltt_channel_open_pipe(struct channel *chan,
+ struct lttng_ust_shm_handle *handle)
+{
+ struct shm_ref *ref;
+ int cpu = 0;
+
+ if (client_config.alloc == RING_BUFFER_ALLOC_GLOBAL) {
+ ref = &chan->backend.buf[0].shmp._ref;
+ return shm_open_wakeup_pipe(handle, ref);
+ } else {
+ if (cpu >= num_possible_cpus()) {
+ goto error;
+ }
+
+ for_each_possible_cpu(cpu) {
+ ref = &chan->backend.buf[cpu].shmp._ref;
+ if (shm_open_wakeup_pipe(handle, ref) < 0) {
+ goto error;
+ }
+ }
+ }
+
+ return 0;
+error:
+ return -1;
+}
+
static
void ltt_channel_destroy(struct ltt_channel *ltt_chan)
{
static
struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
- struct lttng_ust_shm_handle *handle,
- int **shm_fd, int **wait_fd,
- uint64_t **memory_map_size)
+ struct lttng_ust_shm_handle *handle,
+ int **shm_fd, char **shm_path,
+ int **wait_fd, char **wait_pipe_path,
+ uint64_t **memory_map_size)
{
struct lttng_ust_lib_ring_buffer *buf;
buf = channel_get_ring_buffer(&client_config, chan,
- 0, handle, shm_fd, wait_fd, memory_map_size);
+ 0, handle, shm_fd, shm_path,
+ wait_fd, wait_pipe_path,
+ memory_map_size);
if (!lib_ring_buffer_open_read(buf, handle, 0))
return buf;
return NULL;
{
struct lttng_ust_lib_ring_buffer *buf;
int *shm_fd, *wait_fd;
+ char *shm_path, *wait_pipe_path;
uint64_t *memory_map_size;
buf = channel_get_ring_buffer(&client_config, chan,
- 0, handle, &shm_fd, &wait_fd,
- &memory_map_size);
+ 0, handle, &shm_fd, &shm_path,
+ &wait_fd, &wait_pipe_path,
+ &memory_map_size);
lib_ring_buffer_switch(&client_config, buf,
SWITCH_ACTIVE, handle);
return 0;
.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
.ops = {
.channel_create = _channel_create,
+ .channel_open_pipe = ltt_channel_open_pipe,
.channel_destroy = ltt_channel_destroy,
.buffer_read_open = ltt_buffer_read_open,
.buffer_read_close = ltt_buffer_read_close,