From 490bc59fbd4777f1a5041a71c1de7c5e76ff1eae Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Sat, 10 Dec 2005 23:50:49 +0000
Subject: [PATCH] get rid of ugly ringbuffer, activate async gdi

---
 lib/gdi/grc.cpp | 94 ++++++++++++++++++++++++++++++++++++++-----------
 lib/gdi/grc.h   | 32 +++++++----------
 2 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index f54f1604..1f5cdfb1 100644
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -1,5 +1,4 @@
 // for debugging use:
- #define SYNC_PAINT
 #include <unistd.h>
 #ifndef SYNC_PAINT
 #include <pthread.h>
@@ -10,25 +9,28 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
-#define MAXSIZE 1024
-
 #ifndef SYNC_PAINT
 void *gRC::thread_wrapper(void *ptr)
 {
-	nice(3);
 	return ((gRC*)ptr)->thread();
 }
 #endif
 
 gRC *gRC::instance=0;
 
-gRC::gRC(): queue(2048), m_notify_pump(eApp, 0), queuelock(MAXSIZE)
+gRC::gRC(): rp(0), wp(0)
+#ifdef SYNC_PAINT
+,m_notify_pump(eApp, 0)
+#else
+,m_notify_pump(eApp, 1)
+#endif
 {
 	ASSERT(!instance);
 	instance=this;
-	queuelock.lock(MAXSIZE);
 	CONNECT(m_notify_pump.recv_msg, gRC::recv_notify);
 #ifndef SYNC_PAINT
+	pthread_mutex_init(&mutex, 0);
+	pthread_cond_init(&cond, 0);
 	int res = pthread_create(&the_thread, 0, thread_wrapper, this);
 	if (res)
 		eFatal("RC thread couldn't be created");
@@ -53,30 +55,80 @@ gRC::~gRC()
 #endif
 }
 
+void gRC::submit(const gOpcode &o)
+{
+	while(1)
+	{
+#ifndef SYNC_PAINT
+		pthread_mutex_lock(&mutex);
+#endif
+		int tmp=wp;
+		tmp+=1;
+		if ( tmp == MAXSIZE )
+			tmp=0;
+		if ( tmp == rp )
+		{
+#ifndef SYNC_PAINT
+			pthread_mutex_unlock(&mutex);
+#else
+			thread();
+#endif
+			//printf("render buffer full...\n");
+			//fflush(stdout);
+			usleep(1000);  // wait 1 msec
+			continue;
+		}
+		int free=rp-wp;
+		if ( free <= 0 )
+			free+=MAXSIZE;
+		queue[wp++]=o;
+		if ( wp == MAXSIZE )
+			wp = 0;
+		if (o.opcode==gOpcode::flush||o.opcode==gOpcode::shutdown||o.opcode==gOpcode::notify)
+#ifndef SYNC_PAINT
+			pthread_cond_signal(&cond);  // wakeup gdi thread
+		pthread_mutex_unlock(&mutex);
+#else
+			thread(); // paint
+#endif
+		break;
+	}
+}
+
 void *gRC::thread()
 {
 	int need_notify = 0;
 #ifndef SYNC_PAINT
 	while (1)
+	{
+		singleLock s(mutex);
 #else
-	while (queue.size())
-#endif
+	while (rp != wp)
 	{
-		queuelock.lock(1);
-		gOpcode& o(queue.current());
-		if (o.opcode==gOpcode::shutdown)
-			break;
-		if (o.opcode==gOpcode::notify)
-			need_notify = 1;
+#endif
+		if ( rp != wp )
+		{
+			gOpcode& o(queue[rp]);
+			if (o.opcode==gOpcode::shutdown)
+				break;
+			else if (o.opcode==gOpcode::notify)
+				need_notify = 1;
+			else
+				o.dc->exec(&o);
+			rp++;
+			if ( rp == MAXSIZE )
+				rp=0;
+		}
 		else
-			o.dc->exec(&o);
-		o.dc->Release();
-		queue.dequeue();
-
-		if ((!queue.size()) && need_notify)
 		{
-			need_notify = 0;
-			m_notify_pump.send(1);
+			if (need_notify)
+			{
+				need_notify = 0;
+				m_notify_pump.send(1);
+			}
+#ifndef SYNC_PAINT
+			pthread_cond_wait(&cond, &mutex);
+#endif
 		}
 	}
 #ifndef SYNC_PAINT
diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index e277db34..3231aab3 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -12,7 +12,6 @@
 #include <list>
 
 #include <string>
-#include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
 #include <lib/base/message.h>
 #include <lib/gdi/erect.h>
@@ -55,7 +54,7 @@ struct gOpcode
 		flip,
 		notify,
 		
-		end,shutdown
+		shutdown
 	} opcode;
 
 	gDC *dc;
@@ -135,6 +134,8 @@ struct gOpcode
 	} parm;
 };
 
+#define MAXSIZE 1024
+
 		/* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
@@ -142,34 +143,25 @@ DECLARE_REF(gRC);
 private:
 	friend class gPainter;
 	static gRC *instance;
-	
+
+#ifndef SYNC_PAINT
 	static void *thread_wrapper(void *ptr);
 	pthread_t the_thread;
+	pthread_mutex_t mutex;
+	pthread_cond_t cond;
+#endif
 	void *thread();
 
-	queueRingBuffer<gOpcode> queue;
-	
+	gOpcode queue[MAXSIZE];
+	int rp, wp;
+
 	eFixedMessagePump<int> m_notify_pump;
 	void recv_notify(const int &i);
 public:
-	eLock queuelock;
 	gRC();
 	virtual ~gRC();
 
-	void submit(const gOpcode &o)
-	{
-		static int collected=0;
-		queue.enqueue(o);
-		collected++;
-//		if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
-		{
-			queuelock.unlock(collected);
-#ifdef SYNC_PAINT
-			thread();
-#endif
-			collected=0;
-		}
-	}
+	void submit(const gOpcode &o);
 
 	Signal0<void> notify;
 
-- 
2.30.2