错误处理

leinlin · Jan 8, 2019 · da89de4 · da89de4
1 parent 5f1f740
commit da89de4
Showing 1 changed file with 28 additions and 35 deletions.
diff --git a/LuaProfiler/LuaProfilerClient/Core/LuaHookSetup.cs b/LuaProfiler/LuaProfilerClient/Core/LuaHookSetup.cs
@@ -129,18 +129,25 @@ private void OnApplicationQuit()
         int desotryCount = 0;
         private void WaitDestory()
         {
+#if XLUA || TOLUA || SLUA
             desotryCount++;
             if (desotryCount > 10)
             {
                 UnityEditor.EditorApplication.update -= WaitDestory;
+                if (LuaProfiler.mainL != IntPtr.Zero)
+                {
+                    LuaDLL.lua_close(LuaProfiler.mainL);
+                }
+                LuaProfiler.mainL = IntPtr.Zero;
                 NetWorkClient.Close();
                 desotryCount = 0;
             }
+#endif
         }
 #endif
-    }
+        }
 
-    public class Menu : MonoBehaviour
+        public class Menu : MonoBehaviour
     {
         private static Menu m_menu;
         public static void EnableMenu(GameObject go)
@@ -376,61 +383,36 @@ public static void DoString(IntPtr L, string script)
             LuaHook.isHook = false;
             byte[] chunk = Encoding.UTF8.GetBytes(script);
             int oldTop = LuaDLL.lua_gettop(L);
-#if XLUA
-            int errFunc = LuaDLL.load_error_func(L, -1);
-
+            lua_getglobal(L, "miku_handle_error");
             if (LuaLib.luaL_loadbuffer(L, chunk, chunk.Length, "chunk") == 0)
             {
-                if (LuaDLL.lua_pcall(L, 0, -1, errFunc) == 0)
+                if (LuaDLL.lua_pcall(L, 0, -1, oldTop + 1) == 0)
                 {
-                    LuaDLL.lua_remove(L, errFunc);
+                    LuaDLL.lua_remove(L, oldTop + 1);
                 }
             }
             else
             {
                 Debug.Log(script);
             }
-#elif TOLUA
-            if (LuaLib.luaL_loadbuffer(L, chunk, chunk.Length, "chunk") == 0)
-            {
-                LuaDLL.lua_call(L, 0, -1);
-            }
-#elif SLUA
-            if (LuaLib.luaL_loadbuffer(L, chunk, chunk.Length, "chunk") == 0)
-            {
-                LuaDLL.lua_call(L, 0, -1);
-            }
-#endif
             LuaHook.isHook = true;
             LuaDLL.lua_settop(L, oldTop);
         }
 
         public static void DoRefLuaFun(IntPtr L, string funName)
         {
             int oldTop = LuaDLL.lua_gettop(L);
-
+            lua_getglobal(L, "miku_handle_error");
             do
             {
-#if XLUA
-                int errFunc = LuaDLL.load_error_func(L, -1);
                 LuaLib.lua_getglobal(L, funName);
                 if (!LuaDLL.lua_isfunction(L, -1)) break;
-                LuaDLL.lua_pushvalue(L, -3);
-                if (LuaDLL.lua_pcall(L, 1, 0, errFunc) == 0)
+                LuaDLL.lua_pushvalue(L, oldTop);
+                if (LuaDLL.lua_pcall(L, 1, 0, oldTop + 1) == 0)
                 {
-                    LuaDLL.lua_remove(L, errFunc);
+                    LuaDLL.lua_remove(L, oldTop + 1);
                 }
-#elif TOLUA
-                LuaLib.lua_getglobal(L, funName);
-                if (!LuaDLL.lua_isfunction(L, -1)) break;
-                LuaDLL.lua_pushvalue(L, -2);
-                LuaDLL.lua_call(L, 1, 0);
-#elif SLUA
-                LuaLib.lua_getglobal(L, funName);
-                if (!LuaDLL.lua_isfunction(L, -1)) break;
-                LuaDLL.lua_pushvalue(L, -2);
-                LuaDLL.lua_call(L, 1, 0);
-#endif
+
             } while (false);
 
             LuaDLL.lua_settop(L, oldTop);
@@ -470,6 +452,9 @@ public static void __Register(IntPtr L)
             LuaLib.lua_pushstdcallcfunction(L, RemoveRefFunInfo);
             LuaLib.lua_setglobal(L, "miku_remove_ref_fun_info");
 
+            LuaLib.lua_pushstdcallcfunction(L, HandleError);
+            LuaLib.lua_setglobal(L, "miku_handle_error");
+
             LuaDLL.lua_newtable(L);
             LuaLib.lua_setglobal(L, "MikuLuaProfilerStrTb");
 #if XLUA
@@ -651,6 +636,14 @@ static int RemoveRefFunInfo(IntPtr L)
             return 0;
         }
 
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int HandleError(IntPtr L)
+        {
+            string error = GetRefString(L, 1);
+            Debug.LogError(error);
+            return 0;
+        }
+
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int EndSample(IntPtr L)
         {