diff --git a/panda/src/pstatclient/pStatClient.cxx b/panda/src/pstatclient/pStatClient.cxx index 0cb89ab855..89206b3645 100644 --- a/panda/src/pstatclient/pStatClient.cxx +++ b/panda/src/pstatclient/pStatClient.cxx @@ -557,8 +557,10 @@ is_active(int collector_index, int thread_index) const { //////////////////////////////////////////////////////////////////// void PStatClient:: start(int collector_index, int thread_index) { +#ifdef _DEBUG nassertv(collector_index >= 0 && collector_index < (int)_collectors.size()); nassertv(thread_index >= 0 && thread_index < (int)_threads.size()); +#endif if (_collectors[collector_index]._def->_is_active && _threads[thread_index]._is_active) { @@ -581,8 +583,10 @@ start(int collector_index, int thread_index) { //////////////////////////////////////////////////////////////////// void PStatClient:: start(int collector_index, int thread_index, float as_of) { +#ifdef _DEBUG nassertv(collector_index >= 0 && collector_index < (int)_collectors.size()); nassertv(thread_index >= 0 && thread_index < (int)_threads.size()); +#endif if (_collectors[collector_index]._def->_is_active && _threads[thread_index]._is_active) { @@ -604,8 +608,10 @@ start(int collector_index, int thread_index, float as_of) { //////////////////////////////////////////////////////////////////// void PStatClient:: stop(int collector_index, int thread_index) { +#ifdef _DEBUG nassertv(collector_index >= 0 && collector_index < (int)_collectors.size()); nassertv(thread_index >= 0 && thread_index < (int)_threads.size()); +#endif if (_collectors[collector_index]._def->_is_active && _threads[thread_index]._is_active) { @@ -637,8 +643,10 @@ stop(int collector_index, int thread_index) { //////////////////////////////////////////////////////////////////// void PStatClient:: stop(int collector_index, int thread_index, float as_of) { +#ifdef _DEBUG nassertv(collector_index >= 0 && collector_index < (int)_collectors.size()); nassertv(thread_index >= 0 && thread_index < (int)_threads.size()); +#endif if (_collectors[collector_index]._def->_is_active && _threads[thread_index]._is_active) { diff --git a/panda/src/pstatclient/pStatFrameData.I b/panda/src/pstatclient/pStatFrameData.I index 81789ba821..dfae06e7f1 100644 --- a/panda/src/pstatclient/pStatFrameData.I +++ b/panda/src/pstatclient/pStatFrameData.I @@ -70,7 +70,9 @@ clear() { //////////////////////////////////////////////////////////////////// INLINE void PStatFrameData:: add_start(int index, float time) { +#ifdef _DEBUG nassertv((index & 0x7fff) == index); +#endif DataPoint dp; dp._index = index; dp._value = time; @@ -85,7 +87,9 @@ add_start(int index, float time) { //////////////////////////////////////////////////////////////////// INLINE void PStatFrameData:: add_stop(int index, float time) { +#ifdef _DEBUG nassertv((index & 0x7fff) == index); +#endif DataPoint dp; dp._index = index | 0x8000; dp._value = time; @@ -100,7 +104,9 @@ add_stop(int index, float time) { //////////////////////////////////////////////////////////////////// INLINE void PStatFrameData:: add_level(int index, float level) { +#ifdef _DEBUG nassertv((index & 0xffff) == index); +#endif DataPoint dp; dp._index = index; dp._value = level;