优化U3D在WIndows平台下操作。

Former-commit-id: 3babaf8779e784e0ebd60a1fb4729d1bb4975a65

Author: vimfung

Source/Unity3D/Windows/.vs/Windows/v14/.suo

@@ -100,6 +100,7 @@
     <ClCompile Include="..\..\..\lua-common\LuaObjectManager.cpp" />
     <ClCompile Include="..\..\..\lua-common\LuaPointer.cpp" />
     <ClCompile Include="..\..\..\lua-common\LuaSession.cpp" />
+    <ClCompile Include="..\..\..\lua-common\LuaTmpValue.cpp" />
     <ClCompile Include="..\..\..\lua-common\LuaTuple.cpp" />
     <ClCompile Include="..\..\..\lua-common\LuaValue.cpp" />
     <ClCompile Include="..\..\..\lua-common\StringUtils.cpp" />
@@ -165,6 +166,7 @@
     <ClInclude Include="..\..\..\lua-common\LuaObjectSerializationTypes.h" />
     <ClInclude Include="..\..\..\lua-common\LuaPointer.h" />
     <ClInclude Include="..\..\..\lua-common\LuaSession.h" />
+    <ClInclude Include="..\..\..\lua-common\LuaTmpValue.hpp" />
     <ClInclude Include="..\..\..\lua-common\LuaTuple.h" />
     <ClInclude Include="..\..\..\lua-common\LuaValue.h" />
     <ClInclude Include="..\..\..\lua-common\StringUtils.h" />

Source/Unity3D/Windows/LuaScriptCore/LuaScriptCore.vcxproj

@@ -216,6 +216,9 @@
     <ClCompile Include="..\..\..\lua-common\LuaEngineAdapter.cpp">
       <Filter>Source Files\lua-common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\lua-common\LuaTmpValue.cpp">
+      <Filter>Source Files\lua-common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\lua-core\src\lapi.h">
@@ -386,5 +389,8 @@
     <ClInclude Include="..\..\..\lua-common\LuaEngineAdapter.hpp">
       <Filter>Header Files\lua-common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\lua-common\LuaTmpValue.hpp">
+      <Filter>Header Files\lua-common</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Source/Unity3D/Windows/LuaScriptCore/LuaScriptCore.vcxproj.filters

@@ -17,9 +17,19 @@
 #include <sstream>
 #include <thread>
 #include <signal.h>
+
+#if _WINDOWS
+
+#include <windows.h>
+#pragma comment(lib,"Winmm.lib")
+
+#else
+
 #include <sys/time.h>
 #include <unistd.h>
 
+#endif
+
 using namespace cn::vimfung::luascriptcore;
 
 /**
@@ -32,6 +42,7 @@ static const char * CatchLuaExceptionHandlerName = "__catchExcepitonHandler";
  */
 static std::vector<LuaContext *> _needsGCContextList;
 
+
 /**
  * 方法路由处理器
  *
@@ -93,13 +104,35 @@ static LuaValue* catchLuaExceptionHandler (LuaContext *context, std::string meth
     return NULL;
 }
 
+#if _WINDOWS
+
+void WINAPI contextGCHandler(UINT wTimerID, UINT msg, DWORD dwUser, DWORD dwl, DWORD dw2)
+{
+	unityDebug("gc handler...");
+
+	//重置计时器
+	timeKillEvent(wTimerID);
+
+	//进行内存回收
+	for (std::vector<LuaContext *>::iterator it = _needsGCContextList.begin(); it != _needsGCContextList.end(); it++)
+	{
+		LuaContext *context = *it;
+		context->gcHandler();
+		context->release();       // 回收后释放
+	}
+	//清空
+	_needsGCContextList.clear();
+}
+
+#else
 /**
  上下文内存回收处理
 
  @param signo 信号
  */
 static void contextGCHandler(int signo)
 {
+
     //重置计时器
     struct itimerval itv;
     itv.it_value.tv_sec = 0;
@@ -118,6 +151,8 @@ static void contextGCHandler(int signo)
     _needsGCContextList.clear();
 }
 
+#endif
+
 /**
  上下文开始回收
  
@@ -141,6 +176,16 @@ static void contextStartGC(LuaContext *context)
         context -> retain();
         _needsGCContextList.push_back(context);
 
+#if _WINDOWS
+		
+		MMRESULT gcTimerId = timeSetEvent(100, 1, (LPTIMECALLBACK)contextGCHandler, NULL, TIME_ONESHOT);
+		if (NULL == gcTimerId)
+		{
+			unityDebug("gc timer create error!");
+		}
+
+#else
+
         //监听定时器信号
         signal(SIGALRM, contextGCHandler);
 
@@ -150,6 +195,9 @@ static void contextStartGC(LuaContext *context)
         itv.it_value.tv_usec = 100000;
         itv.it_interval = itv.it_value;
         setitimer(ITIMER_REAL, &itv, NULL);
+
+#endif
+
     }
 }
 

Source/lua-common/LuaContext.cpp

@@ -35,15 +35,15 @@ namespace cn {
             {
             private:
 
-                /**
-                 类型描述器
-                 */
-                LuaExportTypeDescriptor *_typeDescriptor;
-                
                 /**
                  * 对象
                  */
                 void *_object;
+
+				/**
+				类型描述器
+				*/
+				LuaExportTypeDescriptor *_typeDescriptor;
 
                 /**
                  * 用户自定义数据

Source/lua-common/LuaObjectDescriptor.h

@@ -43,7 +43,8 @@ std::string StringUtils::format (const char *format, ...)
     va_start(marker, format);
 
     char buffer[1024] = {0};
-    int size = vsprintf(buffer, format, marker);
+	int size = vsnprintf_s(buffer, 1024, format, marker);
+    //vsprintf(buffer, format, marker);
 
     va_end(marker);