Changeset 4394
- Timestamp:
- Feb 27, 2013 12:02:42 PM (12 years ago)
- Location:
- pjproject/branches/1.x
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/1.x
- Property svn:mergeinfo changed
/pjproject/trunk merged: 4281
- Property svn:mergeinfo changed
-
pjproject/branches/1.x/pjlib/src/pj/timer.c
r3456 r4394 498 498 PJ_ASSERT_RETURN(ht, 0); 499 499 500 lock_timer_heap(ht); 500 501 if (!ht->cur_size && next_delay) { 501 502 next_delay->sec = next_delay->msec = PJ_MAXINT32; 503 unlock_timer_heap(ht); 502 504 return 0; 503 505 } … … 506 508 pj_gettickcount(&now); 507 509 508 lock_timer_heap(ht);509 510 while ( ht->cur_size && 510 511 PJ_TIME_VAL_LTE(ht->heap[0]->_timer_value, now) && -
pjproject/branches/1.x/pjsip/src/pjsip/sip_transport_tcp.c
r4393 r4394 679 679 &size, 0); 680 680 if (status != PJ_EPENDING) { 681 pj_lock_release(tcp->base.lock); 681 682 on_data_sent(tcp->asock, op_key, size); 683 pj_lock_acquire(tcp->base.lock); 682 684 } 683 685 -
pjproject/branches/1.x/pjsip/src/pjsip/sip_transport_tls.c
r4393 r4394 678 678 679 679 if (status != PJ_EPENDING) { 680 pj_lock_release(tls->base.lock); 680 681 on_data_sent(tls->ssock, op_key, size); 682 pj_lock_acquire(tls->base.lock); 681 683 } 682 684 }
Note: See TracChangeset
for help on using the changeset viewer.