1 files changed, 62 insertions, 17 deletions

diff --git a/examples/echo/echo-client.cpp b/examples/echo/echo-client.cpp
index 8fe7ad7..f84c093 100644
--- a/examples/echo/echo-client.cpp
+++ b/examples/echo/echo-client.cpp
@@ -7,6 +7,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
+#include <cstring>
 
 using namespace std;
 
@@ -27,32 +28,31 @@ void EchoClient::Echoed(const DBus::Variant &value)
  * For some strange reason, libdbus frequently dies with an OOM
  */
 
-static const int THREADS = 3;
+static const size_t THREADS = 3;
 
 static bool spin = true;
 
-void *greeter_thread(void *arg)
-{
-	DBus::Connection *conn = reinterpret_cast<DBus::Connection *>(arg);
+EchoClient *g_client = NULL;
 
-	EchoClient client(*conn, ECHO_SERVER_PATH, ECHO_SERVER_NAME);
+DBus::Pipe *thread_pipe_list[THREADS];
 
+DBus::BusDispatcher dispatcher;
+DBus::DefaultTimeout *timeout;
+
+void *greeter_thread(void *arg)
+{
 	char idstr[16];
+	size_t i = (size_t) arg;
 
 	snprintf(idstr, sizeof(idstr), "%lu", pthread_self());
 
-	for (int i = 0; i < 30 && spin; ++i)
-	{
-		cout << client.Hello(idstr) << endl;
-	}
+	thread_pipe_list[i]->write (idstr, strlen (idstr) + 1);
 
-	cout << idstr << " done " << endl;
+	cout << idstr << " done (" << i << ")" << endl;
 
 	return NULL;
 }
 
-DBus::BusDispatcher dispatcher;
-
 void niam(int sig)
 {
 	spin = false;
@@ -60,32 +60,77 @@ void niam(int sig)
 	dispatcher.leave();
 }
 
+void handler1 (const void *data, void *buffer, unsigned int nbyte)
+{
+	char *str = (char*) buffer;
+	cout << "buffer1: " << str << ", size: " << nbyte << endl;
+	for (int i = 0; i < 30 && spin; ++i)
+	{
+		cout << "call1: " << g_client->Hello (str) << endl;
+	}
+}
+
+void handler2 (const void *data, void *buffer, unsigned int nbyte)
+{
+	char *str = (char*) buffer;
+	cout << "buffer2: " << str << ", size: " << nbyte <<endl;
+	for (int i = 0; i < 30 && spin; ++i)
+	{
+		cout << "call2: " << g_client->Hello (str) << endl;
+	}
+}
+
+void handler3 (const void *data, void *buffer, unsigned int nbyte)
+{
+	char *str = (char*) buffer;
+	cout << "buffer3: " << str << ", size: " << nbyte <<endl;
+	for (int i = 0; i < 30 && spin; ++i)
+	{
+		cout << "call3: " << g_client->Hello (str) << endl;
+	}
+}
+
 int main()
 {
+	size_t i;
+
 	signal(SIGTERM, niam);
 	signal(SIGINT, niam);
 
 	DBus::_init_threading();
 
-	DBus::default_dispatcher = &dispatcher;
+  DBus::default_dispatcher = &dispatcher;
+
+  // increase DBus-C++ frequency
+  new DBus::DefaultTimeout(100, false, &dispatcher);
 
 	DBus::Connection conn = DBus::Connection::SessionBus();
 
+	EchoClient client (conn, ECHO_SERVER_PATH, ECHO_SERVER_NAME);
+	g_client = &client;
+
 	pthread_t threads[THREADS];
 
-	for (int i = 0; i < THREADS; ++i)
+	thread_pipe_list[0] = dispatcher.add_pipe (handler1, NULL);
+	thread_pipe_list[1] = dispatcher.add_pipe (handler2, NULL);
+	thread_pipe_list[2] = dispatcher.add_pipe (handler3, NULL);
+	for (i = 0; i < THREADS; ++i)
 	{
-		pthread_create(threads+i, NULL, greeter_thread, &conn);
+		pthread_create(threads+i, NULL, greeter_thread, (void*) i);
 	}
-
+	
 	dispatcher.enter();
 
 	cout << "terminating" << endl;
 
-	for (int i = 0; i < THREADS; ++i)
+	for (i = 0; i < THREADS; ++i)
 	{
 		pthread_join(threads[i], NULL);
 	}
 
+	dispatcher.del_pipe (thread_pipe_list[0]);
+	dispatcher.del_pipe (thread_pipe_list[1]);
+	dispatcher.del_pipe (thread_pipe_list[2]);
+
 	return 0;
 }