external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable the statistics timer again, so that !stats provide up to date network statistics.

Browse Source
This commit is contained in:
Jan Vidar Krey
2010-01-23 00:43:38 +01:00
parent c670d13369
commit 304ecda16a
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/epoll.c
View File

@@ -110,15 +110,16 @@ int net_backend_process()
size_t secs = timeout_queue_get_next_timeout(&g_backend->timeout_queue, g_backend->now);
LOG_TRACE("epoll_wait: fd=%d, events=%x, max=%zu, seconds=%d", g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER), (int) secs);
int res = epoll_wait(g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER), secs * 1000);
g_backend->now = time(0);
timeout_queue_process(&g_backend->timeout_queue, g_backend->now);
if (res == -1)
{
LOG_WARN("epoll_wait returned -1");
return 0;
}
g_backend->now = time(0);
timeout_queue_process(&g_backend->timeout_queue, g_backend->now);
for (n = 0; n < res; n++)
{
struct net_connection_epoll* con = (struct net_connection_epoll*) g_backend->events[n].data.ptr;

6
src/network/select.c
View File

@@ -117,15 +117,15 @@ int net_backend_process()
}
int res = select(maxfd+1, &g_backend->rfds, &g_backend->wfds, 0, &tval);
g_backend->now = time(0);
timeout_queue_process(&g_backend->timeout_queue, g_backend->now);
if (res == -1)
{
LOG_WARN("select returned -1");
return 0;
}
g_backend->now = time(0);
timeout_queue_process(&g_backend->timeout_queue, g_backend->now);
for (n = 0, found = 0; found < res && n < (maxfd+1); n++)
{
struct net_connection_select* con = g_backend->conns[n];