macros LUA_ENTRY/LUA_EXIT to control exclusive access to Lua core

1 files changed, 249 insertions, 72 deletions

diff --git a/lapi.c b/lapi.c
index bf5eea52..0ca9bad6 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 1.117 2001/01/18 15:59:09 roberto Exp roberto $
+** $Id: lapi.c,v 1.118 2001/01/19 13:20:30 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -54,7 +54,11 @@ void luaA_pushobject (lua_State *L, const TObject *o) {
 }
 
 LUA_API int lua_stackspace (lua_State *L) {
-  return (L->stack_last - L->top);
+  int i;
+  LUA_ENTRY;
+  i = (L->stack_last - L->top);
+  LUA_EXIT;
+  return i;
 }
 
 
@@ -65,36 +69,50 @@ LUA_API int lua_stackspace (lua_State *L) {
 
 
 LUA_API int lua_gettop (lua_State *L) {
-  return (L->top - L->Cbase);
+  int i;
+  LUA_ENTRY;
+  i = (L->top - L->Cbase);
+  LUA_EXIT;
+  return i;
 }
 
 
 LUA_API void lua_settop (lua_State *L, int index) {
+  LUA_ENTRY;
   if (index >= 0)
     luaD_adjusttop(L, L->Cbase, index);
   else
     L->top = L->top+index+1;  /* index is negative */
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_remove (lua_State *L, int index) {
-  StkId p = luaA_index(L, index);
+  StkId p;
+  LUA_ENTRY;
+  p = luaA_index(L, index);
   while (++p < L->top) setobj(p-1, p);
   L->top--;
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_insert (lua_State *L, int index) {
-  StkId p = luaA_index(L, index);
+  StkId p;
   StkId q;
+  LUA_ENTRY;
+  p = luaA_index(L, index);
   for (q = L->top; q>p; q--) setobj(q, q-1);
   setobj(p, L->top);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_pushvalue (lua_State *L, int index) {
+  LUA_ENTRY;
   setobj(L->top, luaA_index(L, index));
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
@@ -105,24 +123,43 @@ LUA_API void lua_pushvalue (lua_State *L, int index) {
 
 
 LUA_API int lua_type (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL) ? LUA_TNONE : ttype(o);
+  StkId o;
+  int i;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  i = (o == NULL) ? LUA_TNONE : ttype(o);
+  LUA_EXIT;
+  return i;
 }
 
 LUA_API const char *lua_typename (lua_State *L, int t) {
+  const char *s;
+  LUA_ENTRY;
   UNUSED(L);
-  return (t == LUA_TNONE) ? "no value" : luaO_typenames[t];
+  s = (t == LUA_TNONE) ? "no value" : luaO_typenames[t];
+  LUA_EXIT;
+  return s;
 }
 
 
 LUA_API int lua_iscfunction (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL) ? 0 : iscfunction(o);
+  StkId o;
+  int i;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  i = (o == NULL) ? 0 : iscfunction(o);
+  LUA_EXIT;
+  return i;
 }
 
 LUA_API int lua_isnumber (lua_State *L, int index) {
-  TObject *o = luaA_indexAcceptable(L, index);
-  return (o == NULL) ? 0 : (tonumber(o) == 0);
+  TObject *o;
+  int i;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  i = (o == NULL) ? 0 : (tonumber(o) == 0);
+  LUA_EXIT;
+  return i;
 }
 
 LUA_API int lua_isstring (lua_State *L, int index) {
@@ -132,62 +169,113 @@ LUA_API int lua_isstring (lua_State *L, int index) {
 
 
 LUA_API int lua_tag (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL) ? LUA_NOTAG : luaT_tag(o);
+  StkId o;
+  int i;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  i = (o == NULL) ? LUA_NOTAG : luaT_tag(o);
+  LUA_EXIT;
+  return i;
 }
 
 LUA_API int lua_equal (lua_State *L, int index1, int index2) {
-  StkId o1 = luaA_indexAcceptable(L, index1);
-  StkId o2 = luaA_indexAcceptable(L, index2);
-  if (o1 == NULL || o2 == NULL) return 0;  /* index out-of-range */
-  else return luaO_equalObj(o1, o2);
+  StkId o1, o2;
+  int i;
+  LUA_ENTRY;
+  o1 = luaA_indexAcceptable(L, index1);
+  o2 = luaA_indexAcceptable(L, index2);
+  i = (o1 == NULL || o2 == NULL) ? 0  /* index out-of-range */
+                                 : luaO_equalObj(o1, o2);
+  LUA_EXIT;
+  return i;
 }
 
 LUA_API int lua_lessthan (lua_State *L, int index1, int index2) {
-  StkId o1 = luaA_indexAcceptable(L, index1);
-  StkId o2 = luaA_indexAcceptable(L, index2);
-  if (o1 == NULL || o2 == NULL) return 0;  /* index out-of-range */
-  else return luaV_lessthan(L, o1, o2, L->top);
+  StkId o1, o2;
+  int i;
+  LUA_ENTRY;
+  o1 = luaA_indexAcceptable(L, index1);
+  o2 = luaA_indexAcceptable(L, index2);
+  i = (o1 == NULL || o2 == NULL) ? 0  /* index out-of-range */
+                                 : luaV_lessthan(L, o1, o2, L->top);
+  LUA_EXIT;
+  return i;
 }
 
 
 
 LUA_API lua_Number lua_tonumber (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || tonumber(o)) ? 0 : nvalue(o);
+  StkId o;
+  lua_Number n;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  n = (o == NULL || tonumber(o)) ? 0 : nvalue(o);
+  LUA_EXIT;
+  return n;
 }
 
 LUA_API const char *lua_tostring (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || tostring(L, o)) ? NULL : svalue(o);
+  StkId o;
+  const char *s;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  s = (o == NULL || tostring(L, o)) ? NULL : svalue(o);
+  LUA_EXIT;
+  return s;
 }
 
 LUA_API size_t lua_strlen (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || tostring(L, o)) ? 0 : tsvalue(o)->len;
+  StkId o;
+  size_t l;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  l = (o == NULL || tostring(L, o)) ? 0 : tsvalue(o)->len;
+  LUA_EXIT;
+  return l;
 }
 
 LUA_API lua_CFunction lua_tocfunction (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->f.c;
+  StkId o;
+  lua_CFunction f;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  f = (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->f.c;
+  LUA_EXIT;
+  return f;
 }
 
 LUA_API void *lua_touserdata (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || ttype(o) != LUA_TUSERDATA) ? NULL :
+  StkId o;
+  void *p;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  p = (o == NULL || ttype(o) != LUA_TUSERDATA) ? NULL :
                                                     tsvalue(o)->u.d.value;
+  LUA_EXIT;
+  return p;
 }
 
 LUA_API const void *lua_topointer (lua_State *L, int index) {
-  StkId o = luaA_indexAcceptable(L, index);
-  if (o == NULL) return NULL;
-  switch (ttype(o)) {
-    case LUA_TTABLE: 
-      return hvalue(o);
-    case LUA_TFUNCTION:
-      return clvalue(o);
-    default: return NULL;
+  StkId o;
+  const void *p;
+  LUA_ENTRY;
+  o = luaA_indexAcceptable(L, index);
+  if (o == NULL) p = NULL;
+  else {
+    switch (ttype(o)) {
+      case LUA_TTABLE: 
+        p = hvalue(o);
+        break;
+      case LUA_TFUNCTION:
+        p = clvalue(o);
+        break;
+      default:
+        p = NULL;
+        break;
+    }
   }
+  LUA_EXIT;
+  return p;
 }
 
 
@@ -198,20 +286,26 @@ LUA_API const void *lua_topointer (lua_State *L, int index) {
 
 
 LUA_API void lua_pushnil (lua_State *L) {
+  LUA_ENTRY;
   setnilvalue(L->top);
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+  LUA_ENTRY;
   setnvalue(L->top, n);
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
+  LUA_ENTRY;
   setsvalue(L->top, luaS_newlstr(L, s, len));
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
@@ -224,16 +318,20 @@ LUA_API void lua_pushstring (lua_State *L, const char *s) {
 
 
 LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
+  LUA_ENTRY;
   luaV_Cclosure(L, fn, n);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_pushusertag (lua_State *L, void *u, int tag) {
+  LUA_ENTRY;
   /* ORDER LUA_T */
   if (!(tag == LUA_ANYTAG || tag == LUA_TUSERDATA || validtag(G(L), tag)))
     luaO_verror(L, "invalid tag for a userdata (%d)", tag);
   setuvalue(L->top, luaS_createudata(L, u, tag));
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
@@ -244,60 +342,80 @@ LUA_API void lua_pushusertag (lua_State *L, void *u, int tag) {
 
 
 LUA_API void lua_getglobal (lua_State *L, const char *name) {
-  StkId top = L->top;
+  StkId top;
+  LUA_ENTRY;
+  top = L->top;
   setobj(top, luaV_getglobal(L, luaS_new(L, name)));
   L->top = top;
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_gettable (lua_State *L, int index) {
-  StkId t = Index(L, index);
-  StkId top = L->top;
+  StkId t, top;
+  LUA_ENTRY;
+  t = Index(L, index);
+  top = L->top;
   setobj(top-1, luaV_gettable(L, t));
   L->top = top;  /* tag method may change top */
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_rawget (lua_State *L, int index) {
-  StkId t = Index(L, index);
+  StkId t;
+  LUA_ENTRY;
+  t = Index(L, index);
   lua_assert(ttype(t) == LUA_TTABLE);
   setobj(L->top - 1, luaH_get(hvalue(t), L->top - 1));
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_rawgeti (lua_State *L, int index, int n) {
-  StkId o = Index(L, index);
+  StkId o;
+  LUA_ENTRY;
+  o = Index(L, index);
   lua_assert(ttype(o) == LUA_TTABLE);
   setobj(L->top, luaH_getnum(hvalue(o), n));
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_getglobals (lua_State *L) {
+  LUA_ENTRY;
   sethvalue(L->top, L->gt);
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
 LUA_API int lua_getref (lua_State *L, int ref) {
+  int status = 1;
+  LUA_ENTRY;
   if (ref == LUA_REFNIL) {
     setnilvalue(L->top);
+    api_incr_top(L);
   }
   else if (0 <= ref && ref < G(L)->nref &&
           (G(L)->refArray[ref].st == LOCK || G(L)->refArray[ref].st == HOLD)) {
     setobj(L->top, &G(L)->refArray[ref].o);
+    api_incr_top(L);
   }
   else
-    return 0;
-  api_incr_top(L);
-  return 1;
+    status = 0;
+  LUA_EXIT;
+  return status;
 }
 
 
 LUA_API void lua_newtable (lua_State *L) {
+  LUA_ENTRY;
   sethvalue(L->top, luaH_new(L, 0));
   api_incr_top(L);
+  LUA_EXIT;
 }
 
 
@@ -308,45 +426,61 @@ LUA_API void lua_newtable (lua_State *L) {
 
 
 LUA_API void lua_setglobal (lua_State *L, const char *name) {
-  StkId top = L->top;
+  StkId top;
+  LUA_ENTRY;
+  top = L->top;
   luaV_setglobal(L, luaS_new(L, name));
   L->top = top-1;  /* remove element from the top */
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_settable (lua_State *L, int index) {
-  StkId t = Index(L, index);
-  StkId top = L->top;
+  StkId t, top;
+  LUA_ENTRY;
+  t = Index(L, index);
+  top = L->top;
   luaV_settable(L, t, top-2);
   L->top = top-2;  /* pop index and value */
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_rawset (lua_State *L, int index) {
-  StkId t = Index(L, index);
+  StkId t;
+  LUA_ENTRY;
+  t = Index(L, index);
   lua_assert(ttype(t) == LUA_TTABLE);
   setobj(luaH_set(L, hvalue(t), L->top-2), (L->top-1));
   L->top -= 2;
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_rawseti (lua_State *L, int index, int n) {
-  StkId o = Index(L, index);
+  StkId o;
+  LUA_ENTRY;
+  o = Index(L, index);
   lua_assert(ttype(o) == LUA_TTABLE);
   setobj(luaH_setnum(L, hvalue(o), n), (L->top-1));
   L->top--;
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_setglobals (lua_State *L) {
-  StkId newtable = --L->top;
+  StkId newtable;
+  LUA_ENTRY;
+  newtable = --L->top;
   lua_assert(ttype(newtable) == LUA_TTABLE);
   L->gt = hvalue(newtable);
+  LUA_EXIT;
 }
 
 
 LUA_API int lua_ref (lua_State *L,  int lock) {
   int ref;
+  LUA_ENTRY;
   if (ttype(L->top-1) == LUA_TNIL)
     ref = LUA_REFNIL;
   else {
@@ -363,6 +497,7 @@ LUA_API int lua_ref (lua_State *L,  int lock) {
     G(L)->refArray[ref].st = lock ? LOCK : HOLD;
   }
   L->top--;
+  LUA_EXIT;
   return ref;
 }
 
@@ -373,7 +508,9 @@ LUA_API int lua_ref (lua_State *L,  int lock) {
 */
 
 LUA_API void lua_rawcall (lua_State *L, int nargs, int nresults) {
+  LUA_ENTRY;
   luaD_call(L, L->top-(nargs+1), nresults);
+  LUA_EXIT;
 }
 
 
@@ -386,19 +523,29 @@ LUA_API void lua_rawcall (lua_State *L, int nargs, int nresults) {
 #define GCunscale(x)            ((mem_int)(x)<<10)
 
 LUA_API int lua_getgcthreshold (lua_State *L) {
-  return GCscale(G(L)->GCthreshold);
+  int threshold;
+  LUA_ENTRY;
+  threshold = GCscale(G(L)->GCthreshold);
+  LUA_EXIT;
+  return threshold;
 }
 
 LUA_API int lua_getgccount (lua_State *L) {
-  return GCscale(G(L)->nblocks);
+  int count;
+  LUA_ENTRY;
+  count = GCscale(G(L)->nblocks);
+  LUA_EXIT;
+  return count;
 }
 
 LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) {
+  LUA_ENTRY;
   if (newthreshold > GCscale(ULONG_MAX))
     G(L)->GCthreshold = ULONG_MAX;
   else
     G(L)->GCthreshold = GCunscale(newthreshold);
   luaC_checkGC(L);
+  LUA_EXIT;
 }
 
 
@@ -407,6 +554,7 @@ LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) {
 */
 
 LUA_API void lua_settag (lua_State *L, int tag) {
+  LUA_ENTRY;
   luaT_realtag(L, tag);
   switch (ttype(L->top-1)) {
     case LUA_TTABLE:
@@ -419,69 +567,98 @@ LUA_API void lua_settag (lua_State *L, int tag) {
       luaO_verror(L, "cannot change the tag of a %.20s",
                   luaO_typename(L->top-1));
   }
+  LUA_EXIT;
+}
+
+
+LUA_API void lua_error (lua_State *L, const char *s) {
+  LUA_ENTRY;
+  luaD_error(L, s);
+  LUA_EXIT;
 }
 
 
 LUA_API void lua_unref (lua_State *L, int ref) {
+  LUA_ENTRY;
   if (ref >= 0) {
     lua_assert(ref < G(L)->nref && G(L)->refArray[ref].st < 0);
     G(L)->refArray[ref].st = G(L)->refFree;
     G(L)->refFree = ref;
   }
+  LUA_EXIT;
 }
 
 
 LUA_API int lua_next (lua_State *L, int index) {
-  StkId t = luaA_index(L, index);
+  StkId t;
   Node *n;
+  int more;
+  LUA_ENTRY;
+  t = luaA_index(L, index);
   lua_assert(ttype(t) == LUA_TTABLE);
   n = luaH_next(L, hvalue(t), luaA_index(L, -1));
   if (n) {
     setobj(L->top-1, key(n));
     setobj(L->top, val(n));
     api_incr_top(L);
-    return 1;
+    more = 1;
   }
   else {  /* no more elements */
     L->top -= 1;  /* remove key */
-    return 0;
+    more = 0;
   }
+  LUA_EXIT;
+  return more;
 }
 
 
 LUA_API int lua_getn (lua_State *L, int index) {
-  Hash *h = hvalue(luaA_index(L, index));
-  const TObject *value = luaH_getstr(h, luaS_newliteral(L, "n"));  /* = h.n */
+  Hash *h;
+  const TObject *value;
+  int n;
+  LUA_ENTRY;
+  h = hvalue(luaA_index(L, index));
+  value = luaH_getstr(h, luaS_newliteral(L, "n"));  /* = h.n */
   if (ttype(value) == LUA_TNUMBER)
-    return (int)nvalue(value);
+    n = (int)nvalue(value);
   else {
     lua_Number max = 0;
     int i = h->size;
-    Node *n = h->node;
+    Node *nd = h->node;
     while (i--) {
-      if (ttype(key(n)) == LUA_TNUMBER &&
-          ttype(val(n)) != LUA_TNIL &&
-          nvalue(key(n)) > max)
-        max = nvalue(key(n));
-      n++;
+      if (ttype(key(nd)) == LUA_TNUMBER &&
+          ttype(val(nd)) != LUA_TNIL &&
+          nvalue(key(nd)) > max)
+        max = nvalue(key(nd));
+      nd++;
     }
-    return (int)max;
+    n = (int)max;
   }
+  LUA_EXIT;
+  return n;
 }
 
 
 LUA_API void lua_concat (lua_State *L, int n) {
-  StkId top = L->top;
+  StkId top;
+  LUA_ENTRY;
+  top = L->top;
   luaV_strconc(L, n, top);
   L->top = top-(n-1);
   luaC_checkGC(L);
+  LUA_EXIT;
 }
 
 
 LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
-  TString *ts = luaS_newudata(L, size, NULL);
+  TString *ts;
+  void *p;
+  LUA_ENTRY;
+  ts = luaS_newudata(L, size, NULL);
   setuvalue(L->top, ts);
   api_incr_top(L);
-  return ts->u.d.value;
+  p = ts->u.d.value;
+  LUA_EXIT;
+  return p;
 }