ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/iom.h
(Generate patch)

Comparing gvpe/src/iom.h (file contents):
Revision 1.10 by pcg, Wed Apr 2 21:02:25 2003 UTC vs.
Revision 1.12 by pcg, Sat Apr 5 02:32:40 2003 UTC

… …
18 18
19#ifndef VPE_IOM_H__ 19#ifndef VPE_IOM_H__
20#define VPE_IOM_H__ 20#define VPE_IOM_H__
21 21
22#include <vector> 22#include <vector>
23
24#include <cassert>
23 25
24#include <sys/poll.h> 26#include <sys/poll.h>
25 27
26#include "callback.h" 28#include "callback.h"
27#include "slog.h" 29#include "slog.h"
… …
53 55
54 io_manager (); 56 io_manager ();
55 ~io_manager (); 57 ~io_manager ();
56}; 58};
57 59
58extern io_manager iom; 60extern io_manager iom; // a singleton, together with it's construction/destruction problems.
59 61
60struct io_watcher : callback2<void, io_watcher &, short> { 62struct io_watcher : callback2<void, io_watcher &, short> {
63 bool registered; // already registered?
61 int fd; 64 int fd;
62 short events; 65 short events;
63 66
64 template<class O1, class O2> 67 template<class O1, class O2>
65 io_watcher (O1 *object, void (O2::*method)(io_watcher &, short)) 68 io_watcher (O1 *object, void (O2::*method)(io_watcher &, short))
66 : callback2<void, io_watcher &, short>(object,method) 69 : callback2<void, io_watcher &, short>(object,method)
70 , registered(false)
67 { } 71 { }
68 72
69 ~io_watcher () 73 ~io_watcher ();
74
75 void set(int fd_, short events_);
76
77 void set(short events_)
70 { 78 {
71 iom.unreg (this); 79 set (fd, events_);
72 } 80 }
73 81
74 void start (int fd_, short events_) 82 void start (int fd_, short events_)
75 { 83 {
76 fd = fd_; 84 set (fd_, events_);
77 events = events_;
78 iom.reg (this); 85 iom.reg (this);
79 } 86 }
80 87
81 void stop () 88 void stop ()
82 { 89 {
… …
94 time_watcher (O1 *object, void (O2::*method)(time_watcher &)) 101 time_watcher (O1 *object, void (O2::*method)(time_watcher &))
95 : callback1<void, time_watcher &>(object,method) 102 : callback1<void, time_watcher &>(object,method)
96 , registered(false) 103 , registered(false)
97 { } 104 { }
98 105
99 ~time_watcher () 106 ~time_watcher ();
100 {
101 iom.unreg (this);
102 }
103 107
104 void set (tstamp when); 108 void set (tstamp when);
105 void trigger (); 109 void trigger ();
106 110
107 void operator ()() 111 void operator ()()
108 { 112 {
109 trigger (); 113 trigger ();
110 } 114 }
111 115
112 void start (); 116 void start ()
117 {
118 iom.reg (this);
119 }
120
113 void start (tstamp when) 121 void start (tstamp when)
114 { 122 {
115 set (when); 123 set (when);
124 iom.reg (this);
116 } 125 }
117 126
118 void stop () 127 void stop ()
119 { 128 {
120 iom.unreg (this); 129 iom.unreg (this);

Diff Legend

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