sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

watcher: Log when watched FDs are added, removed or updated

Browse Source
This commit is contained in:
Tobias Brunner 2023-04-18 15:52:23 +02:00
parent 0a806d9717
commit 34e9cdbcac
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libstrongswan/processing/watcher.c
View File

@ -220,6 +220,8 @@ static void notify_end(notify_data_t *data)
{ {
private_watcher_t *this = data->this; private_watcher_t *this = data->this;
entry_t *entry, *prev = NULL; entry_t *entry, *prev = NULL;
watcher_event_t updated = 0;
bool removed = FALSE;
/* reactivate the disabled entry */ /* reactivate the disabled entry */
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
@ -230,9 +232,11 @@ static void notify_end(notify_data_t *data)
if (!data->keep) if (!data->keep)
{ {
entry->events &= ~data->event; entry->events &= ~data->event;
updated = entry->events;
if (!entry->events) if (!entry->events)
{ {
remove_entry(this, entry, prev); remove_entry(this, entry, prev);
removed = TRUE;
break; break;
} }
} }
@ -243,6 +247,23 @@ static void notify_end(notify_data_t *data)
this->condvar->broadcast(this->condvar); this->condvar->broadcast(this->condvar);
update_and_unlock(this); update_and_unlock(this);
if (removed)
{
DBG3(DBG_JOB, "removed fd %d[%s%s%s] from watcher after callback", data->fd,
data->event & WATCHER_READ ? "r" : "",
data->event & WATCHER_WRITE ? "w" : "",
data->event & WATCHER_EXCEPT ? "e" : "");
}
else if (updated)
{
DBG3(DBG_JOB, "updated fd %d[%s%s%s] to %d[%s%s%s] after callback", data->fd,
(updated | data->event) & WATCHER_READ ? "r" : "",
(updated | data->event) & WATCHER_WRITE ? "w" : "",
(updated | data->event) & WATCHER_EXCEPT ? "e" : "", data->fd,
updated & WATCHER_READ ? "r" : "",
updated & WATCHER_WRITE ? "w" : "",
updated & WATCHER_EXCEPT ? "e" : "");
}
free(data); free(data);
} }
@ -498,6 +519,11 @@ METHOD(watcher_t, add, void,
.data = data, .data = data,
); );
DBG3(DBG_JOB, "adding fd %d[%s%s%s] to watcher", fd,
events & WATCHER_READ ? "r" : "",
events & WATCHER_WRITE ? "w" : "",
events & WATCHER_EXCEPT ? "e" : "");
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
add_entry(this, entry); add_entry(this, entry);
if (this->state == WATCHER_STOPPED) if (this->state == WATCHER_STOPPED)
@ -519,7 +545,7 @@ METHOD(watcher_t, remove_, void,
private_watcher_t *this, int fd) private_watcher_t *this, int fd)
{ {
entry_t *entry, *prev = NULL; entry_t *entry, *prev = NULL;
bool found = FALSE; watcher_event_t found = 0;
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
while (TRUE) while (TRUE)
@ -536,8 +562,8 @@ METHOD(watcher_t, remove_, void,
is_in_callback = TRUE; is_in_callback = TRUE;
break; break;
} }
found |= entry->events;
entry = remove_entry(this, entry, prev); entry = remove_entry(this, entry, prev);
found = TRUE;
continue; continue;
} }
prev = entry; prev = entry;
@ -552,6 +578,11 @@ METHOD(watcher_t, remove_, void,
if (found) if (found)
{ {
update_and_unlock(this); update_and_unlock(this);
DBG3(DBG_JOB, "removed fd %d[%s%s%s] from watcher", fd,
found & WATCHER_READ ? "r" : "",
found & WATCHER_WRITE ? "w" : "",
found & WATCHER_EXCEPT ? "e" : "");
} }
else else
{ {