Revision: 8445
http://playerstage.svn.sourceforge.net/playerstage/?rev=8445&view=rev
Author: natepak
Date: 2009-12-04 15:46:46 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Fixed seg fault on exit
Modified Paths:
--------------
code/gazebo/trunk/server/Timer.hh
code/gazebo/trunk/server/World.cc
code/gazebo/trunk/worlds/empty.world
code/gazebo/trunk/worlds/pioneer2dx.world
Modified: code/gazebo/trunk/server/Timer.hh
===================================================================
--- code/gazebo/trunk/server/Timer.hh 2009-12-01 00:12:34 UTC (rev 8444)
+++ code/gazebo/trunk/server/Timer.hh 2009-12-04 15:46:46 UTC (rev 8445)
@@ -68,7 +68,7 @@
class DiagnosticTimer : public Timer
{
/// \brief Constructor
- public: DiagnosticTimer(const std::string &name, int level = 5,
+ public: DiagnosticTimer(const std::string &name, int level = 6,
Type t=Timer::REAL_TIMER) : Timer(t)
{
this->name = name;
Modified: code/gazebo/trunk/server/World.cc
===================================================================
--- code/gazebo/trunk/server/World.cc 2009-12-01 00:12:34 UTC (rev 8444)
+++ code/gazebo/trunk/server/World.cc 2009-12-04 15:46:46 UTC (rev 8445)
@@ -130,13 +130,22 @@
this->factory = NULL;
}
- delete this->saveStateTimeoutP;
- delete this->saveStateBufferSizeP;
+ if (this->saveStateTimeoutP)
+ delete this->saveStateTimeoutP;
+ this->saveStateTimeoutP = NULL;
- delete this->threadsP;
+ if (this->saveStateBufferSizeP)
+ delete this->saveStateBufferSizeP;
+ this->saveStateBufferSizeP = NULL;
+ if (this->threadsP)
+ delete this->threadsP;
+ this->threadsP = NULL;
+
#ifdef USE_THREADPOOL
- delete this->threadPool;
+ if (this->threadPool)
+ delete this->threadPool;
+ this->threadPool = NULL;
#endif
}
Modified: code/gazebo/trunk/worlds/empty.world
===================================================================
--- code/gazebo/trunk/worlds/empty.world 2009-12-01 00:12:34 UTC (rev
8444)
+++ code/gazebo/trunk/worlds/empty.world 2009-12-04 15:46:46 UTC (rev
8445)
@@ -12,7 +12,7 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller";
xmlns:physics="http://playerstage.sourceforge.net/gazebo/xmlschema/#physics";
>
- <verbosity>5</verbosity>
+ <verbosity>4</verbosity>
<physics:ode>
<stepTime>0.001</stepTime>
Modified: code/gazebo/trunk/worlds/pioneer2dx.world
===================================================================
--- code/gazebo/trunk/worlds/pioneer2dx.world 2009-12-01 00:12:34 UTC (rev
8444)
+++ code/gazebo/trunk/worlds/pioneer2dx.world 2009-12-04 15:46:46 UTC (rev
8445)
@@ -16,7 +16,7 @@
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller";
xmlns:physics="http://playerstage.sourceforge.net/gazebo/xmlschema/#physics";
>
- <verbosity>5</verbosity>
+ <verbosity>4</verbosity>
<physics:ode>
<stepTime>0.0005</stepTime>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
