locked EM.each, arenas

2 files changed, 7 insertions, 1 deletions

diff --git a/entityx/Entity.cc b/entityx/Entity.cc
index ddb8df7..adac3de 100644
--- a/entityx/Entity.cc
+++ b/entityx/Entity.cc
@@ -31,7 +31,8 @@ std::bitset<entityx::MAX_COMPONENTS> Entity::component_mask() const {
   return manager_->component_mask(id_);
 }
 
-EntityManager::EntityManager(EventManager &event_manager) : event_manager_(event_manager) {
+EntityManager::EntityManager(EventManager &event_manager)
+	: event_manager_(event_manager) {
 }
 
 EntityManager::~EntityManager() {
@@ -46,6 +47,7 @@ void EntityManager::reset() {
   for (BaseComponentHelper *helper : component_helpers_) {
     if (helper) delete helper;
   }
+
   component_pools_.clear();
   component_helpers_.clear();
   entity_component_mask_.clear();
diff --git a/entityx/Entity.h b/entityx/Entity.h
index 3217ae5..a423f8f 100644
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -16,6 +16,7 @@
 #include <new>
 #include <cstdlib>
 #include <algorithm>
+#include <mutex>
 #include <bitset>
 #include <cassert>
 #include <iostream>
@@ -462,8 +463,11 @@ class EntityManager : entityx::help::NonCopyable {
     template <typename T> struct identity { typedef T type; };
 
     void each(typename identity<std::function<void(Entity entity, Components&...)>>::type f) {
+      static std::mutex locked;
+      locked.lock();
       for (auto it : *this)
         f(it, *(it.template component<Components>().get())...);
+      locked.unlock();
     }
 
   private: