[simspark-svn] SF.net SVN: simspark:[60] trunk/spark

[<he...@us...>]

Revision: 60
          http://simspark.svn.sourceforge.net/simspark/?rev=60&view=rev
Author:   hedayat
Date:     2009-04-14 19:59:50 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
- print Skipping remaining time errors as warnings only in Debug mode
- prevent a segfault on linux when simspark quit.

Modified Paths:
--------------
    trunk/spark/ChangeLog
    trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
    trunk/spark/plugin/CMakeLists.txt

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-04-08 11:39:36 UTC (rev 59)
+++ trunk/spark/ChangeLog	2009-04-14 19:59:50 UTC (rev 60)
@@ -1,3 +1,11 @@
+2009-04-15  Hedayat Vatankhah  <he...@gr...>
+
+	* plugin/CMakeLists.txt: 
+	- don't link plugins to spark libraries to prevent segfault on Linux
+	
+	* lib/oxygen/simulationserver/simulationserver.cpp (UpdateDeltaTimeAfterStep):
+	- Skipping remaining time error is now a debug warning message 
+
 2009-03-17  Hedayat Vatankhah  <he...@gr...>
 
 	* lib/kerosin/imageserver/imageserver.h (ImageServer): 

Modified: trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp	2009-04-08 11:39:36 UTC (rev 59)
+++ trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp	2009-04-14 19:59:50 UTC (rev 60)
@@ -520,8 +520,8 @@
     if (mAdjustSpeed && mSumDeltaTime > mMaxStepsPerCycle
             * mSimStep)
         {
-            GetLog()->Error()
-                    << "(SimulationServer) ERROR: Skipping remaining time: "
+            GetLog()->Debug()
+                    << "(SimulationServer) Warning: Skipping remaining time: "
                     << mSumDeltaTime - mSimStep << '\n';
             mSumDeltaTime = 0;
         }

Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt	2009-04-08 11:39:36 UTC (rev 59)
+++ trunk/spark/plugin/CMakeLists.txt	2009-04-14 19:59:50 UTC (rev 60)
@@ -1,7 +1,10 @@
 include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
     ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 
-set(spark_libs kerosin oxygen zeitgeist salt)
+# It is problematic under Linux! Will cause segfaults on simspark exit.
+if (WIN32 OR APPLE)
+   set(spark_libs kerosin oxygen salt zeitgeist)
+endif (WIN32 OR APPLE)
 if (APPLE AND USE_COREFOUNDATION)
       set(spark_libs ${spark_libs} /System/Library/Frameworks/CoreFoundation.framework)
 endif (APPLE AND USE_COREFOUNDATION) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.