diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-04-27 01:32:12 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-04-27 01:32:12 +0000 |
| commit | 22098b13d8be9412bcc63202b99160838b099f80 (patch) | |
| tree | 33542faa7d5fd5323eba1c930b56283fe4d1cce3 /pjlib/src | |
| parent | c8173f5bbbfccf8fca8dc786b7be92eeac0a4dcb (diff) | |
Re #1474: merged r4100-4107
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4108 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
| -rw-r--r-- | pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c | 5 | ||||
| -rw-r--r-- | pjlib/src/pjlib-test/udp_echo_srv_sync.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c index ee9120f2..217a8d87 100644 --- a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c +++ b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c @@ -22,6 +22,7 @@ static pj_ioqueue_key_t *key; static pj_atomic_t *total_bytes; +static pj_bool_t thread_quit_flag; struct op_key { @@ -145,12 +146,12 @@ static int worker_thread(void *arg) on_read_complete(key, &read_op.op_key_, length); } - for (;;) { + while (!thread_quit_flag) { pj_time_val timeout; timeout.sec = 0; timeout.msec = 10; rc = pj_ioqueue_poll(ioqueue, &timeout); } - PJ_UNREACHED(return 0;) + return 0; } int udp_echo_srv_ioqueue(void) diff --git a/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/pjlib/src/pjlib-test/udp_echo_srv_sync.c index 6a75a911..a5624208 100644 --- a/pjlib/src/pjlib-test/udp_echo_srv_sync.c +++ b/pjlib/src/pjlib-test/udp_echo_srv_sync.c @@ -21,6 +21,7 @@ #include <pjlib.h> static pj_atomic_t *total_bytes; +static pj_bool_t thread_quit_flag = 0; static int worker_thread(void *arg) { @@ -28,7 +29,7 @@ static int worker_thread(void *arg) char buf[512]; pj_status_t last_recv_err = PJ_SUCCESS, last_write_err = PJ_SUCCESS; - for (;;) { + while (!thread_quit_flag) { pj_ssize_t len; pj_status_t rc; pj_sockaddr_in addr; @@ -56,7 +57,7 @@ static int worker_thread(void *arg) continue; } } - PJ_UNREACHED(return 0;) + return 0; } |