X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libtracing%2Frelay.c;h=6bb5a35d63d6aaed2497e0920287801b9e49d4a3;hb=e70acc91ae21023149204a245638c1d2dffa7265;hp=0133f3e3bb5cc8ae57073fd6b6d541b96c1cfc24;hpb=46ef48cdf8b64608a4f679500bc34293b9f0b649;p=lttng-ust.git

diff --git a/libtracing/relay.c b/libtracing/relay.c
index 0133f3e3..6bb5a35d 100644
--- a/libtracing/relay.c
+++ b/libtracing/relay.c
@@ -92,8 +92,8 @@ static struct dentry *ltt_create_buf_file_callback(struct rchan_buf *buf);
 
 static int relay_alloc_buf(struct rchan_buf *buf, size_t *size)
 {
-	unsigned int n_pages;
-	struct buf_page *buf_page, *n;
+//ust//	unsigned int n_pages;
+//ust//	struct buf_page *buf_page, *n;
 
 	void *ptr;
 	int result;
@@ -892,9 +892,13 @@ static notrace void ltt_deliver(struct rchan_buf *buf, unsigned int subbuf_idx,
 	struct ltt_channel_struct *channel =
 		(struct ltt_channel_struct *)buf->chan->private_data;
 	struct ltt_channel_buf_struct *ltt_buf = channel->buf;
+	int result;
 
-	if(ltt_buf->call_wake_consumer)
-		relay_wake_consumer(ACCESS_ONCE(ltt_buf->wake_consumer_arg), 0);
+	result = write(ltt_buf->data_ready_fd_write, "1", 1);
+	if(result == -1) {
+		PERROR("write (in ltt_relay_buffer_flush)");
+		ERR("this should never happen!");
+	}
 //ust//	atomic_set(&ltt_buf->wakeup_readers, 1);
 }
 
@@ -1456,11 +1460,13 @@ static int ltt_relay_create_buffer(struct ltt_trace_struct *trace,
 {
 	struct ltt_channel_buf_struct *ltt_buf = ltt_chan->buf;
 	unsigned int j;
+	int fds[2];
+	int result;
 
-	ltt_buf->commit_count =
-		zmalloc(sizeof(ltt_buf->commit_count) * n_subbufs);
-	if (!ltt_buf->commit_count)
-		return -ENOMEM;
+//ust//	ltt_buf->commit_count =
+//ust//		zmalloc(sizeof(ltt_buf->commit_count) * n_subbufs);
+//ust//	if (!ltt_buf->commit_count)
+//ust//		return -ENOMEM;
 	kref_get(&trace->kref);
 	kref_get(&trace->ltt_transport_kref);
 	kref_get(&ltt_chan->kref);
@@ -1480,8 +1486,13 @@ static int ltt_relay_create_buffer(struct ltt_trace_struct *trace,
 	local_set(&ltt_buf->events_lost, 0);
 	local_set(&ltt_buf->corrupted_subbuffers, 0);
 
-	ltt_buf->call_wake_consumer = 0;
-	ltt_buf->wake_consumer_arg = NULL;
+	result = pipe(fds);
+	if(result == -1) {
+		PERROR("pipe");
+		return -1;
+	}
+	ltt_buf->data_ready_fd_read = fds[0];
+	ltt_buf->data_ready_fd_write = fds[1];
 
 	return 0;
 }
@@ -1494,13 +1505,56 @@ static void ltt_relay_destroy_buffer(struct ltt_channel_struct *ltt_chan)
 	kref_put(&ltt_chan->trace->ltt_transport_kref,
 		ltt_release_transport);
 	ltt_relay_print_buffer_errors(ltt_chan);
-	kfree(ltt_buf->commit_count);
-	ltt_buf->commit_count = NULL;
+//ust//	kfree(ltt_buf->commit_count);
+//ust//	ltt_buf->commit_count = NULL;
 	kref_put(&ltt_chan->kref, ltt_relay_release_channel);
 	kref_put(&trace->kref, ltt_release_trace);
 //ust//	wake_up_interruptible(&trace->kref_wq);
 }
 
+static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
+{
+	void *ptr;
+	int result;
+
+	/* Get one page */
+	/* FIXME: increase size if we have a commit_count array that overflows the page */
+	size_t size = PAGE_ALIGN(1);
+
+	result = ltt_chan->buf_shmid = shmget(getpid(), size, IPC_CREAT | IPC_EXCL | 0700);
+	if(ltt_chan->buf_shmid == -1) {
+		PERROR("shmget");
+		return -1;
+	}
+
+	ptr = shmat(ltt_chan->buf_shmid, NULL, 0);
+	if(ptr == (void *) -1) {
+		perror("shmat");
+		goto destroy_shmem;
+	}
+
+	/* Already mark the shared memory for destruction. This will occur only
+         * when all users have detached.
+	 */
+	result = shmctl(ltt_chan->buf_shmid, IPC_RMID, NULL);
+	if(result == -1) {
+		perror("shmctl");
+		return -1;
+	}
+
+	ltt_chan->buf = ptr;
+
+	return 0;
+
+	destroy_shmem:
+	result = shmctl(ltt_chan->buf_shmid, IPC_RMID, NULL);
+	if(result == -1) {
+		perror("shmctl");
+	}
+
+	return -1;
+}
+
 /*
  * Create channel.
  */
@@ -1535,7 +1589,10 @@ static int ltt_relay_create_channel(const char *trace_name,
 	ltt_chan->n_subbufs_order = get_count_order(n_subbufs);
 	ltt_chan->commit_count_mask = (~0UL >> ltt_chan->n_subbufs_order);
 //ust//	ltt_chan->buf = percpu_alloc_mask(sizeof(struct ltt_channel_buf_struct), GFP_KERNEL, cpu_possible_map);
-	ltt_chan->buf = malloc(sizeof(struct ltt_channel_buf_struct));
+
+	ltt_chan_alloc_ltt_buf(ltt_chan);
+
+//ust//	ltt_chan->buf = malloc(sizeof(struct ltt_channel_buf_struct));
 	if (!ltt_chan->buf)
 		goto alloc_error;
 	ltt_chan->trans_channel_data = ltt_relay_open(tmpname,
@@ -1593,11 +1650,16 @@ static notrace void ltt_relay_buffer_flush(struct rchan_buf *buf)
 	struct ltt_channel_struct *channel =
 		(struct ltt_channel_struct *)buf->chan->private_data;
 	struct ltt_channel_buf_struct *ltt_buf = channel->buf;
+	int result;
 
 	buf->finalized = 1;
 	ltt_force_switch(buf, FORCE_FLUSH);
 
-	relay_wake_consumer(ltt_buf, 1);
+	result = write(ltt_buf->data_ready_fd_write, "1", 1);
+	if(result == -1) {
+		PERROR("write (in ltt_relay_buffer_flush)");
+		ERR("this should never happen!");
+	}
 }
 
 static void ltt_relay_async_wakeup_chan(struct ltt_channel_struct *ltt_channel)
@@ -1619,11 +1681,20 @@ static void ltt_relay_async_wakeup_chan(struct ltt_channel_struct *ltt_channel)
 static void ltt_relay_finish_buffer(struct ltt_channel_struct *ltt_channel)
 {
 	struct rchan *rchan = ltt_channel->trans_channel_data;
+	int result;
 
 	if (rchan->buf) {
 		struct ltt_channel_buf_struct *ltt_buf = ltt_channel->buf;
 		ltt_relay_buffer_flush(rchan->buf);
 //ust//		ltt_relay_wake_writers(ltt_buf);
+		/* closing the pipe tells the consumer the buffer is finished */
+		
+		//result = write(ltt_buf->data_ready_fd_write, "D", 1);
+		//if(result == -1) {
+		//	PERROR("write (in ltt_relay_finish_buffer)");
+		//	ERR("this should never happen!");
+		//}
+		close(ltt_buf->data_ready_fd_write);
 	}
 }
 
@@ -1955,7 +2026,7 @@ static inline void ltt_reserve_switch_old_subbuf(
  * sub-buffer before this code gets executed, caution.  The commit makes sure
  * that this code is executed before the deliver of this sub-buffer.
  */
-static inline void ltt_reserve_switch_new_subbuf(
+static /*inline*/ void ltt_reserve_switch_new_subbuf(
 		struct ltt_channel_struct *ltt_channel,
 		struct ltt_channel_buf_struct *ltt_buf, struct rchan *rchan,
 		struct rchan_buf *buf,
@@ -2167,14 +2238,13 @@ static notrace void ltt_force_switch(struct rchan_buf *buf,
  * fill the subbuffer completely (so the subbuf index stays in the previous
  * subbuffer).
  */
-#ifdef CONFIG_LTT_VMCORE
-static inline void ltt_write_commit_counter(struct rchan_buf *buf,
+//ust// #ifdef CONFIG_LTT_VMCORE
+static /*inline*/ void ltt_write_commit_counter(struct rchan_buf *buf,
 		long buf_offset, size_t slot_size)
 {
 	struct ltt_channel_struct *ltt_channel =
 		(struct ltt_channel_struct *)buf->chan->private_data;
-	struct ltt_channel_buf_struct *ltt_buf =
-			percpu_ptr(ltt_channel->buf, buf->cpu);
+	struct ltt_channel_buf_struct *ltt_buf = ltt_channel->buf;
 	struct ltt_subbuffer_header *header;
 	long offset, subbuf_idx, commit_count;
 	uint32_t lost_old, lost_new;
@@ -2201,12 +2271,12 @@ static inline void ltt_write_commit_counter(struct rchan_buf *buf,
 		}
 	}
 }
-#else
-static inline void ltt_write_commit_counter(struct rchan_buf *buf,
-		long buf_offset, size_t slot_size)
-{
-}
-#endif
+//ust// #else
+//ust// static inline void ltt_write_commit_counter(struct rchan_buf *buf,
+//ust// 		long buf_offset, size_t slot_size)
+//ust// {
+//ust// }
+//ust// #endif
 
 /*
  * Atomic unordered slot commit. Increments the commit count in the
@@ -2245,6 +2315,8 @@ static notrace void ltt_relay_commit_slot(
 	 * ltt buffers from vmcore, after crash.
 	 */
 	ltt_write_commit_counter(buf, buf_offset, slot_size);
+
+	DBG("commited slot. now commit count is %ld", commit_count);
 }
 
 /*