X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libtracing%2Frelay.c;h=0133f3e3bb5cc8ae57073fd6b6d541b96c1cfc24;hb=46ef48cdf8b64608a4f679500bc34293b9f0b649;hp=a8775ec77d2554e30bee693a1c6a102c49ec91fd;hpb=688760ef257bee85e3841e0d27ecf4e2f921ef00;p=ust.git

diff --git a/libtracing/relay.c b/libtracing/relay.c
index a8775ec..0133f3e 100644
--- a/libtracing/relay.c
+++ b/libtracing/relay.c
@@ -873,6 +873,19 @@ static notrace void ltt_buffer_end_callback(struct rchan_buf *buf,
 
 }
 
+void (*wake_consumer)(void *, int) = NULL;
+
+void relay_set_wake_consumer(void (*wake)(void *, int))
+{
+	wake_consumer = wake;
+}
+
+void relay_wake_consumer(void *arg, int finished)
+{
+	if(wake_consumer)
+		wake_consumer(arg, finished);
+}
+
 static notrace void ltt_deliver(struct rchan_buf *buf, unsigned int subbuf_idx,
 		void *subbuf)
 {
@@ -880,7 +893,9 @@ static notrace void ltt_deliver(struct rchan_buf *buf, unsigned int subbuf_idx,
 		(struct ltt_channel_struct *)buf->chan->private_data;
 	struct ltt_channel_buf_struct *ltt_buf = channel->buf;
 
-	atomic_set(&ltt_buf->wakeup_readers, 1);
+	if(ltt_buf->call_wake_consumer)
+		relay_wake_consumer(ACCESS_ONCE(ltt_buf->wake_consumer_arg), 0);
+//ust//	atomic_set(&ltt_buf->wakeup_readers, 1);
 }
 
 static struct dentry *ltt_create_buf_file_callback(struct rchan_buf *buf)
@@ -1084,14 +1099,14 @@ int ltt_do_put_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_
 	consumed_old = consumed_old | uconsumed_old;
 	consumed_new = SUBBUF_ALIGN(consumed_old, buf->chan);
 
-	spin_lock(&ltt_buf->full_lock);
+//ust//	spin_lock(&ltt_buf->full_lock);
 	if (atomic_long_cmpxchg(&ltt_buf->consumed, consumed_old,
 				consumed_new)
 	    != consumed_old) {
 		/* We have been pushed by the writer : the last
 		 * buffer read _is_ corrupted! It can also
 		 * happen if this is a buffer we never got. */
-		spin_unlock(&ltt_buf->full_lock);
+//ust//		spin_unlock(&ltt_buf->full_lock);
 		return -EIO;
 	} else {
 		/* tell the client that buffer is now unfull */
@@ -1100,7 +1115,7 @@ int ltt_do_put_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_
 		index = SUBBUF_INDEX(consumed_old, buf->chan);
 		data = BUFFER_OFFSET(consumed_old, buf->chan);
 		ltt_buf_unfull(buf, index, data);
-		spin_unlock(&ltt_buf->full_lock);
+//ust//		spin_unlock(&ltt_buf->full_lock);
 	}
 	return 0;
 }
@@ -1455,8 +1470,8 @@ static int ltt_relay_create_buffer(struct ltt_trace_struct *trace,
 	for (j = 0; j < n_subbufs; j++)
 		local_set(&ltt_buf->commit_count[j], 0);
 //ust//	init_waitqueue_head(&ltt_buf->write_wait);
-	atomic_set(&ltt_buf->wakeup_readers, 0);
-	spin_lock_init(&ltt_buf->full_lock);
+//ust//	atomic_set(&ltt_buf->wakeup_readers, 0);
+//ust//	spin_lock_init(&ltt_buf->full_lock);
 
 	ltt_buffer_begin_callback(buf, trace->start_tsc, 0);
 
@@ -1465,6 +1480,9 @@ 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;
+
 	return 0;
 }
 
@@ -1572,8 +1590,14 @@ static int ltt_relay_create_dirs(struct ltt_trace_struct *new_trace)
  */
 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;
+
 	buf->finalized = 1;
 	ltt_force_switch(buf, FORCE_FLUSH);
+
+	relay_wake_consumer(ltt_buf, 1);
 }
 
 static void ltt_relay_async_wakeup_chan(struct ltt_channel_struct *ltt_channel)