delete is now thread safe

[physics.git] / src / entityManager.cpp

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index ecf7955..e091b51 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -21,6 +21,9 @@
 #include <set>
 #include <SDL/SDL.h>
 
+#include "locks/Mutex.h"
+#include "locks/Autolock.h"
+
 #include "Entities/Entity.h"
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
@@ -32,6 +35,8 @@
 
 void updateParticles(float);
 void updatePhysics(float);
+void clearUpParticles();
+void clearUpPhysics();
 
 /// ***** Private Variables *****
 
@@ -45,15 +50,15 @@ setPhys physics_To_Add;
 setPhys active_Physics;
 setPhys physics_To_Remove;
 
-SDL_mutex* particleSetLock      = NULL;
-SDL_mutex* physicsEntitySetLock = NULL;
+Mutex particleSetLock;
+Mutex physicsEntitySetLock;
 
 /// ***** Initializers/Cleaners *****
 
 void manager::init()
 {
-    particleSetLock = SDL_CreateMutex();
-    physicsEntitySetLock = SDL_CreateMutex();
+    particleSetLock.init();
+    physicsEntitySetLock.init();
 
     collision::init();
 }
@@ -61,11 +66,8 @@ void manager::clean()
 {
     collision::clean();
 
-    SDL_DestroyMutex(particleSetLock);
-    particleSetLock = NULL;
-
-    SDL_DestroyMutex(physicsEntitySetLock);
-    physicsEntitySetLock = NULL;
+    physicsEntitySetLock.clean();
+    particleSetLock.clean();
 }
 
 /// ***** Public Methods *****
@@ -95,6 +97,7 @@ void manager::add(Entity* e)
 void manager::remove(Entity* e)
 {
     {
+        Autolock lock( particleSetLock );
         Particle* p = dynamic_cast<Particle*>(e);
         if( p != 0 )
         {
@@ -104,6 +107,7 @@ void manager::remove(Entity* e)
     }
 
     {
+        Autolock lock( physicsEntitySetLock );
         PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
         if( p != 0 )
         {
@@ -128,7 +132,11 @@ void manager::update(float time_step)
 }
 void manager::draw()
 {
-    SDL_mutexP( particleSetLock );
+    clearUpParticles();
+    {
+        Autolock lock( particleSetLock );
+        DPF(0, "Particle Draw Start");
+
         // update active Particle*s
         for( setPart::iterator it = active_Particles.begin();
              it != active_Particles.end();
@@ -136,9 +144,15 @@ void manager::draw()
         {
             (*it)->draw();
         }
-    SDL_mutexV( particleSetLock );
 
-    SDL_mutexP( physicsEntitySetLock );
+        DPF(0, "Particle Draw End");
+    }
+
+    clearUpPhysics();
+    {
+        Autolock lock( physicsEntitySetLock );
+        DPF(0, "Physics Draw Start");
+
         // update active PhysicsEntity*s
         for( setPhys::iterator it = active_Physics.begin();
              it != active_Physics.end();
@@ -146,32 +160,16 @@ void manager::draw()
         {
             (*it)->draw();
         }
-    SDL_mutexV( physicsEntitySetLock );
+
+        DPF(0, "Physics Draw End");
+    }
 }
 
 /// ***** Private Methods *****
 
 void updateParticles(float time_step)
 {
-    SDL_mutexP( particleSetLock );
-        // add new Particle*s to Active
-        for( setPart::iterator it = particles_To_Add.begin();
-             it != particles_To_Add.end();
-             it++ )
-        {
-            active_Particles.insert(*it);
-        }
-        particles_To_Add.clear();
-
-        // remove dead Particle*s from Active
-        for( setPart::iterator it = particles_To_Remove.begin();
-             it != particles_To_Remove.end();
-             it++ )
-        {
-            active_Particles.erase(*it);
-        }
-        particles_To_Remove.clear();
-    SDL_mutexV( particleSetLock );
+    clearUpParticles();
 
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();
@@ -183,25 +181,7 @@ void updateParticles(float time_step)
 }
 void updatePhysics(float time_step)
 {
-    SDL_mutexP( physicsEntitySetLock );
-        // add new PhysicsEntity*s to Active
-        for( setPhys::iterator it = physics_To_Add.begin();
-             it != physics_To_Add.end();
-             it++ )
-        {
-            active_Physics.insert(*it);
-        }
-        physics_To_Add.clear();
-
-        // remove dead PhysicsEntity*s from Active
-        for( setPhys::iterator it = physics_To_Remove.begin();
-             it != physics_To_Remove.end();
-             it++ )
-        {
-            active_Physics.erase(*it);
-        }
-        physics_To_Remove.clear();
-    SDL_mutexV( physicsEntitySetLock );
+    clearUpPhysics();
 
     // apply collision math
     collision::update(active_Physics);
@@ -214,3 +194,51 @@ void updatePhysics(float time_step)
         (*it)->update(time_step);
     }
 }
+void clearUpParticles()
+{
+    Autolock lock( particleSetLock );
+
+    // add new Particle*s to Active
+    for( setPart::iterator it = particles_To_Add.begin();
+         it != particles_To_Add.end();
+         it++ )
+    {
+        DPF(0, "Particle Insert");
+        active_Particles.insert(*it);
+    }
+    particles_To_Add.clear();
+
+    // remove dead Particle*s from Active
+    for( setPart::iterator it = particles_To_Remove.begin();
+         it != particles_To_Remove.end();
+         it++ )
+    {
+        DPF(0, "Particle Delete");
+        active_Particles.erase(*it);
+    }
+    particles_To_Remove.clear();
+}
+void clearUpPhysics()
+{
+    Autolock lock( physicsEntitySetLock );
+
+    // add new PhysicsEntity*s to Active
+    for( setPhys::iterator it = physics_To_Add.begin();
+         it != physics_To_Add.end();
+         it++ )
+    {
+        DPF(0, "Physics Insert");
+        active_Physics.insert(*it);
+    }
+    physics_To_Add.clear();
+
+    // remove dead PhysicsEntity*s from Active
+    for( setPhys::iterator it = physics_To_Remove.begin();
+         it != physics_To_Remove.end();
+         it++ )
+    {
+        DPF(0, "Physics Delete");
+        active_Physics.erase(*it);
+    }
+    physics_To_Remove.clear();
+}