锁的粒度改为从进入invoke session到退出

Author: chexiongsheng

Assets/XLua/Src/LuaEnv.cs

@@ -32,7 +32,9 @@ public class LuaEnv : IDisposable
 
         internal int errorFuncRef = -1;
 
+#if THREAD_SAFT || HOTFIX_ENABLE
         internal object luaEnvLock = new object();
+#endif
 
         public LuaEnv()
         {
@@ -342,16 +344,23 @@ public virtual void Dispose(bool dispose)
 
         public void ThrowExceptionFromError(int oldTop)
         {
-            object err = translator.GetObject(L, -1);
-            LuaAPI.lua_settop(L, oldTop);
+#if THREAD_SAFT || HOTFIX_ENABLE
+            lock (luaEnvLock)
+            {
+#endif
+                object err = translator.GetObject(L, -1);
+                LuaAPI.lua_settop(L, oldTop);
 
-            // A pre-wrapped exception - just rethrow it (stack trace of InnerException will be preserved)
-            Exception ex = err as Exception;
-            if (ex != null) throw ex;
+                // A pre-wrapped exception - just rethrow it (stack trace of InnerException will be preserved)
+                Exception ex = err as Exception;
+                if (ex != null) throw ex;
 
-            // A non-wrapped Lua error (best interpreted as a string) - wrap it and throw it
-            if (err == null) err = "Unknown Lua Error";
-            throw new LuaException(err.ToString());
+                // A non-wrapped Lua error (best interpreted as a string) - wrap it and throw it
+                if (err == null) err = "Unknown Lua Error";
+                throw new LuaException(err.ToString());
+#if THREAD_SAFT || HOTFIX_ENABLE
+            }
+#endif
         }
 
         internal struct GCAction

Assets/XLua/Src/LuaFunction.cs

@@ -238,70 +238,57 @@ public override string ToString()
 
         public void InvokeSessionStart()
         {
-            lock (luaEnv.luaEnvLock)
-            {
-                var L = luaEnv.L;
-                _stack.Push(_oldTop);
-                _oldTop = LuaAPI.lua_gettop(L);
-                LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
-                LuaAPI.lua_getref(L, luaReference);
-            }
+            System.Threading.Monitor.Enter(luaEnv.luaEnvLock);
+            var L = luaEnv.L;
+            _stack.Push(_oldTop);
+            _oldTop = LuaAPI.lua_gettop(L);
+            LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
+            LuaAPI.lua_getref(L, luaReference);
         }
 
         public void Invoke(int nRet)
         {
-            lock (luaEnv.luaEnvLock)
+            int error = LuaAPI.lua_pcall(luaEnv.L, LuaAPI.lua_gettop(luaEnv.L) - _oldTop - 2, nRet, _oldTop + 1);
+            if (error != 0)
             {
-                int error = LuaAPI.lua_pcall(luaEnv.L, LuaAPI.lua_gettop(luaEnv.L) - _oldTop - 2, nRet, _oldTop + 1);
-                if (error != 0)
-                {
-                    var lastOldTop = _oldTop;
-                    InvokeSessionEnd();
-                    luaEnv.ThrowExceptionFromError(lastOldTop);
-                }
+                var lastOldTop = _oldTop;
+                InvokeSessionEnd();
+                luaEnv.ThrowExceptionFromError(lastOldTop);
             }
         }
 
         public void InvokeSessionEnd()
         {
-            lock (luaEnv.luaEnvLock)
-            {
-                LuaAPI.lua_settop(luaEnv.L, _oldTop);
-            }
+            LuaAPI.lua_settop(luaEnv.L, _oldTop);
             _oldTop = _stack.Pop();
+            System.Threading.Monitor.Exit(luaEnv.luaEnvLock);
         }
 
         public TResult InvokeSessionEndWithResult<TResult>()
         {
-            lock (luaEnv.luaEnvLock)
+            if (LuaAPI.lua_gettop(luaEnv.L) < _oldTop + 2)
             {
-                if (LuaAPI.lua_gettop(luaEnv.L) < _oldTop + 2)
-                {
-                    InvokeSessionEnd();
-                    throw new InvalidOperationException("no result!");
-                }
+                InvokeSessionEnd();
+                throw new InvalidOperationException("no result!");
+            }
 
-                try
-                {
-                    TResult ret;
-                    luaEnv.translator.Get(luaEnv.L, _oldTop + 2, out ret);
-                    return ret;
-                }
-                finally
-                {
-                    InvokeSessionEnd();
-                }
+            try
+            {
+                TResult ret;
+                luaEnv.translator.Get(luaEnv.L, _oldTop + 2, out ret);
+                return ret;
+            }
+            finally
+            {
+                InvokeSessionEnd();
             }
         }
 
         public void InParam<T>(T p)
         {
             try
             {
-                lock (luaEnv.luaEnvLock)
-                {
-                    luaEnv.translator.PushByType(luaEnv.L, p);
-                }
+                luaEnv.translator.PushByType(luaEnv.L, p);
             }
             catch (Exception e)
             {
@@ -314,12 +301,9 @@ public void InParams<T>(T[] ps)
         {
             try
             {
-                lock (luaEnv.luaEnvLock)
+                for (int i = 0; i < ps.Length; i++)
                 {
-                    for (int i = 0; i < ps.Length; i++)
-                    {
-                        luaEnv.translator.PushByType<T>(luaEnv.L, ps[i]);
-                    }
+                    luaEnv.translator.PushByType<T>(luaEnv.L, ps[i]);
                 }
             }
             catch (Exception e)
@@ -332,23 +316,20 @@ public void InParams<T>(T[] ps)
         //pos start from 0
         public void OutParam<TResult>(int pos, out TResult ret)
         {
-            lock (luaEnv.luaEnvLock)
+            if (LuaAPI.lua_gettop(luaEnv.L) < _oldTop + 2 + pos)
             {
-                if (LuaAPI.lua_gettop(luaEnv.L) < _oldTop + 2 + pos)
-                {
-                    InvokeSessionEnd();
-                    throw new InvalidOperationException("no result in " + pos);
-                }
+                InvokeSessionEnd();
+                throw new InvalidOperationException("no result in " + pos);
+            }
 
-                try
-                {
-                    luaEnv.translator.Get(luaEnv.L, _oldTop + 2 + pos, out ret);
-                }
-                catch (Exception e)
-                {
-                    InvokeSessionEnd();
-                    throw e;
-                }
+            try
+            {
+                luaEnv.translator.Get(luaEnv.L, _oldTop + 2 + pos, out ret);
+            }
+            catch (Exception e)
+            {
+                InvokeSessionEnd();
+                throw e;
             }
         }
 #endif