Changeset 1822Tweet

Timestamp:

Aug 27, 2012, 2:16:46 PM (11 years ago)

Author:

sam

Message:

debug: add minor debug messages to the ticker, ensure LOL_DEBUG and
LOL_RELEASE are set by msbuild, and use the debug PSGL on the PS3.

Location:

trunk

Files:

• build/vs2010/Lol.Core.Rules.props (modified) (2 diffs)
• build/vs2010/Lol.Core.Vars.props (modified) (1 diff)
• src/ticker.cpp (modified) (5 diffs)

trunk/build/vs2010/Lol.Core.Rules.props

@@ -25 +25 @@
       <RuntimeLibrary Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeLibrary Condition="'$(Platform)'=='Xbox 360'">MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;LOL_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Condition="'$(Configuration)'=='Release'">
@@ -39 +39 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;LOL_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
 

trunk/build/vs2010/Lol.Core.Vars.props

@@ -51 +51 @@
     <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
     <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
-    <GlLibs Condition="'$(Platform)'=='PS3'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\opt</GlLibs>
+    <GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Debug'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\debug</GlLibs>
+    <GlLibs Condition="'$(Platform)|$(Configuration)'=='PS3|Release'">$(SCE_PS3_ROOT)\target\ppu\lib\PSGL\RSX\opt</GlLibs>
     <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32.lib</GlDeps>
     <GlDeps Condition="'$(Platform)'=='x64'">opengl32.lib;glew32.lib</GlDeps>

trunk/src/ticker.cpp

@@ -34 +34 @@
         nentities(0),
         frame(0), recording(0), deltatime(0), bias(0), fps(0),
+#if LOL_DEBUG
+        keepalive(0),
+#endif
         quit(0), quitframe(0), quitdelay(20), panic(0)
     {
@@ -71 +74 @@
     Timer timer;
     float deltatime, bias, fps;
+#if LOL_DEBUG
+    float keepalive;
+#endif
 
     /* Background threads */
@@ -155 +161 @@
 void *TickerData::GameThreadMain(void * /* p */)
 {
+#if LOL_DEBUG
+    Log::Info("ticker game thread initialised\n");
+#endif
+
     for (;;)
     {
@@ -200 +210 @@
             data->bias = 0.f;
         }
+
+#if LOL_DEBUG
+        data->keepalive += data->deltatime;
+        if (data->keepalive > 10.f)
+        {
+            Log::Info("ticker keepalive: tick!\n");
+            data->keepalive = 0.f;
+        }
+#endif
 
         /* If shutdown is stuck, kick the first entity we meet and see
@@ -304 +323 @@
     data->drawtick.Push(0);
 
+#if LOL_DEBUG
+    Log::Info("ticker game thread terminated\n");
+#endif
+
     return NULL;
 }