isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add sudo_ev_pending(), used to check whether an event is pending.

Browse Source
This commit is contained in:
Todd C. Miller
2019-12-07 08:42:08 -07:00
parent 9314072848
commit 22ffffe12b
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sudo_event.h
View File

@@ -148,7 +148,11 @@ __dso_public int sudo_ev_dispatch_v1(struct sudo_event_base *head);
__dso_public int sudo_ev_loop_v1(struct sudo_event_base *head, int flags); __dso_public int sudo_ev_loop_v1(struct sudo_event_base *head, int flags);
#define sudo_ev_loop(_a, _b) sudo_ev_loop_v1((_a), (_b)) #define sudo_ev_loop(_a, _b) sudo_ev_loop_v1((_a), (_b))
/* Return the remaining timeout associated with an event. */ /* Return pending event types, fills in ts if non-NULL and there is a timeout */
__dso_public int sudo_ev_pending_v1(struct sudo_event *ev, short events, struct timespec *ts);
#define sudo_ev_pending(_a, _b, _c) sudo_ev_pending_v1((_a), (_b), (_c))
/* Return the remaining timeout associated with an event (deprecated). */
__dso_public int sudo_ev_get_timeleft_v1(struct sudo_event *ev, struct timeval *tv); __dso_public int sudo_ev_get_timeleft_v1(struct sudo_event *ev, struct timeval *tv);
__dso_public int sudo_ev_get_timeleft_v2(struct sudo_event *ev, struct timespec *tv); __dso_public int sudo_ev_get_timeleft_v2(struct sudo_event *ev, struct timespec *tv);
#define sudo_ev_get_timeleft(_a, _b) sudo_ev_get_timeleft_v2((_a), (_b)) #define sudo_ev_get_timeleft(_a, _b) sudo_ev_get_timeleft_v2((_a), (_b))

33
lib/util/event.c
View File

@@ -830,17 +830,36 @@ sudo_ev_get_timeleft_v1(struct sudo_event *ev, struct timeval *tv)
int int
sudo_ev_get_timeleft_v2(struct sudo_event *ev, struct timespec *ts) sudo_ev_get_timeleft_v2(struct sudo_event *ev, struct timespec *ts)
{ {
struct timespec now;
debug_decl(sudo_ev_get_timeleft, SUDO_DEBUG_EVENT) debug_decl(sudo_ev_get_timeleft, SUDO_DEBUG_EVENT)
if (!ISSET(ev->flags, SUDO_EVQ_TIMEOUTS)) { if (sudo_ev_pending_v1(ev, SUDO_EV_TIMEOUT, ts) != SUDO_EV_TIMEOUT) {
sudo_timespecclear(ts); sudo_timespecclear(ts);
debug_return_int(-1); debug_return_int(-1);
} }
sudo_gettime_mono(&now);
sudo_timespecsub(&ev->timeout, &now, ts);
if (ts->tv_sec < 0)
sudo_timespecclear(ts);
debug_return_int(0); debug_return_int(0);
} }
int
sudo_ev_pending_v1(struct sudo_event *ev, short events, struct timespec *ts)
{
int ret = 0;
debug_decl(sudo_ev_pending, SUDO_DEBUG_EVENT)
if (!ISSET(ev->flags, SUDO_EVQ_INSERTED))
debug_return_int(0);
ret = ev->events & events;
if (ISSET(ev->flags, SUDO_EVQ_TIMEOUTS) && ISSET(events, SUDO_EV_TIMEOUT)) {
ret |= SUDO_EV_TIMEOUT;
if (ts != NULL) {
struct timespec now;
sudo_gettime_mono(&now);
sudo_timespecsub(&ev->timeout, &now, ts);
if (ts->tv_sec < 0)
sudo_timespecclear(ts);
}
}
debug_return_int(ret);
}

1
lib/util/util.exp.in
View File

@@ -65,6 +65,7 @@ sudo_ev_loop_v1
sudo_ev_loopbreak_v1 sudo_ev_loopbreak_v1
sudo_ev_loopcontinue_v1 sudo_ev_loopcontinue_v1
sudo_ev_loopexit_v1 sudo_ev_loopexit_v1
sudo_ev_pending_v1
sudo_ev_set_v1 sudo_ev_set_v1
sudo_fatal_callback_deregister_v1 sudo_fatal_callback_deregister_v1
sudo_fatal_callback_register_v1 sudo_fatal_callback_register_v1