[ViewVC] Diff of: cvs/gvpe/src/iom.h

Comparing gvpe/src/iom.h (file contents):
Revision 1.11 by pcg, Fri Apr 4 05:26:45 2003 UTC vs.
Revision 1.12 by pcg, Sat Apr 5 02:32:40 2003 UTC

 };
 extern io_manager iom; // a singleton, together with it's construction/destruction problems.
 struct io_watcher : callback2<void, io_watcher &, short> {
-  pollfd *p;
+  bool registered; // already registered?
+  int fd;
+  short events;
   template<class O1, class O2>
   io_watcher (O1 *object, void (O2::*method)(io_watcher &, short))
     : callback2<void, io_watcher &, short>(object,method)
+    , registered(false)
     { }
   ~io_watcher ();
-  void set(int fd, short events)
+  void set(int fd_, short events_);
+  void set(short events_)
     {
-      assert (p);
+      set (fd, events_);
-      p->fd     = fd;
-      p->events = events;
     }
-  void set(short events)
+  void start (int fd_, short events_)
     {
-      assert (p);
+      set (fd_, events_);
-      p->events = events;
+      iom.reg (this);
-    }
-  void start (int fd, short events)
-    {
-      iom.reg (this); // make sure pfd is set
-      p->fd     = fd;
-      p->events = events;
     }
   void stop ()
     {
       iom.unreg (this);
   void operator ()()
     {
       trigger ();
     }
-  void start ();
+  void start ()
+    {
+      iom.reg (this);
+    }
   void start (tstamp when)
     {
       set (when);
+      iom.reg (this);
     }
   void stop ()
     {
       iom.unreg (this);
     }
   void reset (tstamp when = TSTAMP_CANCEL)
     {
       stop ();
       at = when;
     }
 };
 #endif

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