espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-03 10:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/eloop_lock' into 'master'

Browse Source 
Made changes related to registering eloop timeout for eloop lock

Closes WIFIBUG-1306

See merge request espressif/esp-idf!40384
This commit is contained in:
Kapil Gupta
2025-09-23 18:10:52 +05:30
parent 2f4c63b11c 20541fb8ee
commit 9b2f439ce2
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/wpa_supplicant/port/eloop.c
View File

@@ -137,27 +137,23 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
#endif
/* Maintain timeouts in order of increasing time */
ELOOP_LOCK();
dl_list_for_each(tmp, &eloop.timeout, struct eloop_timeout, list) {
if (os_reltime_before(&timeout->time, &tmp->time)) {
ELOOP_LOCK();
dl_list_add(tmp->list.prev, &timeout->list);
ELOOP_UNLOCK();
goto run;
}
#ifdef ELOOP_DEBUG
count++;
#endif
}
ELOOP_LOCK();
dl_list_add_tail(&eloop.timeout, &timeout->list);
ELOOP_UNLOCK();
run:
#ifdef ELOOP_DEBUG
wpa_printf(MSG_DEBUG, "ELOOP: Added one timer from %s:%d to call %p, current order=%d",
timeout->func_name, line, timeout->handler, count);
#endif
ELOOP_LOCK();
os_timer_disarm(&eloop.eloop_timer);
os_timer_arm(&eloop.eloop_timer, 0, 0);
ELOOP_UNLOCK();
@@ -227,27 +223,23 @@ int eloop_register_timeout_blocking(eloop_blocking_timeout_handler handler,
}
timeout->sync_semph = eloop.eloop_semph;
/* Maintain timeouts in order of increasing time */
ELOOP_LOCK();
dl_list_for_each(tmp, &eloop.timeout, struct eloop_timeout, list) {
if (os_reltime_before(&timeout->time, &tmp->time)) {
ELOOP_LOCK();
dl_list_add(tmp->list.prev, &timeout->list);
ELOOP_UNLOCK();
goto run;
}
#ifdef ELOOP_DEBUG
count++;
#endif
}
ELOOP_LOCK();
dl_list_add_tail(&eloop.timeout, &timeout->list);
ELOOP_UNLOCK();
run:
#ifdef ELOOP_DEBUG
wpa_printf(MSG_DEBUG, "ELOOP: Added one blocking timer from %s:%d to call %p, current order=%d",
timeout->func_name, line, timeout->handler, count);
#endif
ELOOP_LOCK();
os_timer_disarm(&eloop.eloop_timer);
os_timer_arm(&eloop.eloop_timer, 0, 0);
ELOOP_UNLOCK();
@@ -447,8 +439,10 @@ void eloop_run(void)
while (!dl_list_empty(&eloop.timeout)) {
struct eloop_timeout *timeout;
ELOOP_LOCK();
timeout = dl_list_first(&eloop.timeout, struct eloop_timeout,
list);
ELOOP_UNLOCK();
if (timeout) {
os_get_reltime(&now);
if (os_reltime_before(&now, &timeout->time)) {