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.20 by pcg, Mon May 10 18:57:08 2004 UTC vs.
Revision 1.25 by pcg, Fri Nov 12 12:49:12 2004 UTC

1/* 1/*
2 iom.h -- generic I/O multiplexor 2 iom.h -- generic I/O multiplexer
3 Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
… …
64struct sig_watcher; 64struct sig_watcher;
65#endif 65#endif
66 66
67template<class watcher> 67template<class watcher>
68struct io_manager_vec : vector<watcher *> { 68struct io_manager_vec : vector<watcher *> {
69#if IOM_CHECK
70 bool activity;
71#endif
72
73 void erase_unordered (unsigned int pos) 69 void erase_unordered (unsigned int pos)
74 { 70 {
75 watcher *w = (*this)[this->size () - 1]; 71 watcher *w = (*this)[this->size () - 1];
76 this->pop_back (); 72 this->pop_back ();
77 73
78 if (this->size ()) 74 if (!this->empty ())
79 if ((*this)[pos] = w) 75 if (((*this)[pos] = w)) // '=' is correct!
80 w->active = pos + 1; 76 w->active = pos + 1;
81 } 77 }
82}; 78};
83 79
80// only used as a namespace, and for initialisation purposes
84class io_manager { 81class io_manager {
85#if IOM_IO
86 io_manager_vec<io_watcher> iow;
87#endif
88#if IOM_CHECK
89 io_manager_vec<check_watcher> cw;
90#endif
91#if IOM_TIME
92 io_manager_vec<time_watcher> tw;
93#endif
94#if IOM_IDLE
95 io_manager_vec<idle_watcher> iw;
96#endif
97#if IOM_SIG
98 typedef io_manager_vec<sig_watcher> sig_vec;
99 vector<sig_vec *> sw;
100 static void sighandler (int signum);
101#endif
102
103 template<class watcher> 82 template<class watcher>
104 void reg (watcher *w, io_manager_vec<watcher> &queue); 83 static void reg (watcher &w, io_manager_vec<watcher> &queue);
105 84
106 template<class watcher> 85 template<class watcher>
107 void unreg (watcher *w, io_manager_vec<watcher> &queue); 86 static void unreg (watcher &w, io_manager_vec<watcher> &queue);
108 87
109public: 88public:
110 // register a watcher 89 // register a watcher
111#if IOM_IO 90#if IOM_IO
112 void reg (io_watcher *w); void unreg (io_watcher *w); 91 static void reg (io_watcher &w); static void unreg (io_watcher &w);
113#endif 92#endif
114#if IOM_TIME 93#if IOM_TIME
115 void reg (time_watcher *w); void unreg (time_watcher *w); 94 static void reg (time_watcher &w); static void unreg (time_watcher &w);
116#endif 95#endif
117#if IOM_CHECK 96#if IOM_CHECK
118 void reg (check_watcher *w); void unreg (check_watcher *w); 97 static void reg (check_watcher &w); static void unreg (check_watcher &w);
119#endif 98#endif
120#if IOM_IDLE 99#if IOM_IDLE
121 void reg (idle_watcher *w); void unreg (idle_watcher *w); 100 static void reg (idle_watcher &w); static void unreg (idle_watcher &w);
122#endif 101#endif
123#if IOM_SIG 102#if IOM_SIG
124 void reg (sig_watcher *w); void unreg (sig_watcher *w); 103 static void reg (sig_watcher &w); static void unreg (sig_watcher &w);
125#endif 104#endif
126 105
127 void loop (); 106 static void loop ();
128
129 io_manager ();
130 ~io_manager ();
131}; 107};
132
133extern io_manager iom; // a singleton, together with it's construction/destruction problems.
134 108
135struct watcher { 109struct watcher {
136 int active; /* 0 == inactive, else index into respective vector */ 110 int active; /* 0 == inactive, else index into respective vector */
137 111
138 watcher () : active (0) { } 112 watcher () : active (0) { }
… …
146 short events; 120 short events;
147 121
148 void set (int fd_, short events_) { fd = fd_; events = events_; } 122 void set (int fd_, short events_) { fd = fd_; events = events_; }
149 123
150 void set (short events_) { set (fd, events_); } 124 void set (short events_) { set (fd, events_); }
151 void start () { iom.reg (this); } 125 void start () { io_manager::reg (*this); }
152 void start (int fd_, short events_) { set (fd_, events_); iom.reg (this); } 126 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); }
153 void stop () { iom.unreg (this); } 127 void stop () { io_manager::unreg (*this); }
154 128
155 template<class O1, class O2> 129 template<class O1, class O2>
156 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short)) 130 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
157 : callback2<void, io_watcher &, short> (object,method) 131 : callback2<void, io_watcher &, short> (object,method)
158 { } 132 { }
… …
166 140
167 void trigger (); 141 void trigger ();
168 142
169 void set (tstamp when) { at = when; } 143 void set (tstamp when) { at = when; }
170 void operator () () { trigger (); } 144 void operator () () { trigger (); }
171 void start () { iom.reg (this); } 145 void start () { io_manager::reg (*this); }
172 void start (tstamp when) { set (when); iom.reg (this); } 146 void start (tstamp when) { set (when); io_manager::reg (*this); }
173 void stop () { iom.unreg (this); } 147 void stop () { io_manager::unreg (*this); }
174 148
175 template<class O1, class O2> 149 template<class O1, class O2>
176 time_watcher (O1 *object, void (O2::*method) (time_watcher &)) 150 time_watcher (O1 *object, void (O2::*method) (time_watcher &))
177 : callback1<void, time_watcher &> (object,method), at (0) 151 : callback1<void, time_watcher &> (object,method), at (0)
178 { } 152 { }
… …
181#endif 155#endif
182 156
183#if IOM_CHECK 157#if IOM_CHECK
184// run before checking for new events 158// run before checking for new events
185struct check_watcher : watcher, callback1<void, check_watcher &> { 159struct check_watcher : watcher, callback1<void, check_watcher &> {
186 void start () { iom.reg (this); } 160 void start () { io_manager::reg (*this); }
187 void stop () { iom.unreg (this); } 161 void stop () { io_manager::unreg (*this); }
188 162
189 template<class O1, class O2> 163 template<class O1, class O2>
190 check_watcher (O1 *object, void (O2::*method) (check_watcher &)) 164 check_watcher (O1 *object, void (O2::*method) (check_watcher &))
191 : callback1<void, check_watcher &> (object,method) 165 : callback1<void, check_watcher &> (object,method)
192 { } 166 { }
… …
195#endif 169#endif
196 170
197#if IOM_IDLE 171#if IOM_IDLE
198// run after checking for any i/o, but before waiting 172// run after checking for any i/o, but before waiting
199struct idle_watcher : watcher, callback1<void, idle_watcher &> { 173struct idle_watcher : watcher, callback1<void, idle_watcher &> {
200 void start () { iom.reg (this); } 174 void start () { io_manager::reg (*this); }
201 void stop () { iom.unreg (this); } 175 void stop () { io_manager::unreg (*this); }
202 176
203 template<class O1, class O2> 177 template<class O1, class O2>
204 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &)) 178 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &))
205 : callback1<void, idle_watcher &> (object,method) 179 : callback1<void, idle_watcher &> (object,method)
206 { } 180 { }
… …
211#if IOM_SIG 185#if IOM_SIG
212struct sig_watcher : watcher, callback1<void, sig_watcher &> { 186struct sig_watcher : watcher, callback1<void, sig_watcher &> {
213 int signum; 187 int signum;
214 188
215 void start (int signum); 189 void start (int signum);
216 void stop () { iom.unreg (this); } 190 void stop () { io_manager::unreg (*this); }
217 191
218 template<class O1, class O2> 192 template<class O1, class O2>
219 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &)) 193 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &))
220 : callback1<void, sig_watcher &> (object,method), signum (-1) 194 : callback1<void, sig_watcher &> (object,method), signum (-1)
221 { } 195 { }

Diff Legend

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