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

Work around compiler optimisation bug on FreeBSD by swapping two lines of code :-/

Browse Source
This commit is contained in:
rdb 2010-04-25 08:30:02 +00:00
parent 8582089aeb
commit 0e54f8b85b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/pipeline/asyncTaskBase.cxx
View File

@ -21,7 +21,7 @@ TypeHandle AsyncTaskBase::_type_handle;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: AsyncTaskBase::Constructor // Function: AsyncTaskBase::Constructor
// Access: Protected // Access: Protected
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
AsyncTaskBase:: AsyncTaskBase::
AsyncTaskBase() { AsyncTaskBase() {
@ -30,7 +30,7 @@ AsyncTaskBase() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: AsyncTaskBase::Destructor // Function: AsyncTaskBase::Destructor
// Access: Published, Virtual // Access: Published, Virtual
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
AsyncTaskBase:: AsyncTaskBase::
~AsyncTaskBase() { ~AsyncTaskBase() {
@ -48,14 +48,14 @@ record_task(Thread *current_thread) {
nassertv(current_thread->_current_task == NULL); nassertv(current_thread->_current_task == NULL);
void *result = AtomicAdjust::compare_and_exchange_ptr void *result = AtomicAdjust::compare_and_exchange_ptr
((void * TVOLATILE &)current_thread->_current_task, ((void * TVOLATILE &)current_thread->_current_task,
(void *)NULL, (void *)this); (void *)NULL, (void *)this);
// If the return value is other than NULL, someone else must have // If the return value is other than NULL, someone else must have
// assigned the task first, in another thread. That shouldn't be // assigned the task first, in another thread. That shouldn't be
// possible. // possible.
nassertv(result == NULL);
nassertv(current_thread->_current_task == this); nassertv(current_thread->_current_task == this);
nassertv(result == NULL);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -69,12 +69,12 @@ clear_task(Thread *current_thread) {
nassertv(current_thread->_current_task == this); nassertv(current_thread->_current_task == this);
void *result = AtomicAdjust::compare_and_exchange_ptr void *result = AtomicAdjust::compare_and_exchange_ptr
((void * TVOLATILE &)current_thread->_current_task, ((void * TVOLATILE &)current_thread->_current_task,
(void *)this, (void *)NULL); (void *)this, (void *)NULL);
// If the return value is other than this, someone else must have // If the return value is other than this, someone else must have
// assigned the task first, in another thread. That shouldn't be // assigned the task first, in another thread. That shouldn't be
// possible. // possible.
nassertv(result == this);
nassertv(current_thread->_current_task == NULL); nassertv(current_thread->_current_task == NULL);
nassertv(result == this);
} }