X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-ring-buffer-metadata-client.h;h=a8ba282d8cbebf1a8ed28677bb808bef3f164ee1;hb=616d3093e1c34557aca7e9f6149338f43cf91886;hp=7e79b116fa613a672be0efaeb0a2c1987536c762;hpb=9d335227b11499758dc06d97822ba2ebeeb0fd5c;p=lttng-ust.git diff --git a/liblttng-ust/ltt-ring-buffer-metadata-client.h b/liblttng-ust/ltt-ring-buffer-metadata-client.h index 7e79b116..a8ba282d 100644 --- a/liblttng-ust/ltt-ring-buffer-metadata-client.h +++ b/liblttng-ust/ltt-ring-buffer-metadata-client.h @@ -1,11 +1,23 @@ /* * ltt-ring-buffer-client.h * - * Copyright (C) 2010 - Mathieu Desnoyers - * * LTTng lib ring buffer client template. * - * Dual LGPL v2.1/GPL v2 license. + * Copyright (C) 2010-2012 Mathieu Desnoyers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; only + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -16,7 +28,7 @@ struct metadata_packet_header { uint32_t magic; /* 0x75D11D57 */ - uint8_t uuid[16]; /* Unique Universal Identifier */ + uint8_t uuid[LTTNG_UST_UUID_LEN]; /* Unique Universal Identifier */ uint32_t checksum; /* 0 if unused */ uint32_t content_size; /* in bits */ uint32_t packet_size; /* in bits */ @@ -119,7 +131,11 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts header->content_size = data_size * CHAR_BIT; /* in bits */ header->packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */ - records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf); + /* + * We do not care about the records lost count, because the metadata + * channel waits and retry. + */ + (void) lib_ring_buffer_get_records_lost_full(&client_config, buf); records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf); records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf); WARN_ON_ONCE(records_lost != 0); @@ -167,7 +183,8 @@ struct ltt_channel *_channel_create(const char *name, 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) { @@ -180,7 +197,8 @@ struct ltt_channel *_channel_create(const char *name, 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; @@ -189,6 +207,34 @@ struct ltt_channel *_channel_create(const char *name, 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) { @@ -197,14 +243,17 @@ 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; @@ -284,11 +333,13 @@ int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle) { 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; @@ -298,6 +349,7 @@ static struct ltt_transport ltt_relay_transport = { .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,