eloop_win: Use struct dl_list for timeouts
This merges commit eaa3f04b97 changes from
eloop.c into eloop_win.c.
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen
parent
fc9d96a78a
commit
5960afcd18
1 changed files with 44 additions and 67 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Event loop based on Windows events and WaitForMultipleObjects
|
||||
* Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
|
||||
* Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
|
||||
*
|
||||
* This software may be distributed under the terms of the BSD license.
|
||||
* See README for more details.
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
#include <winsock2.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "list.h"
|
||||
#include "eloop.h"
|
||||
|
||||
|
||||
|
|
@ -29,11 +30,11 @@ struct eloop_event {
|
|||
};
|
||||
|
||||
struct eloop_timeout {
|
||||
struct dl_list list;
|
||||
struct os_time time;
|
||||
void *eloop_data;
|
||||
void *user_data;
|
||||
eloop_timeout_handler handler;
|
||||
struct eloop_timeout *next;
|
||||
};
|
||||
|
||||
struct eloop_signal {
|
||||
|
|
@ -51,7 +52,7 @@ struct eloop_data {
|
|||
size_t event_count;
|
||||
struct eloop_event *events;
|
||||
|
||||
struct eloop_timeout *timeout;
|
||||
struct dl_list timeout;
|
||||
|
||||
int signal_count;
|
||||
struct eloop_signal *signals;
|
||||
|
|
@ -74,6 +75,7 @@ static struct eloop_data eloop;
|
|||
int eloop_init(void)
|
||||
{
|
||||
os_memset(&eloop, 0, sizeof(eloop));
|
||||
dl_list_init(&eloop.timeout);
|
||||
eloop.num_handles = 1;
|
||||
eloop.handles = os_malloc(eloop.num_handles *
|
||||
sizeof(eloop.handles[0]));
|
||||
|
|
@ -236,7 +238,7 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
|
|||
eloop_timeout_handler handler,
|
||||
void *eloop_data, void *user_data)
|
||||
{
|
||||
struct eloop_timeout *timeout, *tmp, *prev;
|
||||
struct eloop_timeout *timeout, *tmp;
|
||||
os_time_t now_sec;
|
||||
|
||||
timeout = os_malloc(sizeof(*timeout));
|
||||
|
|
@ -263,29 +265,15 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
|
|||
timeout->eloop_data = eloop_data;
|
||||
timeout->user_data = user_data;
|
||||
timeout->handler = handler;
|
||||
timeout->next = NULL;
|
||||
|
||||
if (eloop.timeout == NULL) {
|
||||
eloop.timeout = timeout;
|
||||
return 0;
|
||||
}
|
||||
|
||||
prev = NULL;
|
||||
tmp = eloop.timeout;
|
||||
while (tmp != NULL) {
|
||||
if (os_time_before(&timeout->time, &tmp->time))
|
||||
break;
|
||||
prev = tmp;
|
||||
tmp = tmp->next;
|
||||
}
|
||||
|
||||
if (prev == NULL) {
|
||||
timeout->next = eloop.timeout;
|
||||
eloop.timeout = timeout;
|
||||
} else {
|
||||
timeout->next = prev->next;
|
||||
prev->next = timeout;
|
||||
/* Maintain timeouts in order of increasing time */
|
||||
dl_list_for_each(tmp, &eloop.timeout, struct eloop_timeout, list) {
|
||||
if (os_time_before(&timeout->time, &tmp->time)) {
|
||||
dl_list_add(tmp->list.prev, &timeout->list);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
dl_list_add_tail(&eloop.timeout, &timeout->list);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -294,29 +282,20 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
|
|||
int eloop_cancel_timeout(eloop_timeout_handler handler,
|
||||
void *eloop_data, void *user_data)
|
||||
{
|
||||
struct eloop_timeout *timeout, *prev, *next;
|
||||
struct eloop_timeout *timeout, *prev;
|
||||
int removed = 0;
|
||||
|
||||
prev = NULL;
|
||||
timeout = eloop.timeout;
|
||||
while (timeout != NULL) {
|
||||
next = timeout->next;
|
||||
|
||||
dl_list_for_each_safe(timeout, prev, &eloop.timeout,
|
||||
struct eloop_timeout, list) {
|
||||
if (timeout->handler == handler &&
|
||||
(timeout->eloop_data == eloop_data ||
|
||||
eloop_data == ELOOP_ALL_CTX) &&
|
||||
(timeout->user_data == user_data ||
|
||||
user_data == ELOOP_ALL_CTX)) {
|
||||
if (prev == NULL)
|
||||
eloop.timeout = next;
|
||||
else
|
||||
prev->next = next;
|
||||
dl_list_del(&timeout->list);
|
||||
os_free(timeout);
|
||||
removed++;
|
||||
} else
|
||||
prev = timeout;
|
||||
|
||||
timeout = next;
|
||||
}
|
||||
}
|
||||
|
||||
return removed;
|
||||
|
|
@ -328,14 +307,11 @@ int eloop_is_timeout_registered(eloop_timeout_handler handler,
|
|||
{
|
||||
struct eloop_timeout *tmp;
|
||||
|
||||
tmp = eloop.timeout;
|
||||
while (tmp != NULL) {
|
||||
dl_list_for_each(tmp, &eloop.timeout, struct eloop_timeout, list) {
|
||||
if (tmp->handler == handler &&
|
||||
tmp->eloop_data == eloop_data &&
|
||||
tmp->user_data == user_data)
|
||||
return 1;
|
||||
|
||||
tmp = tmp->next;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -457,17 +433,20 @@ int eloop_register_signal_reconfig(eloop_signal_handler handler,
|
|||
void eloop_run(void)
|
||||
{
|
||||
struct os_time tv, now;
|
||||
DWORD count, ret, timeout, err;
|
||||
DWORD count, ret, timeout_val, err;
|
||||
size_t i;
|
||||
|
||||
while (!eloop.terminate &&
|
||||
(eloop.timeout || eloop.reader_count > 0 ||
|
||||
(!dl_list_empty(&eloop.timeout) || eloop.reader_count > 0 ||
|
||||
eloop.event_count > 0)) {
|
||||
struct eloop_timeout *timeout;
|
||||
tv.sec = tv.usec = 0;
|
||||
if (eloop.timeout) {
|
||||
timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
|
||||
list);
|
||||
if (timeout) {
|
||||
os_get_time(&now);
|
||||
if (os_time_before(&now, &eloop.timeout->time))
|
||||
os_time_sub(&eloop.timeout->time, &now, &tv);
|
||||
if (os_time_before(&now, &timeout->time))
|
||||
os_time_sub(&timeout->time, &now, &tv);
|
||||
}
|
||||
|
||||
count = 0;
|
||||
|
|
@ -480,10 +459,10 @@ void eloop_run(void)
|
|||
if (eloop.term_event)
|
||||
eloop.handles[count++] = eloop.term_event;
|
||||
|
||||
if (eloop.timeout)
|
||||
timeout = tv.sec * 1000 + tv.usec / 1000;
|
||||
if (timeout)
|
||||
timeout_val = tv.sec * 1000 + tv.usec / 1000;
|
||||
else
|
||||
timeout = INFINITE;
|
||||
timeout_val = INFINITE;
|
||||
|
||||
if (count > MAXIMUM_WAIT_OBJECTS) {
|
||||
printf("WaitForMultipleObjects: Too many events: "
|
||||
|
|
@ -493,26 +472,25 @@ void eloop_run(void)
|
|||
}
|
||||
#ifdef _WIN32_WCE
|
||||
ret = WaitForMultipleObjects(count, eloop.handles, FALSE,
|
||||
timeout);
|
||||
timeout_val);
|
||||
#else /* _WIN32_WCE */
|
||||
ret = WaitForMultipleObjectsEx(count, eloop.handles, FALSE,
|
||||
timeout, TRUE);
|
||||
timeout_val, TRUE);
|
||||
#endif /* _WIN32_WCE */
|
||||
err = GetLastError();
|
||||
|
||||
eloop_process_pending_signals();
|
||||
|
||||
/* check if some registered timeouts have occurred */
|
||||
if (eloop.timeout) {
|
||||
struct eloop_timeout *tmp;
|
||||
|
||||
timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
|
||||
list);
|
||||
if (timeout) {
|
||||
os_get_time(&now);
|
||||
if (!os_time_before(&now, &eloop.timeout->time)) {
|
||||
tmp = eloop.timeout;
|
||||
eloop.timeout = eloop.timeout->next;
|
||||
tmp->handler(tmp->eloop_data,
|
||||
tmp->user_data);
|
||||
os_free(tmp);
|
||||
if (!os_time_before(&now, &timeout->time)) {
|
||||
dl_list_del(&timeout->list);
|
||||
timeout->handler(timeout->eloop_data,
|
||||
timeout->user_data);
|
||||
os_free(timeout);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -571,11 +549,10 @@ void eloop_destroy(void)
|
|||
{
|
||||
struct eloop_timeout *timeout, *prev;
|
||||
|
||||
timeout = eloop.timeout;
|
||||
while (timeout != NULL) {
|
||||
prev = timeout;
|
||||
timeout = timeout->next;
|
||||
os_free(prev);
|
||||
dl_list_for_each_safe(timeout, prev, &eloop.timeout,
|
||||
struct eloop_timeout, list) {
|
||||
dl_list_del(&timeout->list);
|
||||
os_free(timeout);
|
||||
}
|
||||
os_free(eloop.readers);
|
||||
os_free(eloop.signals);
|
||||
|
|
|
|||
Loading…
Reference in a new issue