diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2011-08-23 14:24:34 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2011-08-23 14:24:34 -0300 |
commit | 3dc5475e239e2da52a380288ae8b293a6b019f81 (patch) | |
tree | 3da13bd67407f9717b5fb9a024dca38b78589bfc /lstate.h | |
parent | 8a008a20579dd6818cb770147c8765b72eb2acfe (diff) | |
download | lua-3dc5475e239e2da52a380288ae8b293a6b019f81.tar.gz lua-3dc5475e239e2da52a380288ae8b293a6b019f81.tar.bz2 lua-3dc5475e239e2da52a380288ae8b293a6b019f81.zip |
'nCcalls' should be local to each thread, as each thread may have its
own C stack (with LuaThreads or something similar)
Diffstat (limited to 'lstate.h')
-rw-r--r-- | lstate.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lstate.h,v 2.71 2010/12/20 19:40:07 roberto Exp roberto $ | 2 | ** $Id: lstate.h,v 2.72 2011/06/02 19:31:40 roberto Exp roberto $ |
3 | ** Global State | 3 | ** Global State |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -118,7 +118,6 @@ typedef struct global_State { | |||
118 | lu_mem lastmajormem; /* memory in use after last major collection */ | 118 | lu_mem lastmajormem; /* memory in use after last major collection */ |
119 | stringtable strt; /* hash table for strings */ | 119 | stringtable strt; /* hash table for strings */ |
120 | TValue l_registry; | 120 | TValue l_registry; |
121 | unsigned short nCcalls; /* number of nested C calls */ | ||
122 | lu_byte currentwhite; | 121 | lu_byte currentwhite; |
123 | lu_byte gcstate; /* state of garbage collector */ | 122 | lu_byte gcstate; /* state of garbage collector */ |
124 | lu_byte gckind; /* kind of GC running */ | 123 | lu_byte gckind; /* kind of GC running */ |
@@ -161,6 +160,7 @@ struct lua_State { | |||
161 | StkId stack; /* stack base */ | 160 | StkId stack; /* stack base */ |
162 | int stacksize; | 161 | int stacksize; |
163 | unsigned short nny; /* number of non-yieldable calls in stack */ | 162 | unsigned short nny; /* number of non-yieldable calls in stack */ |
163 | unsigned short nCcalls; /* number of nested C calls */ | ||
164 | lu_byte hookmask; | 164 | lu_byte hookmask; |
165 | lu_byte allowhook; | 165 | lu_byte allowhook; |
166 | int basehookcount; | 166 | int basehookcount; |