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

SubprocessWindow requires a ReMutex to avoid self-deadlock

Browse Source
This commit is contained in:
David Rose 2011-12-05 05:24:21 +00:00
parent c17f0dce3d
commit ae76495d75
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
#include "pStatClient.h" #include "pStatClient.h"
#include "pStatCollector.h" #include "pStatCollector.h"
#include "mutexHolder.h" #include "mutexHolder.h"
#include "reMutexHolder.h"
#include "lightReMutexHolder.h" #include "lightReMutexHolder.h"
#include "cullFaceAttrib.h" #include "cullFaceAttrib.h"
#include "string_utils.h" #include "string_utils.h"
@ -201,7 +202,7 @@ set_threading_model(const GraphicsThreadingModel &threading_model) {
<< "Danger! Creating requested render threads anyway!\n"; << "Danger! Creating requested render threads anyway!\n";
} }
#endif // THREADED_PIPELINE #endif // THREADED_PIPELINE
MutexHolder holder(_lock); ReMutexHolder holder(_lock);
_threading_model = threading_model; _threading_model = threading_model;
} }
@ -215,7 +216,7 @@ GraphicsThreadingModel GraphicsEngine::
get_threading_model() const { get_threading_model() const {
GraphicsThreadingModel result; GraphicsThreadingModel result;
{ {
MutexHolder holder(_lock); ReMutexHolder holder(_lock);
result = _threading_model; result = _threading_model;
} }
return result; return result;
@ -471,7 +472,7 @@ remove_window(GraphicsOutput *window) {
PT(GraphicsOutput) ptwin = window; PT(GraphicsOutput) ptwin = window;
size_t count; size_t count;
{ {
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
if (!_windows_sorted) { if (!_windows_sorted) {
do_resort_windows(); do_resort_windows();
} }
@ -492,7 +493,7 @@ remove_window(GraphicsOutput *window) {
// context. // context.
bool any_common = false; bool any_common = false;
{ {
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
Windows::iterator wi; Windows::iterator wi;
for (wi = _windows.begin(); wi != _windows.end() && !any_common; ++wi) { for (wi = _windows.begin(); wi != _windows.end() && !any_common; ++wi) {
GraphicsStateGuardian *gsg2 = (*wi)->get_gsg(); GraphicsStateGuardian *gsg2 = (*wi)->get_gsg();
@ -670,7 +671,7 @@ render_frame() {
} }
{ {
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
if (!_windows_sorted) { if (!_windows_sorted) {
do_resort_windows(); do_resort_windows();
@ -907,7 +908,7 @@ void GraphicsEngine::
open_windows() { open_windows() {
Thread *current_thread = Thread::get_current_thread(); Thread *current_thread = Thread::get_current_thread();
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
if (!_windows_sorted) { if (!_windows_sorted) {
do_resort_windows(); do_resort_windows();
@ -950,7 +951,7 @@ open_windows() {
void GraphicsEngine:: void GraphicsEngine::
sync_frame() { sync_frame() {
Thread *current_thread = Thread::get_current_thread(); Thread *current_thread = Thread::get_current_thread();
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
if (_flip_state == FS_draw) { if (_flip_state == FS_draw) {
do_sync_frame(current_thread); do_sync_frame(current_thread);
@ -975,7 +976,7 @@ sync_frame() {
void GraphicsEngine:: void GraphicsEngine::
ready_flip() { ready_flip() {
Thread *current_thread = Thread::get_current_thread(); Thread *current_thread = Thread::get_current_thread();
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
if (_flip_state == FS_draw) { if (_flip_state == FS_draw) {
do_ready_flip(current_thread); do_ready_flip(current_thread);
@ -994,7 +995,7 @@ ready_flip() {
void GraphicsEngine:: void GraphicsEngine::
flip_frame() { flip_frame() {
Thread *current_thread = Thread::get_current_thread(); Thread *current_thread = Thread::get_current_thread();
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
if (_flip_state != FS_flip) { if (_flip_state != FS_flip) {
do_flip_frame(current_thread); do_flip_frame(current_thread);
@ -1032,7 +1033,7 @@ flip_frame() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool GraphicsEngine:: bool GraphicsEngine::
extract_texture_data(Texture *tex, GraphicsStateGuardian *gsg) { extract_texture_data(Texture *tex, GraphicsStateGuardian *gsg) {
MutexHolder holder(_lock); ReMutexHolder holder(_lock);
string draw_name = gsg->get_threading_model().get_draw_name(); string draw_name = gsg->get_threading_model().get_draw_name();
if (draw_name.empty()) { if (draw_name.empty()) {
@ -1213,7 +1214,7 @@ is_scene_root(const PandaNode *node) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void GraphicsEngine:: void GraphicsEngine::
set_window_sort(GraphicsOutput *window, int sort) { set_window_sort(GraphicsOutput *window, int sort) {
MutexHolder holder(_lock); ReMutexHolder holder(_lock);
window->_sort = sort; window->_sort = sort;
_windows_sorted = false; _windows_sorted = false;
} }
@ -1922,7 +1923,7 @@ void GraphicsEngine::
do_add_window(GraphicsOutput *window, do_add_window(GraphicsOutput *window,
const GraphicsThreadingModel &threading_model) { const GraphicsThreadingModel &threading_model) {
nassertv(window != NULL); nassertv(window != NULL);
MutexHolder holder(_lock); ReMutexHolder holder(_lock);
nassertv(window->get_engine() == this); nassertv(window->get_engine() == this);
// We have a special counter that is unique per window that allows // We have a special counter that is unique per window that allows
@ -1988,7 +1989,7 @@ do_add_window(GraphicsOutput *window,
void GraphicsEngine:: void GraphicsEngine::
do_add_gsg(GraphicsStateGuardian *gsg, GraphicsPipe *pipe, do_add_gsg(GraphicsStateGuardian *gsg, GraphicsPipe *pipe,
const GraphicsThreadingModel &threading_model) { const GraphicsThreadingModel &threading_model) {
MutexHolder holder(_lock); ReMutexHolder holder(_lock);
nassertv(gsg->get_pipe() == pipe && gsg->get_engine() == this); nassertv(gsg->get_pipe() == pipe && gsg->get_engine() == this);
gsg->_threading_model = threading_model; gsg->_threading_model = threading_model;
@ -2219,7 +2220,7 @@ auto_adjust_capabilities(GraphicsStateGuardian *gsg) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void GraphicsEngine:: void GraphicsEngine::
terminate_threads(Thread *current_thread) { terminate_threads(Thread *current_thread) {
MutexHolder holder(_lock, current_thread); ReMutexHolder holder(_lock, current_thread);
// We spend almost our entire time in this method just waiting for // We spend almost our entire time in this method just waiting for
// threads. Time it appropriately. // threads. Time it appropriately.

3
panda/src/display/graphicsEngine.h
View File

@ -24,6 +24,7 @@
#include "pointerTo.h" #include "pointerTo.h"
#include "thread.h" #include "thread.h"
#include "pmutex.h" #include "pmutex.h"
#include "reMutex.h"
#include "lightReMutex.h" #include "lightReMutex.h"
#include "conditionVar.h" #include "conditionVar.h"
#include "pStatCollector.h" #include "pStatCollector.h"
@ -323,7 +324,7 @@ private:
bool _singular_warning_last_frame; bool _singular_warning_last_frame;
bool _singular_warning_this_frame; bool _singular_warning_this_frame;
Mutex _lock; ReMutex _lock;
class LoadedTexture { class LoadedTexture {
public: public:

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

@ -369,9 +369,10 @@ internal_open_window() {
// Create a buffer with the same properties as the window. // Create a buffer with the same properties as the window.
int flags = _creation_flags; int flags = _creation_flags;
flags = ((flags & ~GraphicsPipe::BF_require_window) | GraphicsPipe::BF_refuse_window); flags = ((flags & ~GraphicsPipe::BF_require_window) | GraphicsPipe::BF_refuse_window);
WindowProperties win_props = WindowProperties::size(_properties.get_x_size(), _properties.get_y_size());
GraphicsOutput *buffer = GraphicsOutput *buffer =
_engine->make_output(_pipe, _name, 0, _fb_properties, _properties, _engine->make_output(_pipe, _name, 0, _fb_properties, win_props,
flags, _gsg, _host); flags, _gsg, _host);
if (buffer != NULL) { if (buffer != NULL) {
_buffer = DCAST(GraphicsBuffer, buffer); _buffer = DCAST(GraphicsBuffer, buffer);