[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.525 by root, Wed Jan 22 14:09:07 2020 UTC vs.
Revision 1.537 by sf-exg, Sun May 14 19:02:31 2023 UTC

 /*
  * libev event processing core, watcher management
  *
- * Copyright (c) 2007-2019 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007-2020 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
  *
  * by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL. If you do not delete the
  * provisions above, a recipient may use your version of this file under
  * either the BSD or the GPL.
  */
+#pragma clang diagnostic ignored "-Wunused-value"
+#pragma clang diagnostic ignored "-Wcomment"
+#pragma clang diagnostic ignored "-Wextern-initializer"
 /* this big block deduces configuration from config.h */
 #ifndef EV_STANDALONE
 # ifdef EV_CONFIG_H
 #  include EV_CONFIG_H
 # endif
 #endif
 #if EV_USE_IOURING
 # include <sys/syscall.h>
-# if !SYS_io_uring_setup && __linux && !__alpha
+# if !SYS_io_uring_register && __linux && !__alpha
-#  define SYS_io_uring_setup     425
+#  define SYS_io_uring_setup    425
-#  define SYS_io_uring_enter     426
+#  define SYS_io_uring_enter    426
-#  define SYS_io_uring_wregister 427
+#  define SYS_io_uring_register 427
 # endif
 # if SYS_io_uring_setup && EV_USE_EPOLL /* iouring backend requires epoll backend */
 #  define EV_NEED_SYSCALL 1
 # else
 #  undef EV_USE_IOURING
 /* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
 /* ECB.H BEGIN */
 /*
  * libecb - http://software.schmorp.de/pkg/libecb
  *
- * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
+ * Copyright (©) 2009-2015,2018-2020 Marc Alexander Lehmann <libecb@schmorp.de>
  * Copyright (©) 2011 Emanuele Giaquinta
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
 /* 16 bits major, 16 bits minor */
 #define ECB_VERSION 0x00010008
 #include <string.h> /* for memcpy */
-#ifdef _WIN32
+#if defined (_WIN32) && !defined (__MINGW32__)
   typedef   signed char   int8_t;
   typedef unsigned char  uint8_t;
   typedef   signed char   int_fast8_t;
   typedef unsigned char  uint_fast8_t;
   typedef   signed short  int16_t;
 inline_size void
 fd_reify (EV_P)
 {
   int i;
-  /* most backends do not modify the fdchanges list in backend_modfiy.
+  /* most backends do not modify the fdchanges list in backend_modify.
    * except io_uring, which has fixed-size buffers which might force us
    * to handle events in backend_modify, causing fdchanges to be amended,
    * which could result in an endless loop.
    * to avoid this, we do not dynamically handle fds that were added
    * during fd_reify. that means that for those backends, fdchangecnt
 inline_size
 void
 fd_change (EV_P_ int fd, int flags)
 {
   unsigned char reify = anfds [fd].reify;
-  anfds [fd].reify |= flags;
+  anfds [fd].reify = reify | flags;
   if (ecb_expect_true (!reify))
     {
       ++fdchangecnt;
       array_needsize (int, fdchanges, fdchangemax, fdchangecnt, array_needsize_noinit);
   /* TODO: linuxaio is very experimental */
 #if !EV_RECOMMEND_LINUXAIO
   flags &= ~EVBACKEND_LINUXAIO;
 #endif
-  /* TODO: linuxaio is super experimental */
+  /* TODO: iouring is super experimental */
 #if !EV_RECOMMEND_IOURING
   flags &= ~EVBACKEND_IOURING;
 #endif
   return flags;
 #endif
   if (postfork != 2)
     {
       #if EV_USE_SIGNALFD
-        /* surprisingly, nothing needs to be done for signalfd, accoridng to docs, it does the right thing on fork */
+        /* surprisingly, nothing needs to be done for signalfd, according to docs, it does the right thing on fork */
       #endif
       #if EV_USE_TIMERFD
         if (ev_is_active (&timerfd_w))
           {
         if (ecb_expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
           {
             waittime = EV_TS_CONST (MAX_BLOCKTIME);
+#if EV_USE_MONOTONIC
+            if (ecb_expect_true (have_monotonic))
+              {
 #if EV_USE_TIMERFD
-            /* sleep a lot longer when we can reliably detect timejumps */
+                /* sleep a lot longer when we can reliably detect timejumps */
-            if (ecb_expect_true (timerfd >= 0))
+                if (ecb_expect_true (timerfd != -1))
-              waittime = EV_TS_CONST (MAX_BLOCKTIME2);
+                  waittime = EV_TS_CONST (MAX_BLOCKTIME2);
 #endif
 #if !EV_PERIODIC_ENABLE
-            /* without periodics but with monotonic clock there is no need */
+                /* without periodics but with monotonic clock there is no need */
-            /* for any time jump detection, so sleep longer */
+                /* for any time jump detection, so sleep longer */
-            if (ecb_expect_true (have_monotonic))
-              waittime = EV_TS_CONST (MAX_BLOCKTIME2);
+                waittime = EV_TS_CONST (MAX_BLOCKTIME2);
+#endif
+              }
 #endif
             if (timercnt)
               {
                 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev.c (file contents): Revision 1.525 by root, Wed Jan 22 14:09:07 2020 UTC vs. Revision 1.537 by sf-exg, Sun May 14 19:02:31 2023 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.525 by root, Wed Jan 22 14:09:07 2020 UTC vs.
Revision 1.537 by sf-exg, Sun May 14 19:02:31 2023 UTC