X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src_test%2Ftest_client.cc;h=dcc22a68f59d0501d9339d36a4fcf34d9ee26c25;hb=3e002aa0945999a48cf8b9e852777f93d72830eb;hp=aeca5109cb6b13ef30ccfdfa322cbdb9e1db69c8;hpb=a4cadd50e661871c819f9f253f3595cfba647aed;p=libplpbus.git

diff --git a/src_test/test_client.cc b/src_test/test_client.cc
index aeca510..dcc22a6 100644
--- a/src_test/test_client.cc
+++ b/src_test/test_client.cc
@@ -4,6 +4,10 @@
  *  Created on: Jun 9, 2010
  *      Author: lamikr
  */
+#include <malloc.h>
+#include <unistd.h>
+
+#include <plp/log.h>
 
 #include "plpbus/BusServer.hh"
 #include "plpbus/BusClient.hh"
@@ -12,6 +16,8 @@
 using namespace std;
 using namespace plpbus;
 
+#define MSG_ID_HELLO	33
+
 class ClientListenerImpl : public IClientListener
 {
 	public:
@@ -24,22 +30,27 @@ class ClientListenerImpl : public IClientListener
 };
 
 int ClientListenerImpl::response_received(const char *msg_rsp_param) {
-	cout << "response_received(char *: " << msg_rsp_param << ") " << endl;
+	log_debug("response_received(char *%s)\n", msg_rsp_param);
 	return 0;
 }
 
 int ClientListenerImpl::response_received(const BusMessage *msg_rsp_param) {
-	cout << "response_received(BusMessage *) " << endl;
+	long	type;
+	int	err_flg;
+
+	type	= ((BusMessage *)msg_rsp_param)->get_type(&err_flg);
+	log_debug("response_received(), type: %ld\n", type);
+	((BusMessage *)msg_rsp_param)->printout();
 	return 0;
 }
 
 int ClientListenerImpl::event_received(const char *event_param) {
-	cout << "event_received(char *" << event_param << ") " << endl;
+	log_debug("event_received(%s)\n", event_param);
 	return 0;
 }
 
 int ClientListenerImpl::event_received(const BusMessage *event_param) {
-	cout << "event_received(BusMessage *)" << endl;
+	log_debug("event_received(BusMessage *)\n");
 	return 0;
 }
 
@@ -48,43 +59,49 @@ int main(int argc, char** argv)
 	BusClient		*client;
 	ClientListenerImpl	*lstnr;
 	int			err_flg;
-	BusMessage		*busmsg;
+	BusMessage		*bus_msg;
 
 	if (argc >= 3) {
 		client	= new BusClient();
 		lstnr	= new ClientListenerImpl();
 		err_flg	= client->init(argv[1]);
 		if (err_flg == 0) {
-			cout << "init success" << endl;
+			log_debug("init success\n");
 			err_flg	= client->add_client_listener(lstnr);
 			if (err_flg == 0) {
 				int	err_flg;
 				char	*rsp;
 
-				busmsg	= new BusMessage();
-				busmsg->add_string_parameter("a", "hello");
-				busmsg->add_string_parameter("b", "world");
-				client->send_message_and_request_response(busmsg);
+				bus_msg	= new BusMessage(MSG_ID_HELLO);
+				if (bus_msg != NULL) {
+					bus_msg->add_string_parameter("a", "hello");
+					bus_msg->add_string_parameter("b", "world");
+					client->send_message_and_request_response(bus_msg);
 
-				rsp	= NULL;
-				err_flg	= client->send_message_and_wait_response(argv[2], &rsp);
-				cout << "rsp: " << rsp << endl;
-				err_flg	= client->send_message_and_request_response(argv[2]);
-				if (err_flg == 0) {
-					cout << "request message send successfully"  << endl;
+					rsp	= NULL;
+					err_flg	= client->send_message_and_wait_response(argv[2], &rsp);
+					log_debug("rsp: %s\n", rsp);
+					free(rsp);
+					err_flg	= client->send_message_and_request_response(argv[2]);
+					if (err_flg == 0) {
+						log_debug("request message send successfully\n");
+					}
+					sleep(5);
+					delete(bus_msg);
 				}
-				sleep(10);
 			}
 			else {
-				cout << "client failed to add response listener"  << endl;
+				log_error("client failed to add response listener\n");
 			}
 		}
 		else {
-			cout << "client failed to init"  << endl;
+			log_error("client failed to init\n");
 		}
+		delete(client);
+		delete(lstnr);
 	}
 	else {
-		cout << "usage: <server_name> <message text>"  << endl;
+		log_info("usage: <server_name> <message text>\n");
 	}
 	return 0;
 }