[ViewVC] Diff of: cvs/libev/ev++.h

Comparing libev/ev++.h (file contents):
Revision 1.49 by root, Tue Mar 16 00:43:22 2010 UTC vs.
Revision 1.62 by root, Mon Jun 29 14:13:52 2015 UTC

  * Copyright (c) 2007,2008,2010 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:
  *
  *   1.  Redistributions of source code must retain the above copyright notice,
  *       this list of conditions and the following disclaimer.
  *
  *   2.  Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
  * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
  * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
  * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 namespace ev {
   typedef ev_tstamp tstamp;
-  enum
+  enum {
-  {
     UNDEF    = EV_UNDEF,
     NONE     = EV_NONE,
     READ     = EV_READ,
     WRITE    = EV_WRITE,
+#if EV_COMPAT3
     TIMEOUT  = EV_TIMEOUT,
+#endif
+    TIMER    = EV_TIMER,
     PERIODIC = EV_PERIODIC,
     SIGNAL   = EV_SIGNAL,
     CHILD    = EV_CHILD,
     STAT     = EV_STAT,
     IDLE     = EV_IDLE,
     PREPARE  = EV_PREPARE,
     FORK     = EV_FORK,
     ASYNC    = EV_ASYNC,
     EMBED    = EV_EMBED,
 #   undef ERROR // some systems stupidly #define ERROR
-    ERROR    = EV_ERROR,
+    ERROR    = EV_ERROR
   };
   enum
   {
     AUTO      = EVFLAG_AUTO,
     PORT      = EVBACKEND_PORT
   };
   enum
   {
+#if EV_COMPAT3
     NONBLOCK = EVLOOP_NONBLOCK,
-    ONESHOT  = EVLOOP_ONESHOT
+    ONESHOT  = EVLOOP_ONESHOT,
+#endif
+    NOWAIT   = EVRUN_NOWAIT,
+    ONCE     = EVRUN_ONCE
   };
   enum how_t
   {
-    ONE = EVUNLOOP_ONE,
+    ONE = EVBREAK_ONE,
-    ALL = EVUNLOOP_ALL
+    ALL = EVBREAK_ALL
   };
   struct bad_loop
 #if EV_USE_STDEXCEPT
   : std::runtime_error
     {
       return EV_AX == ev_default_loop (0);
     }
 #endif
+#if EV_COMPAT3
     void loop (int flags = 0)
     {
-      ev_loop (EV_AX_ flags);
+      ev_run (EV_AX_ flags);
     }
     void unloop (how_t how = ONE) throw ()
     {
-      ev_unloop (EV_AX_ how);
+      ev_break (EV_AX_ how);
+    }
+#endif
+    void run (int flags = 0)
+    {
+      ev_run (EV_AX_ flags);
+    }
+    void break_loop (how_t how = ONE) throw ()
+    {
+      ev_break (EV_AX_ how);
     }
     void post_fork () throw ()
     {
-#if EV_MULTIPLICITY
       ev_loop_fork (EV_AX);
-#else
-      ev_default_fork ();
-#endif
     }
     unsigned int backend () const throw ()
     {
       return ev_backend (EV_AX);
     {
       ev_unref (EV_AX);
     }
 #if EV_FEATURE_API
-    unsigned int count () const throw ()
+    unsigned int iteration () const throw ()
     {
-      return ev_loop_count (EV_AX);
+      return ev_iteration (EV_AX);
     }
     unsigned int depth () const throw ()
     {
-      return ev_loop_depth (EV_AX);
+      return ev_depth (EV_AX);
     }
     void set_io_collect_interval (tstamp interval) throw ()
     {
       ev_set_io_collect_interval (EV_AX_ interval);
     }
     template<class K, void (K::*method)(int)>
     static void method_thunk (int revents, void *arg)
     {
-      static_cast<K *>(arg)->*method
+      (static_cast<K *>(arg)->*method)
         (revents);
     }
     // no-argument method callback
     template<class K, void (K::*method)()>
     }
     template<class K, void (K::*method)()>
     static void method_noargs_thunk (int revents, void *arg)
     {
-      static_cast<K *>(arg)->*method
+      (static_cast<K *>(arg)->*method)
         ();
     }
     // simpler function callback
     template<void (*cb)(int)>
 #else
           !ev_default_loop (flags)
 #endif
       )
         throw bad_loop ();
-    }
-    ~default_loop () throw ()
-    {
-      ev_default_destroy ();
     }
   private:
     default_loop (const default_loop &);
     default_loop &operator = (const default_loop &);
   struct base : ev_watcher
   {
     #if EV_MULTIPLICITY
       EV_PX;
+      // loop set
       void set (EV_P) throw ()
       {
         this->EV_A = EV_A;
       }
     #endif
     }
     template<class K, void (K::*method)()>
     static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents)
     {
-      static_cast<K *>(w->data)->*method
+      (static_cast<K *>(w->data)->*method)
         ();
     }
     void operator ()(int events = EV_UNDEF)
     {
       return ev_is_pending (static_cast<const ev_watcher *>(this));
     }
     void feed_event (int revents) throw ()
     {
-      ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
+      ev_feed_event (EV_A_ static_cast<ev_watcher *>(this), revents);
     }
   };
-  inline tstamp now () throw ()
+  inline tstamp now (EV_P) throw ()
   {
-    return ev_time ();
+    return ev_now (EV_A);
   }
   inline void delay (tstamp interval) throw ()
   {
     ev_sleep (interval);
   inline unsigned int embeddable_backends () throw ()
   {
     return ev_embeddable_backends ();
   }
-  inline void set_allocator (void *(*cb)(void *ptr, long size)) throw ()
+  inline void set_allocator (void *(*cb)(void *ptr, long size) throw ()) throw ()
   {
     ev_set_allocator (cb);
   }
-  inline void set_syserr_cb (void (*cb)(const char *msg)) throw ()
+  inline void set_syserr_cb (void (*cb)(const char *msg) throw ()) throw ()
   {
     ev_set_syserr_cb (cb);
   }
   #if EV_MULTIPLICITY
       () throw ()                                                                       \
       {                                                                                 \
       }
   #endif
-  /* using a template here would require quite a bit more lines,
+  /* using a template here would require quite a few more lines,
    * so a macro solution was chosen */
   #define EV_BEGIN_WATCHER(cppstem,cstem)	                                        \
                                                                                         \
   struct cppstem : base<ev_ ## cstem, cppstem>                                          \
   {                                                                                     \
   EV_END_WATCHER (check, check)
   #endif
   #if EV_EMBED_ENABLE
   EV_BEGIN_WATCHER (embed, embed)
-    void set (struct ev_loop *embedded_loop) throw ()
+    void set_embed (struct ev_loop *embedded_loop) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
       if (active) start ();
   EV_END_WATCHER (fork, fork)
   #endif
   #if EV_ASYNC_ENABLE
   EV_BEGIN_WATCHER (async, async)
-    void set () throw () { }
     void send () throw ()
     {
       ev_async_send (EV_A_ static_cast<ev_async *>(this));
     }

Diff Legend

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

Comparing libev/ev++.h (file contents): Revision 1.49 by root, Tue Mar 16 00:43:22 2010 UTC vs. Revision 1.62 by root, Mon Jun 29 14:13:52 2015 UTC

Diff Legend

Comparing libev/ev++.h (file contents):
Revision 1.49 by root, Tue Mar 16 00:43:22 2010 UTC vs.
Revision 1.62 by root, Mon Jun 29 14:13:52 2015 UTC