Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libevent: Fix computation of the timeout value. #102

Merged
merged 1 commit into from
Jan 8, 2024
Merged

libevent: Fix computation of the timeout value. #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions extensions/libevent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,30 +192,27 @@ scm_primitive_resize (SCM lst, SCM eventsv)
}
#undef FUNC_NAME

static uint64_t time_units_per_microsec;
static uint64_t time_units_per_microsec, microsec_per_time_units;

static void*
run_event_loop (void *p)
#define FUNC_NAME "primitive-event-loop"
{
int ret = 0;
int microsec = 0;
struct timeval tv;

int ret;
struct loop_data *data = p;

if (data->timeout < 0)
microsec = -1;
else if (data->timeout >= 0)
if (data->timeout >= 0)
{
microsec = (time_units_per_microsec == 0)
? 0 : data->timeout / time_units_per_microsec;
tv.tv_sec = 0;
tv.tv_usec = microsec;
}
struct timeval tv;

tv.tv_sec = data->timeout / scm_c_time_units_per_second;
tv.tv_usec =
time_units_per_microsec > 0
? ((data->timeout % scm_c_time_units_per_second)
/ time_units_per_microsec)
: ((data->timeout % scm_c_time_units_per_second)
* microsec_per_time_units);

if (microsec >= 0)
{
ret = event_base_loopexit (data->base, &tv);
if (ret == -1)
SCM_MISC_ERROR ("event loop exit failed", SCM_EOL);
Expand Down Expand Up @@ -307,6 +304,7 @@ void
init_fibers_libevt (void)
{
time_units_per_microsec = scm_c_time_units_per_second / 1000000;
microsec_per_time_units = 1000000 / scm_c_time_units_per_second;

scm_c_define_gsubr ("primitive-event-wake", 1, 0, 0,
scm_primitive_event_wake);
Expand Down
Loading