diff --git a/panda/src/putil/pipeline.cxx b/panda/src/putil/pipeline.cxx index 749da8863c..800c1daa52 100644 --- a/panda/src/putil/pipeline.cxx +++ b/panda/src/putil/pipeline.cxx @@ -18,7 +18,7 @@ #include "pipeline.h" #include "pipelineCyclerTrueImpl.h" -#include "mutexHolder.h" +#include "reMutexHolder.h" Pipeline *Pipeline::_render_pipeline = (Pipeline *)NULL; @@ -54,7 +54,7 @@ Pipeline:: void Pipeline:: cycle() { #if defined(DO_PIPELINING) && defined(HAVE_THREADS) - MutexHolder holder(_lock); + ReMutexHolder holder(_lock); Cyclers::iterator ci; for (ci = _cyclers.begin(); ci != _cyclers.end(); ++ci) { (*ci)->cycle(); @@ -72,7 +72,7 @@ void Pipeline:: set_num_stages(int num_stages) { nassertv(num_stages >= 1); #if defined(DO_PIPELINING) && defined(HAVE_THREADS) - MutexHolder holder(_lock); + ReMutexHolder holder(_lock); if (num_stages != _num_stages) { // We need to lock every PipelineCycler object in the world before @@ -121,7 +121,7 @@ get_num_stages() const { //////////////////////////////////////////////////////////////////// void Pipeline:: add_cycler(PipelineCyclerTrueImpl *cycler) { - MutexHolder holder(_lock); + ReMutexHolder holder(_lock); bool inserted = _cyclers.insert(cycler).second; nassertv(inserted); } @@ -137,7 +137,7 @@ add_cycler(PipelineCyclerTrueImpl *cycler) { //////////////////////////////////////////////////////////////////// void Pipeline:: remove_cycler(PipelineCyclerTrueImpl *cycler) { - MutexHolder holder(_lock); + ReMutexHolder holder(_lock); Cyclers::iterator ci = _cyclers.find(cycler); nassertv(ci != _cyclers.end()); _cyclers.erase(ci); diff --git a/panda/src/putil/pipeline.h b/panda/src/putil/pipeline.h index 129e1f7f54..d6fd66142b 100644 --- a/panda/src/putil/pipeline.h +++ b/panda/src/putil/pipeline.h @@ -22,7 +22,7 @@ #include "pandabase.h" #include "namable.h" #include "pset.h" -#include "pmutex.h" +#include "reMutex.h" class PipelineCyclerTrueImpl; @@ -67,7 +67,7 @@ private: typedef pset Cyclers; Cyclers _cyclers; - Mutex _lock; + ReMutex _lock; #endif // DO_PIPELINING && HAVE_THREADS };