TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

name more mutexes

Browse Source
This commit is contained in:
David Rose 2007-06-21 20:07:59 +00:00
parent c811ae5865
commit 0df3c4849b
8 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/display/graphicsEngine.cxx
View File

@ -126,7 +126,7 @@ GraphicsEngine::
GraphicsEngine(Pipeline *pipeline) : GraphicsEngine(Pipeline *pipeline) :
_pipeline(pipeline), _pipeline(pipeline),
_app("app"), _app("app"),
_lock("GraphicsEngine") _lock("GraphicsEngine::_lock")
{ {
if (_pipeline == (Pipeline *)NULL) { if (_pipeline == (Pipeline *)NULL) {
_pipeline = Pipeline::get_render_pipeline(); _pipeline = Pipeline::get_render_pipeline();
@ -1953,7 +1953,7 @@ get_window_renderer(const string &name, int pipeline_stage) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
GraphicsEngine::WindowRenderer:: GraphicsEngine::WindowRenderer::
WindowRenderer(const string &name) : WindowRenderer(const string &name) :
_wl_lock(string("GraphicsEngine::WindowRenderer ") + name) _wl_lock(string("GraphicsEngine::WindowRenderer::_wl_lock ") + name)
{ {
} }

3
panda/src/display/graphicsWindow.cxx
View File

@ -44,7 +44,8 @@ GraphicsWindow(GraphicsPipe *pipe,
GraphicsStateGuardian *gsg, GraphicsStateGuardian *gsg,
GraphicsOutput *host) : GraphicsOutput *host) :
GraphicsOutput(pipe, name, fb_prop, win_prop, flags, gsg, host), GraphicsOutput(pipe, name, fb_prop, win_prop, flags, gsg, host),
_input_lock("GraphicsWindow::_input_lock") _input_lock("GraphicsWindow::_input_lock"),
_properties_lock("GraphicsWindow::_properties_lock")
{ {
#ifdef DO_MEMORY_USAGE #ifdef DO_MEMORY_USAGE
MemoryUsage::update_type(this, this); MemoryUsage::update_type(this, this);

6
panda/src/gobj/geomVertexArrayData.I
View File

@ -250,7 +250,8 @@ set_lru_size(size_t lru_size) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE GeomVertexArrayData::CData:: INLINE GeomVertexArrayData::CData::
CData() : CData() :
_usage_hint(UH_unspecified) _usage_hint(UH_unspecified),
_rw_lock("GeomVertexArrayData::CData::_wl_lock")
{ {
} }
@ -263,7 +264,8 @@ INLINE GeomVertexArrayData::CData::
CData(const GeomVertexArrayData::CData &copy) : CData(const GeomVertexArrayData::CData &copy) :
_usage_hint(copy._usage_hint), _usage_hint(copy._usage_hint),
_buffer(copy._buffer), _buffer(copy._buffer),
_modified(copy._modified) _modified(copy._modified),
_rw_lock("GeomVertexArrayData::CData::_wl_lock")
{ {
} }

1
panda/src/gobj/preparedGraphicsObjects.cxx
View File

@ -38,6 +38,7 @@ int PreparedGraphicsObjects::_name_index = 0;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PreparedGraphicsObjects:: PreparedGraphicsObjects::
PreparedGraphicsObjects() : PreparedGraphicsObjects() :
_lock("PreparedGraphicsObjects::_lock"),
_name(init_name()), _name(init_name()),
_texture_residency(_name, "texture"), _texture_residency(_name, "texture"),
_vbuffer_residency(_name, "vbuffer"), _vbuffer_residency(_name, "vbuffer"),

2
panda/src/pgraph/renderEffects.cxx
View File

@ -547,7 +547,7 @@ init_states() {
// meantime, this is OK because we guarantee that this method is // meantime, this is OK because we guarantee that this method is
// called at static init time, presumably when there is still only // called at static init time, presumably when there is still only
// one thread in the world. // one thread in the world.
_states_lock = new ReMutex; _states_lock = new ReMutex("RenderEffects::_states_lock");
nassertv(Thread::get_current_thread() == Thread::get_main_thread()); nassertv(Thread::get_current_thread() == Thread::get_main_thread());
} }

2
panda/src/pgraph/renderState.cxx
View File

@ -1867,7 +1867,7 @@ init_states() {
// meantime, this is OK because we guarantee that this method is // meantime, this is OK because we guarantee that this method is
// called at static init time, presumably when there is still only // called at static init time, presumably when there is still only
// one thread in the world. // one thread in the world.
_states_lock = new ReMutex("RenderState"); _states_lock = new ReMutex("RenderState::_states_lock");
nassertv(Thread::get_current_thread() == Thread::get_main_thread()); nassertv(Thread::get_current_thread() == Thread::get_main_thread());
} }

2
panda/src/pgraph/transformState.cxx
View File

@ -1253,7 +1253,7 @@ init_states() {
// meantime, this is OK because we guarantee that this method is // meantime, this is OK because we guarantee that this method is
// called at static init time, presumably when there is still only // called at static init time, presumably when there is still only
// one thread in the world. // one thread in the world.
_states_lock = new ReMutex("TransformState"); _states_lock = new ReMutex("TransformState::_states_lock");
nassertv(Thread::get_current_thread() == Thread::get_main_thread()); nassertv(Thread::get_current_thread() == Thread::get_main_thread());
} }

2
panda/src/pstatclient/pStatClient.cxx
View File

@ -75,7 +75,7 @@ PerThreadData() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PStatClient:: PStatClient::
PStatClient() : PStatClient() :
_lock("PStatClient"), _lock("PStatClient::_lock"),
_impl(NULL) _impl(NULL)
{ {
_collectors = NULL; _collectors = NULL;