kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting guideline fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2011-08-15 13:27:06 +00:00
parent c9f65ece49
commit 6b7e997df2
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_sip.c
View File

@@ -25697,8 +25697,9 @@ static void *do_monitor(void *data)
int reloading; int reloading;
/* Add an I/O event to our SIP UDP socket */ /* Add an I/O event to our SIP UDP socket */
if (sipsock > -1) if (sipsock > -1) {
sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL); sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL);
}
/* From here on out, we die whenever asked */ /* From here on out, we die whenever asked */
for(;;) { for(;;) {
@@ -25713,10 +25714,11 @@ static void *do_monitor(void *data)
/* Change the I/O fd of our UDP socket */ /* Change the I/O fd of our UDP socket */
if (sipsock > -1) { if (sipsock > -1) {
if (sipsock_read_id) if (sipsock_read_id) {
sipsock_read_id = ast_io_change(io, sipsock_read_id, sipsock, NULL, 0, NULL); sipsock_read_id = ast_io_change(io, sipsock_read_id, sipsock, NULL, 0, NULL);
else } else {
sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL); sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL);
}
} else if (sipsock_read_id) { } else if (sipsock_read_id) {
ast_io_remove(io, sipsock_read_id); ast_io_remove(io, sipsock_read_id);
sipsock_read_id = NULL; sipsock_read_id = NULL;
@@ -25744,15 +25746,18 @@ static void *do_monitor(void *data)
pthread_testcancel(); pthread_testcancel();
/* Wait for sched or io */ /* Wait for sched or io */
res = ast_sched_wait(sched); res = ast_sched_wait(sched);
if ((res < 0) || (res > 1000)) if ((res < 0) || (res > 1000)) {
res = 1000; res = 1000;
}
res = ast_io_wait(io, res); res = ast_io_wait(io, res);
if (res > 20) if (res > 20) {
ast_debug(1, "chan_sip: ast_io_wait ran %d all at once\n", res); ast_debug(1, "chan_sip: ast_io_wait ran %d all at once\n", res);
}
ast_mutex_lock(&monlock); ast_mutex_lock(&monlock);
res = ast_sched_runq(sched); res = ast_sched_runq(sched);
if (res >= 20) if (res >= 20) {
ast_debug(1, "chan_sip: ast_sched_runq ran %d all at once\n", res); ast_debug(1, "chan_sip: ast_sched_runq ran %d all at once\n", res);
}
ast_mutex_unlock(&monlock); ast_mutex_unlock(&monlock);
} }