X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libtracing%2Frelay.c;h=c063d1faddcda841987b9c4b4950408956199438;hb=4db647c5217c9350040c781cdca7ad4a09384337;hp=14724a8e70ad0df8846f6932e465289581190eaf;hpb=bb07823d7dc174f7bd96d30843acfac7424dd0d2;p=ust.git diff --git a/libtracing/relay.c b/libtracing/relay.c index 14724a8..c063d1f 100644 --- a/libtracing/relay.c +++ b/libtracing/relay.c @@ -36,6 +36,9 @@ static DEFINE_MUTEX(relay_channels_mutex); static LIST_HEAD(relay_channels); + +static struct dentry *ltt_create_buf_file_callback(struct rchan_buf *buf); + /** * relay_alloc_buf - allocate a channel buffer * @buf: the buffer struct @@ -95,7 +98,7 @@ static int relay_alloc_buf(struct rchan_buf *buf, size_t *size) *size = PAGE_ALIGN(*size); /* Maybe do read-ahead */ - result = mmap(NULL, *size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS, -1, 0); + result = mmap(NULL, *size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); if(result == MAP_FAILED) { PERROR("mmap"); return -1; @@ -178,7 +181,7 @@ static void relay_destroy_buf(struct rchan_buf *buf) static void relay_remove_buf(struct kref *kref) { struct rchan_buf *buf = container_of(kref, struct rchan_buf, kref); - buf->chan->cb->remove_buf_file(buf); +//ust// buf->chan->cb->remove_buf_file(buf); relay_destroy_buf(buf); } @@ -266,6 +269,9 @@ static struct rchan_buf *relay_open_buf(struct rchan *chan) /* Create file in fs */ //ust// dentry = chan->cb->create_buf_file(tmpname, chan->parent, S_IRUSR, //ust// buf); + + ltt_create_buf_file_callback(buf); // ust // + //ust// if (!dentry) //ust// goto free_buf; //ust// @@ -631,6 +637,7 @@ void *ltt_relay_offset_address(struct rchan_buf *buf, size_t offset) //ust// buf->hpage[odd] = page = buf->wpage; //ust// page = ltt_relay_cache_page(buf, &buf->hpage[odd], page, offset); //ust// return page_address(page->page) + (offset & ~PAGE_MASK); + return ((char *)buf->buf_data)+offset; return NULL; } //ust// EXPORT_SYMBOL_GPL(ltt_relay_offset_address); @@ -741,37 +748,6 @@ void *ltt_relay_offset_address(struct rchan_buf *buf, size_t offset) #define printk_dbg(fmt, args...) #endif -/* LTTng lockless logging buffer info */ -struct ltt_channel_buf_struct { - /* First 32 bytes cache-hot cacheline */ - local_t offset; /* Current offset in the buffer */ - local_t *commit_count; /* Commit count per sub-buffer */ - atomic_long_t consumed; /* - * Current offset in the buffer - * standard atomic access (shared) - */ - unsigned long last_tsc; /* - * Last timestamp written in the buffer. - */ - /* End of first 32 bytes cacheline */ - atomic_long_t active_readers; /* - * Active readers count - * standard atomic access (shared) - */ - local_t events_lost; - local_t corrupted_subbuffers; - spinlock_t full_lock; /* - * buffer full condition spinlock, only - * for userspace tracing blocking mode - * synchronization with reader. - */ -//ust// wait_queue_head_t write_wait; /* -//ust// * Wait queue for blocking user space -//ust// * writers -//ust// */ - atomic_t wakeup_readers; /* Boolean : wakeup readers waiting ? */ -} ____cacheline_aligned; - /* * Last TSC comparison functions. Check if the current TSC overflows * LTT_TSC_BITS bits from the last TSC read. Reads and writes last_tsc @@ -867,8 +843,9 @@ static notrace void ltt_buffer_end_callback(struct rchan_buf *buf, header->lost_size = SUBBUF_OFFSET((buf->chan->subbuf_size - offset), buf->chan); header->cycle_count_end = tsc; - header->events_lost = ltt_buf->events_lost; - header->subbuf_corrupt = ltt_buf->corrupted_subbuffers; + header->events_lost = local_read(<t_buf->events_lost); + header->subbuf_corrupt = local_read(<t_buf->corrupted_subbuffers); + } static notrace void ltt_deliver(struct rchan_buf *buf, unsigned int subbuf_idx, @@ -881,9 +858,7 @@ static notrace void ltt_deliver(struct rchan_buf *buf, unsigned int subbuf_idx, atomic_set(<t_buf->wakeup_readers, 1); } -static struct dentry *ltt_create_buf_file_callback(const char *filename, - struct dentry *parent, int mode, - struct rchan_buf *buf) +static struct dentry *ltt_create_buf_file_callback(struct rchan_buf *buf) { struct ltt_channel_struct *ltt_chan; int err; @@ -899,6 +874,7 @@ static struct dentry *ltt_create_buf_file_callback(const char *filename, //ust// if (!dentry) //ust// goto error; //ust// return dentry; + return NULL; //ust// //ust//error: ltt_relay_destroy_buffer(ltt_chan); return NULL; @@ -1034,7 +1010,7 @@ static notrace void ltt_buf_unfull(struct rchan_buf *buf, //ust// return mask; //ust// } -static int ltt_do_get_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_buf, long *pconsumed_old) +int ltt_do_get_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_buf, long *pconsumed_old) { struct ltt_channel_struct *ltt_channel = (struct ltt_channel_struct *)buf->chan->private_data; long consumed_old, consumed_idx, commit_count, write_offset; @@ -1074,7 +1050,7 @@ static int ltt_do_get_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struc return 0; } -static int ltt_do_put_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_buf, u32 uconsumed_old) +int ltt_do_put_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_buf, u32 uconsumed_old) { long consumed_new, consumed_old; @@ -1442,13 +1418,13 @@ static int ltt_relay_create_buffer(struct ltt_trace_struct *trace, unsigned int j; ltt_buf->commit_count = - malloc(sizeof(ltt_buf->commit_count) * n_subbufs); + zmalloc(sizeof(ltt_buf->commit_count) * n_subbufs); if (!ltt_buf->commit_count) return -ENOMEM; kref_get(&trace->kref); kref_get(&trace->ltt_transport_kref); kref_get(<t_chan->kref); - ltt_buf->offset = ltt_subbuffer_header_size(); + local_set(<t_buf->offset, ltt_subbuffer_header_size()); atomic_long_set(<t_buf->consumed, 0); atomic_long_set(<t_buf->active_readers, 0); for (j = 0; j < n_subbufs; j++) @@ -1459,10 +1435,10 @@ static int ltt_relay_create_buffer(struct ltt_trace_struct *trace, ltt_buffer_begin_callback(buf, trace->start_tsc, 0); - ltt_buf->commit_count[0] += ltt_subbuffer_header_size(); + local_add(ltt_subbuffer_header_size(), <t_buf->commit_count[0]); - ltt_buf->events_lost = 0; - ltt_buf->corrupted_subbuffers = 0; + local_set(<t_buf->events_lost, 0); + local_set(<t_buf->corrupted_subbuffers, 0); return 0; } @@ -2010,7 +1986,7 @@ static inline void ltt_reserve_end_switch_current( static notrace int ltt_relay_reserve_slot(struct ltt_trace_struct *trace, struct ltt_channel_struct *ltt_channel, void **transport_data, size_t data_size, size_t *slot_size, long *buf_offset, u64 *tsc, - unsigned int *rflags, int largest_align, int cpu) + unsigned int *rflags, int largest_align) { struct rchan *rchan = ltt_channel->trans_channel_data; struct rchan_buf *buf = *transport_data = rchan->buf; @@ -2283,7 +2259,7 @@ static int ltt_relay_user_blocking(struct ltt_trace_struct *trace, static void ltt_relay_print_user_errors(struct ltt_trace_struct *trace, unsigned int chan_index, size_t data_size, - struct user_dbg_data *dbg, int cpu) + struct user_dbg_data *dbg) { struct rchan *rchan; struct ltt_channel_buf_struct *ltt_buf; @@ -2368,9 +2344,14 @@ static struct ltt_transport ust_relay_transport = { //ust// return 0; //ust// } -void init_ustrelay_transport(void) +static char initialized = 0; + +void __attribute__((constructor)) init_ustrelay_transport(void) { - ltt_transport_register(&ust_relay_transport); + if(!initialized) { + ltt_transport_register(&ust_relay_transport); + initialized = 1; + } } static void __exit ltt_relay_exit(void)