lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

use fork to dispatch more socket message

Browse Source
This commit is contained in:
Cloud Wu
2014-11-13 11:19:58 +08:00
parent fa78623b1c
commit 8e4a175155
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lualib-src/lua-netpack.c
View File

@@ -240,7 +240,6 @@ filter_data_(lua_State *L, int fd, uint8_t * buffer, int size) {
buffer += need; buffer += need;
size -= need; size -= need;
if (size == 0) { if (size == 0) {
if (q == NULL || q->head == q->tail ) {
lua_pushvalue(L, lua_upvalueindex(TYPE_DATA)); lua_pushvalue(L, lua_upvalueindex(TYPE_DATA));
lua_pushinteger(L, fd); lua_pushinteger(L, fd);
lua_pushlightuserdata(L, uc->pack.buffer); lua_pushlightuserdata(L, uc->pack.buffer);
@@ -248,12 +247,6 @@ filter_data_(lua_State *L, int fd, uint8_t * buffer, int size) {
skynet_free(uc); skynet_free(uc);
return 5; return 5;
} }
else{
push_data(L, fd, uc->pack.buffer, uc->pack.size, 0);
skynet_free(uc);
return 1;
}
}
// more data // more data
push_data(L, fd, uc->pack.buffer, uc->pack.size, 0); push_data(L, fd, uc->pack.buffer, uc->pack.size, 0);
skynet_free(uc); skynet_free(uc);
@@ -281,7 +274,6 @@ filter_data_(lua_State *L, int fd, uint8_t * buffer, int size) {
} }
if (size == pack_size) { if (size == pack_size) {
// just one package // just one package
if ( q == NULL || q->head == q->tail) {
lua_pushvalue(L, lua_upvalueindex(TYPE_DATA)); lua_pushvalue(L, lua_upvalueindex(TYPE_DATA));
lua_pushinteger(L, fd); lua_pushinteger(L, fd);
void * result = skynet_malloc(pack_size); void * result = skynet_malloc(pack_size);
@@ -290,13 +282,6 @@ filter_data_(lua_State *L, int fd, uint8_t * buffer, int size) {
lua_pushinteger(L, size); lua_pushinteger(L, size);
return 5; return 5;
} }
else{
push_data(L, fd, buffer, pack_size, 1);
buffer += pack_size;
size -= pack_size;
return 1;
}
}
// more data // more data
push_data(L, fd, buffer, pack_size, 1); push_data(L, fd, buffer, pack_size, 1);
buffer += pack_size; buffer += pack_size;

20
lualib/snax/gateserver.lua
View File

@@ -53,20 +53,32 @@ function gateserver.start(handler)
local MSG = {} local MSG = {}
function MSG.data(fd, msg, sz) local function dispatch_msg(fd, msg, sz)
if connection[fd] then if connection[fd] then
handler.message(fd, msg, sz) handler.message(fd, msg, sz)
else
skynet.error(string.format("Drop message from fd (%d) : %s", fd, netpack.tostring(msg,sz)))
end end
end end
function MSG.more() MSG.data = dispatch_msg
local function dispatch_queue()
local fd, msg, sz = netpack.pop(queue)
if fd then
-- may dispatch even the handler.message blocked
-- If the handler.message never block, the queue should be empty, so only fork once and then exit.
skynet.fork(dispatch_queue)
dispatch_msg(fd, msg, sz)
for fd, msg, sz in netpack.pop, queue do for fd, msg, sz in netpack.pop, queue do
if connection[fd] then dispatch_msg(fd, msg, sz)
handler.message(fd, msg, sz)
end end
end end
end end
MSG.more = dispatch_queue
function MSG.open(fd, msg) function MSG.open(fd, msg)
if client_number >= maxclient then if client_number >= maxclient then
socketdriver.close(fd) socketdriver.close(fd)