drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: timerfd: fix gettime 

- split into to __try/__except blocks to make sure
  leave_critical_section is always called when required.

- Actually fill time_spec in settime so it_interval is returned
  correctly.

- Return all 0 if timer is disarmed.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2019-01-21 22:52:39 +01:00
parent 289b7c09c8
commit 5b23a8e831
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
winsup/cygwin/timerfd.cc
View File

@ -502,13 +502,26 @@ timerfd_tracker::gettime (struct itimerspec *curr_value)
ret = -EBADF; ret = -EBADF;
__leave; __leave;
} }
}
__except (NO_ERROR)
{
return -EFAULT;
}
__endtry
__try
{
if (IsEventSignalled (tfd_shared->disarm_evt ()))
*curr_value = time_spec ();
else
{
LONG64 next_relative_exp = get_exp_ts () - get_clock_now (); LONG64 next_relative_exp = get_exp_ts () - get_clock_now ();
curr_value->it_value.tv_sec = next_relative_exp / NS100PERSEC; curr_value->it_value.tv_sec = next_relative_exp / NS100PERSEC;
next_relative_exp -= curr_value->it_value.tv_sec * NS100PERSEC; next_relative_exp -= curr_value->it_value.tv_sec * NS100PERSEC;
curr_value->it_value.tv_nsec = next_relative_exp curr_value->it_value.tv_nsec = next_relative_exp
* (NSPERSEC / NS100PERSEC); * (NSPERSEC / NS100PERSEC);
curr_value->it_interval = time_spec ().it_interval; curr_value->it_interval = time_spec ().it_interval;
leave_critical_section (); }
ret = 0; ret = 0;
} }
__except (NO_ERROR) __except (NO_ERROR)
@ -516,6 +529,7 @@ timerfd_tracker::gettime (struct itimerspec *curr_value)
ret = -EFAULT; ret = -EFAULT;
} }
__endtry __endtry
leave_critical_section ();
return ret; return ret;
} }
@ -559,6 +573,7 @@ timerfd_shared::arm_timer (int flags, const struct itimerspec *new_value)
ts += get_clock_now (); ts += get_clock_now ();
} }
set_exp_ts (ts); set_exp_ts (ts);
time_spec () = *new_value;
/* TODO: CLOCK_REALTIME_ALARM / CLOCK_BOOTTIME_ALARM /* TODO: CLOCK_REALTIME_ALARM / CLOCK_BOOTTIME_ALARM
Note: Advanced Power Settings -> Sleep -> Allow Wake Timers Note: Advanced Power Settings -> Sleep -> Allow Wake Timers
since W10 1709 */ since W10 1709 */