From 866e59811eeb327544b9996155fe5e45fd8067e8 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Mon, 26 May 2014 13:23:57 +0800
Subject: [PATCH] remove unused mq api

---
 examples/config            |  2 +-
 skynet-src/skynet_mq.c     | 19 ++-----------------
 skynet-src/skynet_mq.h     |  4 +---
 skynet-src/skynet_server.c |  4 ++--
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/examples/config b/examples/config
index 2f621b83..087a9a14 100644
--- a/examples/config
+++ b/examples/config
@@ -12,4 +12,4 @@ lualoader = "lualib/loader.lua"
 -- preload = "./examples/preload.lua"	-- run preload.lua before every lua service run
 snax = root.."examples/?.lua;"..root.."test/?.lua"
 cpath = root.."cservice/?.so"
-daemon = "./skynet.pid"
+-- daemon = "./skynet.pid"
diff --git a/skynet-src/skynet_mq.c b/skynet-src/skynet_mq.c
index d146fd56..c912257a 100644
--- a/skynet-src/skynet_mq.c
+++ b/skynet-src/skynet_mq.c
@@ -44,7 +44,7 @@ static struct global_queue *Q = NULL;
 
 #define GP(p) ((p) % MAX_GLOBAL_MQ)
 
-static void 
+void 
 skynet_globalmq_push(struct message_queue * queue) {
 	struct global_queue *q= Q;
 
@@ -214,21 +214,6 @@ skynet_mq_init() {
 	Q=q;
 }
 
-void 
-skynet_mq_force_push(struct message_queue * queue) {
-	assert(queue->in_global);
-	skynet_globalmq_push(queue);
-}
-
-void 
-skynet_mq_pushglobal(struct message_queue *queue) {
-	LOCK(queue)
-	assert(queue->in_global);
-	skynet_globalmq_push(queue);
-	queue->in_global = MQ_IN_GLOBAL;
-	UNLOCK(queue)
-}
-
 void 
 skynet_mq_mark_release(struct message_queue *q) {
 	LOCK(q)
@@ -257,7 +242,7 @@ skynet_mq_release(struct message_queue *q, message_drop drop_func, void *ud) {
 		UNLOCK(q)
 		_drop_queue(q, drop_func, ud);
 	} else {
-		skynet_mq_force_push(q);
+		skynet_globalmq_push(q);
 		UNLOCK(q)
 	}
 }
diff --git a/skynet-src/skynet_mq.h b/skynet-src/skynet_mq.h
index 5ac582a1..df1a9998 100644
--- a/skynet-src/skynet_mq.h
+++ b/skynet-src/skynet_mq.h
@@ -13,6 +13,7 @@ struct skynet_message {
 
 struct message_queue;
 
+void skynet_globalmq_push(struct message_queue * queue);
 struct message_queue * skynet_globalmq_pop(void);
 
 struct message_queue * skynet_mq_create(uint32_t handle);
@@ -30,9 +31,6 @@ void skynet_mq_push(struct message_queue *q, struct skynet_message *message);
 // return the length of message queue, for debug
 int skynet_mq_length(struct message_queue *q);
 
-void skynet_mq_force_push(struct message_queue *q);
-void skynet_mq_pushglobal(struct message_queue *q);
-
 void skynet_mq_init();
 
 #endif
diff --git a/skynet-src/skynet_server.c b/skynet-src/skynet_server.c
index 4bc7b66a..4ec7ea54 100644
--- a/skynet-src/skynet_server.c
+++ b/skynet-src/skynet_server.c
@@ -139,7 +139,7 @@ skynet_context_new(const char * name, const char *param) {
 		if (ret) {
 			ctx->init = true;
 		}
-		skynet_mq_force_push(queue);
+		skynet_globalmq_push(queue);
 		if (ret) {
 			skynet_error(ret, "LAUNCH %s %s", name, param ? param : "");
 		}
@@ -258,7 +258,7 @@ skynet_context_message_dispatch(struct skynet_monitor *sm) {
 	}
 
 	assert(q == ctx->queue);
-	skynet_mq_pushglobal(q);
+	skynet_globalmq_push(q);
 	skynet_context_release(ctx);
 
 	skynet_monitor_trigger(sm, 0,0);