Cloud Wu
cbf22ac9f3
release rc2
2016-03-07 11:46:30 +08:00
Cloud Wu
8f7fa6a562
merge sproto
2016-02-25 14:40:24 +08:00
cloudwu
7b96eb28eb
Merge pull request #455 from niuys/patch-2
...
error deal for query containing multi statement
2016-02-22 16:15:51 +08:00
snail
14ccf96eb0
error deal for query containing multi statement
...
A query may execute multi sql statements.If an error occurs for any sql, the result should return the error info.
2016-02-22 11:23:35 +08:00
Cloud Wu
ea8557296b
fix issue #450
2016-02-13 19:20:07 +08:00
cloudwu
2a821fb62a
Merge pull request #445 from DavidFeng/patch
...
fix
2016-01-27 13:55:14 +08:00
David Feng
d982009260
fix
2016-01-27 10:35:48 +08:00
cloudwu
a3f028ee3d
Merge pull request #444 from DavidFeng/patch-1
...
修复调试模块调试结束后定时器没有取消的问题
2016-01-22 11:05:04 +08:00
David Feng
d34b092cdd
remotedebug.lua call skynet.timeout() only in debug hook
...
定时器在debug结束后没有取消。
2016-01-22 10:28:03 +08:00
David Feng
77f4071191
remove unused local variables
2016-01-22 10:26:13 +08:00
cloudwu
653b29145d
Merge pull request #442 from DavidFeng/patch-2
...
change socket.write to socketdriver.send
2016-01-20 22:05:23 +08:00
David Feng
96e0a4e3cc
change socket.write to socketdriver.send
...
这样改过之后可以直接调试使用了gate服务的模块。
因为gate服务注册了socket类型的消息，所以不能和socket模块一块使用；而debug模块只使用到了socket模块的write函数，所以这样修改后对debug的功能并没有影响，但改过之后就可以调试gate服务了。
2016-01-20 19:24:58 +08:00
Cloud Wu
1da92850a0
bugfix: dispatch local global message queue
2016-01-19 17:14:52 +08:00
Cloud Wu
9747cf9aee
don't assert here
2016-01-19 16:16:18 +08:00
Cloud Wu
7f45b3fd10
correct maxsz
2016-01-13 13:13:31 +08:00
cloudwu
217ab47577
Merge pull request #435 from niuys/patch-1
...
reduce needless 'add_string' call
2016-01-11 15:56:52 +08:00
snail
532f47444b
reduce needless 'add_string' call
...
Short strings in lua proto are reused most of the time. The string in SSM may be added by one service and used by other service, there is no need to call `add_string`,which will call 'new_string' first.
2016-01-11 15:06:51 +08:00
Cloud Wu
24f9ee1560
work thread for channel may not create if you never connect
2016-01-08 18:34:45 +08:00
Cloud Wu
d7a76c7c72
If no content-length, read all. see issue #431
2016-01-07 16:01:17 +08:00
Cloud Wu
c175d66e23
remove unused function
2016-01-06 16:55:15 +08:00
Cloud Wu
05003e3e2a
sproto.attach also need ud
2016-01-05 17:51:48 +08:00
Cloud Wu
64c2cb1b51
sproto dispatch support ud
2016-01-05 16:06:20 +08:00
cloudwu
7f0e4eac8a
Merge pull request #428 from fztcjjl/master
...
fix comment error
2016-01-04 16:07:50 +08:00
Cloud Wu
141a4d0992
lua 5.3.2 bugfix,see http://lua-users.org/lists/lua-l/2016-01/msg00000.html
2016-01-04 16:01:03 +08:00
fztcjjl
645ce72e7e
fix comment error
2016-01-04 14:55:28 +08:00
cloudwu
fca4d67a43
Merge pull request #425 from DeanHH/patch-1
...
Update skynet_mq.c
2016-01-01 00:08:23 +08:00
DeanHH
014cbb9676
Update skynet_mq.c
...
Comment error:-)
2015-12-31 17:31:08 +08:00
Cloud Wu
a3a7d129ab
V1.0.0 RC
2015-12-28 13:55:01 +08:00
cloudwu
2e69370594
Merge pull request #418 from m2q1n9/master
...
fix a debug_console error
2015-12-28 00:15:29 +08:00
m2q1n9
bcdfcde72f
fix code indent
2015-12-27 22:38:58 +08:00
Cloud Wu
0c4ea81709
EAGAIN and EWOULDBLOCK may be not the same value, see issue #420
2015-12-27 19:31:32 +08:00
m2q1n9
b9ad559992
fix a debug_console error
2015-12-25 17:24:50 +08:00
Cloud Wu
f0ac66787e
socket channel connect should wait for last closing
2015-12-23 20:22:46 +08:00
Cloud Wu
5a1b2e51f7
exit dispatch_by_order when close channel
2015-12-23 19:55:42 +08:00
Cloud Wu
7acf6d8767
remove unused varargs
2015-12-18 23:28:55 +08:00
Cloud Wu
20610723a1
add debug api to show current service c memory
2015-12-17 22:13:51 +08:00
Cloud Wu
9d6bde01a3
profile support skynet coroutine
2015-12-17 20:41:02 +08:00
Cloud Wu
4a80a75fd6
skynet.coroutine.status may return blocked
2015-12-17 17:11:54 +08:00
Cloud Wu
872491e968
Add skynet.coroutine module
2015-12-17 16:25:24 +08:00
cloudwu
41252e8c21
Merge pull request #414 from DavidFeng/patch-1
...
fix typo
2015-12-17 16:16:38 +08:00
David Feng
a9fc577560
fix typo
...
fix a little mistake
2015-12-17 15:53:39 +08:00
Cloud Wu
4f8427a23f
close socket when sp_add failed
2015-12-17 10:04:38 +08:00
cloudwu
8ff5bcb372
Merge pull request #410 from kezhuw/bugfix_dangling_c_pointer_to_lua_string
...
Fix dangling c pointer to lua string value
2015-12-15 00:56:40 +08:00
Kezhu Wang
bfe8eeb4b3
Fix dangling c pointer to lua string value
...
Lua string object referenced by C pointer from lua_tolstring() was
removed from stack by lua_settop(L,0).
Lua 5.3 Reference Manual says:
> Because Lua has garbage collection, there is no guarantee that the
> pointer returned by lua_tolstring will be valid after the
> corresponding Lua value is removed from the stack.
That is it.
Introduced in commit 9937081854
2015-12-14 16:16:37 +08:00
Cloud Wu
ccb9cdbc9d
update sproto schema
2015-12-14 12:25:26 +08:00
cloudwu
4006faac29
Merge pull request #407 from linse073/patch-3
...
loginserver.lua中的launch_slave的lua消息处理函数的return问题
2015-12-08 13:31:16 +08:00
linse073
03617f23a1
loginserver.lua中的launch_slave的lua消息处理函数的return问题
...
之前可能是我没有表述清楚，这两个return我猜想是不是手误加上去的，因为之前都没有见过需要在消息处理函数里面return skynet.ret调用的结果，实际去掉后测试也是没有问题的，和是不是两次pcall的调用应该是没有关系的。
2015-12-07 21:00:19 +08:00
Cloud Wu
d4d188541f
add socket.close_fd
2015-12-06 16:48:28 +08:00
Cloud Wu
3a2766dd0e
return results, see pr #403
2015-12-04 10:47:30 +08:00
Cloud Wu
1431f55d28
update readme
2015-12-03 15:37:43 +08:00
