retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-4349 try this, it should be a minimal wait since this will poll the socket for 20ms only when there are no events at all and no log data at all

This commit is contained in:
Anthony Minessale 2012-06-26 09:58:51 -05:00
parent 7dc9a9cacc
commit e7f05b49ad
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -96,6 +96,7 @@ struct listener {
switch_event_t *filters;
time_t linger_timeout;
struct listener *next;
switch_pollfd_t *pollfd;
};
typedef struct listener listener_t;
@ -475,6 +476,8 @@ SWITCH_STANDARD_APP(socket_function)
listener->session = session;
switch_set_flag(listener, LFLAG_ALLOW_LOG);
switch_socket_create_pollset(&listener->pollfd, listener->sock, SWITCH_POLLIN | SWITCH_POLLERR, listener->pool);
switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool);
switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool);
@ -833,6 +836,7 @@ SWITCH_STANDARD_API(event_sink_function)
switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool);
switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool);
switch_core_hash_init(&listener->event_hash, listener->pool);
switch_set_flag(listener, LFLAG_AUTHED);
switch_set_flag(listener, LFLAG_STATEFUL);
@ -1381,7 +1385,10 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
}
if (do_sleep) {
switch_cond_next();
int fdr = 0;
switch_poll(listener->pollfd, 1, &fdr, 20000);
} else {
switch_os_yield();
}
}
@ -2850,6 +2857,9 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_socket_runtime)
switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool);
switch_core_hash_init(&listener->event_hash, listener->pool);
switch_socket_create_pollset(&listener->pollfd, listener->sock, SWITCH_POLLIN | SWITCH_POLLERR, listener->pool);
if (switch_socket_addr_get(&listener->sa, SWITCH_TRUE, listener->sock) == SWITCH_STATUS_SUCCESS && listener->sa) {
switch_get_addr(listener->remote_ip, sizeof(listener->remote_ip), listener->sa);