diff options
author | Hanoh Haim <hhaim@cisco.com> | 2015-09-02 20:30:33 +0300 |
---|---|---|
committer | Hanoh Haim <hhaim@cisco.com> | 2015-09-02 20:30:33 +0300 |
commit | 4ad6ed1716dc917a0b80ddfbbefc43c734eeaab6 (patch) | |
tree | d4b215558ff4c3507a7ba2cda45e5afc3574bb66 /src/timer_wheel_pq.cpp | |
parent | 83a53d61c3e7db90637cde90f241f3272ccf3e5a (diff) |
- fix valgrind gtest simulation errors
- remove 32bit sim images for faster dev
Diffstat (limited to 'src/timer_wheel_pq.cpp')
-rwxr-xr-x | src/timer_wheel_pq.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/timer_wheel_pq.cpp b/src/timer_wheel_pq.cpp index 172d061e..bb480abd 100755 --- a/src/timer_wheel_pq.cpp +++ b/src/timer_wheel_pq.cpp @@ -169,11 +169,14 @@ bool CTimerWheel::handle(){ assert(timer->m_flow); CFlowTimerHandle * flow =timer->m_flow; m_st_handle++; + + timer->m_flow=0;/* stop the timer */ + flow->m_timer=0; + if ( flow->m_callback ){ flow->m_callback(flow); } - timer->m_flow=0;/* stop the timer */ - flow->m_timer=0; + m_pq.pop(); m_st_free++; delete timer; |