philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework the calculation of the select timeout in io() to be based on absolute wake time

Browse Source 
An absolute wake time is now calculated and updated by set_server_bits(),
TimerTimeout() and tclTimerTimeout().  This is then used to calculate the actual
select() timeout, instead of having those functions calculate a relative timeout
value themselves.  This significantly simplifies those functions, since the
underlying values tend to be recorded as absolute times.

It also allows us to disentangle tclTimeTimeout from TimerTimeout(), and move the
responsibility for calculating the QUEUE_SENDS wake time from TimerTimeout() to
set_server_bits() where it belongs.

The QUEUE_SENDS and CONNECT_DELAY wake up times will also now be correctly
calculated, based on the last sent time and connect time respectively.
This commit is contained in:
Kevin Easton
2015-06-07 00:03:09 +10:00
parent 6f0f9dd8a8
commit c0c7cdbdcc
7 changed files with 67 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/irc.c
View File

@@ -1196,13 +1196,10 @@ extern void set_screens (fd_set *, fd_set *);
void BX_io (const char *what)
{
static int level = 0;
long clock_timeout = 0,
timer_timeout = 0,
server_timeout = 0,
real_timeout = 0;
static struct timeval my_now,
long clock_timeout = 0;
struct timeval my_now,
my_timer,
*time_ptr = &my_timer;
timeout;
int hold_over, rc;
fd_set rd, wd;
static int old_level = 0;
@@ -1211,9 +1208,6 @@ void BX_io (const char *what)
level++;
get_time(&my_now);
now = my_now.tv_sec;
if (x_debug & DEBUG_WAITS)
{
if (level != old_level)
@@ -1237,6 +1231,9 @@ void BX_io (const char *what)
caller[level] = what;
get_time(&my_now);
now = my_now.tv_sec;
/* CHECK FOR CPU SAVER MODE */
if (!cpu_saver && get_int_var(CPU_SAVER_AFTER_VAR))
if (now - idle_time > get_int_var(CPU_SAVER_AFTER_VAR) * 60)
@@ -1250,7 +1247,6 @@ void BX_io (const char *what)
#ifndef GUI
set_screens(&rd, &wd);
#endif
server_timeout = set_server_bits(&rd, &wd);
set_process_bits(&rd);
set_socket_read(&rd, &wd);
set_nslookupfd(&rd);
@@ -1258,38 +1254,40 @@ void BX_io (const char *what)
gui_setfd(&rd);
#endif
clock_timeout = (60 - (my_now.tv_sec % 60)) * 1000;
clock_timeout = 60 - (my_now.tv_sec % 60);
if (cpu_saver && get_int_var(CPU_SAVER_EVERY_VAR))
clock_timeout += (get_int_var(CPU_SAVER_EVERY_VAR) - 1) * 60000;
clock_timeout += (get_int_var(CPU_SAVER_EVERY_VAR) - 1) * 60;
timer_timeout = TimerTimeout();
my_timer.tv_sec = my_now.tv_sec + clock_timeout;
my_timer.tv_usec = 0;
if ((hold_over = unhold_windows()))
real_timeout = 0;
else if (timer_timeout <= clock_timeout)
real_timeout = timer_timeout;
else
real_timeout = clock_timeout;
set_server_bits(&rd, &wd, &my_timer);
if (server_timeout >= 0 && server_timeout < real_timeout)
real_timeout = server_timeout;
tclTimerTimeout(&my_timer);
time_ptr = &my_timer;
TimerTimeout(&my_timer);
if (real_timeout == -1)
time_ptr = NULL;
if ((hold_over = unhold_windows()) || time_cmp(&my_timer, &my_now) < 0)
{
timeout.tv_sec = 0;
timeout.tv_usec = 0;
}
else
{
time_ptr->tv_sec = real_timeout / 1000;
time_ptr->tv_usec = ((real_timeout % 1000) * 1000);
timeout.tv_sec = my_timer.tv_sec - my_now.tv_sec;
timeout.tv_usec = my_timer.tv_usec - my_now.tv_usec;
if (timeout.tv_usec < 0)
{
timeout.tv_sec--;
timeout.tv_usec += 1000000;
}
}
/* GO AHEAD AND WAIT FOR SOME DATA TO COME IN */
switch ((rc = new_select(&rd, &wd, time_ptr)))
switch ((rc = new_select(&rd, &wd, &timeout)))
{
case 0:
if (server_timeout >= 0)
do_idle_server();
do_idle_server();
break;
case -1:
{
@@ -1309,7 +1307,8 @@ void BX_io (const char *what)
default:
{
cntl_c_hit = 0;
now = time(NULL);
get_time(&my_now);
now = my_now.tv_sec;
make_window_current(NULL);
do_server(&rd, &wd);
do_processes(&rd);
@@ -1327,7 +1326,8 @@ void BX_io (const char *what)
}
}
now = time(NULL);
get_time(&my_now);
now = my_now.tv_sec;
ExecuteTimers();
#ifdef WANT_TCL
check_utimers();