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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dennis
2016-01-06 15:57:42 +08:00
parent a39e822184 05003e3e2a
commit 30cbcfd013
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
3rd/lua/lvm.c
View File

@@ -200,18 +200,19 @@ void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
for (loop = 0; loop < MAXTAGLOOP; loop++) { for (loop = 0; loop < MAXTAGLOOP; loop++) {
const TValue *tm; const TValue *tm;
if (oldval != NULL) { if (oldval != NULL) {
lua_assert(ttistable(t) && ttisnil(oldval)); Table *h = hvalue(t);
lua_assert(ttisnil(oldval));
/* must check the metamethod */ /* must check the metamethod */
if ((tm = fasttm(L, hvalue(t)->metatable, TM_NEWINDEX)) == NULL && if ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
/* no metamethod; is there a previous entry in the table? */ /* no metamethod; is there a previous entry in the table? */
(oldval != luaO_nilobject || (oldval != luaO_nilobject ||
/* no previous entry; must create one. (The next test is /* no previous entry; must create one. (The next test is
always true; we only need the assignment.) */ always true; we only need the assignment.) */
(oldval = luaH_newkey(L, hvalue(t), key), 1))) { (oldval = luaH_newkey(L, h, key), 1))) {
/* no metamethod and (now) there is an entry with given key */ /* no metamethod and (now) there is an entry with given key */
setobj2t(L, cast(TValue *, oldval), val); setobj2t(L, cast(TValue *, oldval), val);
invalidateTMcache(hvalue(t)); invalidateTMcache(h);
luaC_barrierback(L, hvalue(t), val); luaC_barrierback(L, h, val);
return; return;
} }
/* else will try the metamethod */ /* else will try the metamethod */

12
lualib/sproto.lua
View File

@@ -197,6 +197,7 @@ function host:dispatch(...)
local bin = core.unpack(...) local bin = core.unpack(...)
header_tmp.type = nil header_tmp.type = nil
header_tmp.session = nil header_tmp.session = nil
header_tmp.ud = nil
local header, size = core.decode(self.__package, bin, header_tmp) local header, size = core.decode(self.__package, bin, header_tmp)
local content = bin:sub(size + 1) local content = bin:sub(size + 1)
if header.type then if header.type then
@@ -207,9 +208,9 @@ function host:dispatch(...)
result = core.decode(proto.request, content) result = core.decode(proto.request, content)
end end
if header_tmp.session then if header_tmp.session then
return "REQUEST", proto.name, result, gen_response(self, proto.response, header_tmp.session) return "REQUEST", proto.name, result, gen_response(self, proto.response, header_tmp.session), header.ud
else else
return "REQUEST", proto.name, result return "REQUEST", proto.name, result, nil, header.ud
end end
else else
-- response -- response
@@ -217,19 +218,20 @@ function host:dispatch(...)
local response = assert(self.__session[session], "Unknown session") local response = assert(self.__session[session], "Unknown session")
self.__session[session] = nil self.__session[session] = nil
if response == true then if response == true then
return "RESPONSE", session return "RESPONSE", session, nil, header.ud
else else
local result = core.decode(response, content) local result = core.decode(response, content)
return "RESPONSE", session, result return "RESPONSE", session, result, header.ud
end end
end end
end end
function host:attach(sp) function host:attach(sp)
return function(name, args, session) return function(name, args, session, ud)
local proto = queryproto(sp, name) local proto = queryproto(sp, name)
header_tmp.type = proto.tag header_tmp.type = proto.tag
header_tmp.session = session header_tmp.session = session
header_tmp.ud = ud
local header = core.encode(self.__package, header_tmp) local header = core.encode(self.__package, header_tmp)
if session then if session then

2
skynet-src/skynet_mq.c
View File

@@ -84,7 +84,7 @@ skynet_mq_create(uint32_t handle) {
SPIN_INIT(q) SPIN_INIT(q)
// When the queue is create (always between service create and service init) , // When the queue is create (always between service create and service init) ,
// set in_global flag to avoid push it to global queue . // set in_global flag to avoid push it to global queue .
// If the service init success, skynet_context_new will call skynet_mq_force_push to push it to global queue. // If the service init success, skynet_context_new will call skynet_mq_push to push it to global queue.
q->in_global = MQ_IN_GLOBAL; q->in_global = MQ_IN_GLOBAL;
q->release = 0; q->release = 0;
q->overload = 0; q->overload = 0;

2
skynet-src/socket_server.h
View File

@@ -16,7 +16,7 @@ struct socket_server;
struct socket_message { struct socket_message {
int id; int id;
uintptr_t opaque; uintptr_t opaque;
int ud; // for accept, ud is listen id ; for data, ud is size of data int ud; // for accept, ud is new connection id ; for data, ud is size of data
char * data; char * data;
}; };