Changeset 4394


Ignore:
Timestamp:
Feb 27, 2013 12:02:42 PM (7 years ago)
Author:
ming
Message:

Re #1592: Backported to 1.x

Location:
pjproject/branches/1.x
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x

  • pjproject/branches/1.x/pjlib/src/pj/timer.c

    r3456 r4394  
    498498    PJ_ASSERT_RETURN(ht, 0); 
    499499 
     500    lock_timer_heap(ht); 
    500501    if (!ht->cur_size && next_delay) { 
    501502        next_delay->sec = next_delay->msec = PJ_MAXINT32; 
     503        unlock_timer_heap(ht); 
    502504        return 0; 
    503505    } 
     
    506508    pj_gettickcount(&now); 
    507509 
    508     lock_timer_heap(ht); 
    509510    while ( ht->cur_size &&  
    510511            PJ_TIME_VAL_LTE(ht->heap[0]->_timer_value, now) && 
  • pjproject/branches/1.x/pjsip/src/pjsip/sip_transport_tcp.c

    r4393 r4394  
    679679                                    &size, 0); 
    680680        if (status != PJ_EPENDING) { 
     681            pj_lock_release(tcp->base.lock); 
    681682            on_data_sent(tcp->asock, op_key, size); 
     683            pj_lock_acquire(tcp->base.lock); 
    682684        } 
    683685 
  • pjproject/branches/1.x/pjsip/src/pjsip/sip_transport_tls.c

    r4393 r4394  
    678678 
    679679        if (status != PJ_EPENDING) { 
     680            pj_lock_release(tls->base.lock); 
    680681            on_data_sent(tls->ssock, op_key, size); 
     682            pj_lock_acquire(tls->base.lock); 
    681683        } 
    682684    } 
Note: See TracChangeset for help on using the changeset viewer.