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

trace throw error instead of assert in C

Browse Source
This commit is contained in:
云风
2013-09-16 13:01:37 +08:00
parent 36676afc03
commit 7263b3d0f9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lualib-src/lua-skynet.c
View File

@@ -399,6 +399,9 @@ static int
_trace_new(lua_State *L) { _trace_new(lua_State *L) {
struct trace_pool *p = lua_touserdata(L,1); struct trace_pool *p = lua_touserdata(L,1);
struct trace_info *t = trace_new(p); struct trace_info *t = trace_new(p);
if (t==NULL) {
return luaL_error(L, "Last trace didn't close");
}
lua_pushlightuserdata(L,t); lua_pushlightuserdata(L,t);
return 1; return 1;
} }

4
lualib-src/trace_service.c
View File

@@ -81,7 +81,9 @@ trace_release(struct trace_pool *p) {
struct trace_info * struct trace_info *
trace_new(struct trace_pool *p) { trace_new(struct trace_pool *p) {
assert(p->current == NULL); if (p->current) {
return NULL;
}
struct trace_info *t = malloc(sizeof(*t)); struct trace_info *t = malloc(sizeof(*t));
p->current = t; p->current = t;
t->session = 0; t->session = 0;