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

prevent deadlock on exit with pstats

Browse Source
This commit is contained in:
David Rose 2008-09-26 00:34:49 +00:00
parent 5d8cd59628
commit c740062d29
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -503,6 +503,10 @@ remove_all_windows() {
// And, hey, let's stop the vertex paging threads, if any. // And, hey, let's stop the vertex paging threads, if any.
VertexDataPage::stop_threads(); VertexDataPage::stop_threads();
#ifdef DO_PSTATS
PStatClient::get_global_pstats()->disconnect();
#endif
// Well, and why not clean up all threads here? // Well, and why not clean up all threads here?
Thread::prepare_for_exit(); Thread::prepare_for_exit();
} }

2
panda/src/net/connectionWriter.cxx
View File

@ -106,6 +106,8 @@ ConnectionWriter::
(*ti)->join(); (*ti)->join();
} }
} }
////////////////////////////////////////////////////////////////////
// Function: ConnectionWriter::set_max_queue_size // Function: ConnectionWriter::set_max_queue_size
// Access: Public // Access: Public
// Description: Limits the number of packets that may be pending on // Description: Limits the number of packets that may be pending on

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

@ -110,10 +110,6 @@ PStatClient() :
PStatClient:: PStatClient::
~PStatClient() { ~PStatClient() {
disconnect(); disconnect();
if (has_impl()) {
delete _impl;
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -425,6 +421,8 @@ client_disconnect() {
ReMutexHolder holder(_lock); ReMutexHolder holder(_lock);
if (has_impl()) { if (has_impl()) {
_impl->client_disconnect(); _impl->client_disconnect();
delete _impl;
_impl = NULL;
} }
ThreadPointer *threads = (ThreadPointer *)_threads; ThreadPointer *threads = (ThreadPointer *)_threads;