aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-02-07 12:38:14 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2017-02-07 12:38:14 +0000
commite453052cd29a379d5783130344de9438cfe0ed79 (patch)
tree3fde62538fd13cbbf131c0419adb3d16852a6ba6 /src
parentf412399cf3ff0c49a643f776050d65a70b5407fd (diff)
downloadrspamd-e453052cd29a379d5783130344de9438cfe0ed79.tar.gz
rspamd-e453052cd29a379d5783130344de9438cfe0ed79.zip
[Minor] Count watchers as independent events
It might be important for better dependencies tracking.
Diffstat (limited to 'src')
-rw-r--r--src/libserver/events.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/libserver/events.c b/src/libserver/events.c
index 2c8f9999c..774e44f2b 100644
--- a/src/libserver/events.c
+++ b/src/libserver/events.c
@@ -306,11 +306,19 @@ rspamd_session_watch_stop (struct rspamd_async_session *s)
guint
-rspamd_session_events_pending (struct rspamd_async_session *session)
+rspamd_session_events_pending (struct rspamd_async_session *s)
{
- g_assert (session != NULL);
+ guint npending;
- return g_hash_table_size (session->events);
+ g_assert (s != NULL);
+
+ npending = g_hash_table_size (s->events);
+
+ if (RSPAMD_SESSION_IS_WATCHING (s)) {
+ npending += s->cur_watcher->remain;
+ }
+
+ return npending;
}
void