diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-03-24 16:36:43 +0000 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-03-24 16:36:43 +0000 |
commit | 4610fcee939fb6646703285d2da3b47a111d58eb (patch) | |
tree | 6b01864ccea44b37e6efc2553691b9e9dc6a1fa8 /contrib/libev/ev_port.c | |
parent | 47ecc8cf045b157ed8b7f9cc74ba08516ccc6164 (diff) | |
download | rspamd-4610fcee939fb6646703285d2da3b47a111d58eb.tar.gz rspamd-4610fcee939fb6646703285d2da3b47a111d58eb.zip |
[Feature] Update libev to 4.33
Changelog: http://cvs.schmorp.de/libev/Changes?pathrev=rel-4_33
Diffstat (limited to 'contrib/libev/ev_port.c')
-rw-r--r-- | contrib/libev/ev_port.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/contrib/libev/ev_port.c b/contrib/libev/ev_port.c index c7b0b70c1..f4cd9d99c 100644 --- a/contrib/libev/ev_port.c +++ b/contrib/libev/ev_port.c @@ -1,7 +1,7 @@ /* * libev solaris event port backend * - * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de> + * Copyright (c) 2007,2008,2009,2010,2011,2019 Marc Alexander Lehmann <libev@schmorp.de> * All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- @@ -69,7 +69,10 @@ port_associate_and_check (EV_P_ int fd, int ev) ) { if (errno == EBADFD) - fd_kill (EV_A_ fd); + { + assert (("libev: port_associate found invalid fd", errno != EBADFD)); + fd_kill (EV_A_ fd); + } else ev_syserr ("(libev) port_associate"); } @@ -129,7 +132,7 @@ port_poll (EV_P_ ev_tstamp timeout) } } - if (expect_false (nget == port_eventmax)) + if (ecb_expect_false (nget == port_eventmax)) { ev_free (port_events); port_eventmax = array_nextsize (sizeof (port_event_t), port_eventmax, port_eventmax + 1); @@ -151,11 +154,11 @@ port_init (EV_P_ int flags) /* if my reading of the opensolaris kernel sources are correct, then * opensolaris does something very stupid: it checks if the time has already - * elapsed and doesn't round up if that is the case,m otherwise it DOES round + * elapsed and doesn't round up if that is the case, otherwise it DOES round * up. Since we can't know what the case is, we need to guess by using a * "large enough" timeout. Normally, 1e-9 would be correct. */ - backend_mintime = 1e-3; /* needed to compensate for port_getn returning early */ + backend_mintime = EV_TS_CONST (1e-3); /* needed to compensate for port_getn returning early */ backend_modify = port_modify; backend_poll = port_poll; |