StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed threading bug that could cause segfaults.

Browse Source
This commit is contained in:
irungentoo 2014-07-08 12:04:13 -04:00
parent 9874173d71
commit 7ce9816e40
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toxav/msi.c
View File

@ -620,18 +620,20 @@ int timer_alloc ( TimerHandler *timers_container, void *(func)(void *, int), voi
* *
* @param timers_container handler * @param timers_container handler
* @param idx index * @param idx index
* @param idx lock_mutex (does the mutex need to be locked)
* @return int * @return int
*/ */
int timer_release ( TimerHandler *timers_container, int idx ) int timer_release ( TimerHandler *timers_container, int idx , int lock_mutex)
{ {
int rc = pthread_mutex_trylock(&timers_container->mutex); if (lock_mutex)
pthread_mutex_lock(&timers_container->mutex);
Timer **timed_events = timers_container->timers; Timer **timed_events = timers_container->timers;
if (!timed_events[idx]) { if (!timed_events[idx]) {
LOGGER_WARNING("No event under index: %d", idx); LOGGER_WARNING("No event under index: %d", idx);
if ( rc != EBUSY ) pthread_mutex_unlock(&timers_container->mutex); if (lock_mutex) pthread_mutex_unlock(&timers_container->mutex);
return -1; return -1;
} }
@ -651,7 +653,7 @@ int timer_release ( TimerHandler *timers_container, int idx )
LOGGER_DEBUG("Popped index: %d, current size: %d ", idx, timers_container->size); LOGGER_DEBUG("Popped index: %d, current size: %d ", idx, timers_container->size);
if ( rc != EBUSY ) pthread_mutex_unlock(&timers_container->mutex); if (lock_mutex) pthread_mutex_unlock(&timers_container->mutex);
return 0; return 0;
} }
@ -678,7 +680,7 @@ void *timer_poll( void *arg )
handler->timers[0]->func(handler->timers[0]->func_arg1, handler->timers[0]->func_arg2); handler->timers[0]->func(handler->timers[0]->func_arg1, handler->timers[0]->func_arg2);
LOGGER_DEBUG("Exectued timer assigned at: %d", handler->timers[0]->timeout); LOGGER_DEBUG("Exectued timer assigned at: %d", handler->timers[0]->timeout);
timer_release(handler, 0); timer_release(handler, 0, 0);
} }
} }
@ -1107,8 +1109,8 @@ int terminate_call ( MSISession *session, MSICall *call )
* NOTE: This has to be done before possibly * NOTE: This has to be done before possibly
* locking the mutex the second time * locking the mutex the second time
*/ */
timer_release ( session->timer_handler, call->request_timer_id ); timer_release ( session->timer_handler, call->request_timer_id, 1);
timer_release ( session->timer_handler, call->ringing_timer_id ); timer_release ( session->timer_handler, call->ringing_timer_id, 1);
/* Get a handle */ /* Get a handle */
pthread_mutex_lock ( &call->mutex ); pthread_mutex_lock ( &call->mutex );
@ -1371,7 +1373,7 @@ int handle_recv_starting ( MSISession *session, MSICall *call, MSIMessage *msg )
flush_peer_type ( call, msg, 0 ); flush_peer_type ( call, msg, 0 );
timer_release ( session->timer_handler, call->ringing_timer_id ); timer_release ( session->timer_handler, call->ringing_timer_id, 1 );
pthread_mutex_unlock(&session->mutex); pthread_mutex_unlock(&session->mutex);
invoke_callback(call->call_idx, MSI_OnStarting); invoke_callback(call->call_idx, MSI_OnStarting);
@ -1389,7 +1391,7 @@ int handle_recv_ending ( MSISession *session, MSICall *call, MSIMessage *msg )
LOGGER_DEBUG("Session: %p Handling 'ending' on call: %s", session, call->id ); LOGGER_DEBUG("Session: %p Handling 'ending' on call: %s", session, call->id );
/* Stop timer */ /* Stop timer */
timer_release ( session->timer_handler, call->request_timer_id ); timer_release ( session->timer_handler, call->request_timer_id, 1 );
pthread_mutex_unlock(&session->mutex); pthread_mutex_unlock(&session->mutex);
@ -1531,7 +1533,7 @@ void msi_handle_packet ( Messenger *messenger, int source, const uint8_t *data,
} }
/* Got response so cancel timer */ /* Got response so cancel timer */
if ( call ) timer_release ( session->timer_handler, call->request_timer_id ); if ( call ) timer_release ( session->timer_handler, call->request_timer_id, 1 );
uint8_t _response_value[32]; uint8_t _response_value[32];