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.18 by pcg, Sun Mar 21 12:50:05 2004 UTC vs.
Revision 1.27 by pcg, Thu Mar 3 16:54:34 2005 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 <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#ifndef IOM_H__ 22#ifndef IOM_H__
21#define IOM_H__ 23#define IOM_H__
… …
38# define IOM_CHECK 0 40# define IOM_CHECK 0
39#endif 41#endif
40#ifndef IOM_IDLE 42#ifndef IOM_IDLE
41# define IOM_IDLE 0 43# define IOM_IDLE 0
42#endif 44#endif
45#ifndef IOM_SIG
46# define IOM_SIG 0
47#endif
43 48
44typedef double tstamp; 49typedef double tstamp;
45extern tstamp NOW; 50extern tstamp NOW;
46 51
47struct watcher; 52struct watcher;
… …
55struct check_watcher; 60struct check_watcher;
56#endif 61#endif
57#if IOM_IDLE 62#if IOM_IDLE
58struct idle_watcher; 63struct idle_watcher;
59#endif 64#endif
65#if IOM_SIG
66struct sig_watcher;
67#endif
60 68
61template<class watcher> 69template<class watcher>
62struct io_manager_vec : vector<watcher *> { 70struct io_manager_vec : vector<watcher *> {
63#if IOM_CHECK
64 bool activity;
65#endif
66
67 void erase_unordered (unsigned int pos) 71 void erase_unordered (unsigned int pos)
68 { 72 {
69 watcher *w = (*this)[size () - 1]; 73 watcher *w = (*this)[this->size () - 1];
70 pop_back (); 74 this->pop_back ();
71 75
72 if (size ()) 76 if (!this->empty ())
73 if ((*this)[pos] = w) 77 if (((*this)[pos] = w)) // '=' is correct!
74 w->active = pos + 1; 78 w->active = pos + 1;
75 } 79 }
76}; 80};
77 81
82// only used as a namespace, and for initialisation purposes
78class io_manager { 83class io_manager {
79#if IOM_IO
80 io_manager_vec<io_watcher> iow;
81#endif
82#if IOM_CHECK
83 io_manager_vec<check_watcher> cw;
84#endif
85#if IOM_TIME
86 io_manager_vec<time_watcher> tw;
87#endif
88#if IOM_IDLE
89 io_manager_vec<idle_watcher> iw;
90#endif
91
92 template<class watcher> 84 template<class watcher>
93 void reg (watcher *w, io_manager_vec<watcher> &queue); 85 static void reg (watcher &w, io_manager_vec<watcher> &queue);
94 86
95 template<class watcher> 87 template<class watcher>
96 void unreg (watcher *w, io_manager_vec<watcher> &queue); 88 static void unreg (watcher &w, io_manager_vec<watcher> &queue);
97 89
98public: 90public:
91#if IOM_TIME
92 // fetch time only
93 static tstamp now ();
94
95 // set NOW
96 static void set_now ();
97#endif
98
99 // register a watcher 99 // register a watcher
100#if IOM_IO 100#if IOM_IO
101 void reg (io_watcher *w); void unreg (io_watcher *w); 101 static void reg (io_watcher &w); static void unreg (io_watcher &w);
102#endif 102#endif
103#if IOM_TIME 103#if IOM_TIME
104 void reg (time_watcher *w); void unreg (time_watcher *w); 104 static void reg (time_watcher &w); static void unreg (time_watcher &w);
105#endif 105#endif
106#if IOM_CHECK 106#if IOM_CHECK
107 void reg (check_watcher *w); void unreg (check_watcher *w); 107 static void reg (check_watcher &w); static void unreg (check_watcher &w);
108#endif 108#endif
109#if IOM_IDLE 109#if IOM_IDLE
110 void reg (idle_watcher *w); void unreg (idle_watcher *w); 110 static void reg (idle_watcher &w); static void unreg (idle_watcher &w);
111#endif
112#if IOM_SIG
113 static void reg (sig_watcher &w); static void unreg (sig_watcher &w);
111#endif 114#endif
112 115
113 void loop (); 116 static void loop ();
114
115 io_manager ();
116 ~io_manager ();
117}; 117};
118
119extern io_manager iom; // a singleton, together with it's construction/destruction problems.
120 118
121struct watcher { 119struct watcher {
122 int active; /* 0 == inactive, else index into respective vector */ 120 int active; /* 0 == inactive, else index into respective vector */
123 121
124 watcher() : active(0) { } 122 watcher () : active (0) { }
125}; 123};
126 124
127#if IOM_IO 125#if IOM_IO
128enum { EVENT_READ = 1, EVENT_WRITE = 2 }; 126enum { EVENT_READ = 1, EVENT_WRITE = 2 };
129 127
… …
132 short events; 130 short events;
133 131
134 void set (int fd_, short events_) { fd = fd_; events = events_; } 132 void set (int fd_, short events_) { fd = fd_; events = events_; }
135 133
136 void set (short events_) { set (fd, events_); } 134 void set (short events_) { set (fd, events_); }
137 void start () { iom.reg (this); } 135 void start () { io_manager::reg (*this); }
138 void start (int fd_, short events_) { set (fd_, events_); iom.reg (this); } 136 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); }
139 void stop () { iom.unreg (this); } 137 void stop () { io_manager::unreg (*this); }
140 138
141 template<class O1, class O2> 139 template<class O1, class O2>
142 io_watcher (O1 *object, void (O2::*method)(io_watcher &, short)) 140 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
143 : callback2<void, io_watcher &, short>(object,method) 141 : callback2<void, io_watcher &, short> (object,method)
144 { } 142 { }
145 ~io_watcher () { stop (); } 143 ~io_watcher () { stop (); }
146}; 144};
147#endif 145#endif
148 146
… …
151 tstamp at; 149 tstamp at;
152 150
153 void trigger (); 151 void trigger ();
154 152
155 void set (tstamp when) { at = when; } 153 void set (tstamp when) { at = when; }
156 void operator ()() { trigger (); } 154 void operator () () { trigger (); }
157 void start () { iom.reg (this); } 155 void start () { io_manager::reg (*this); }
158 void start (tstamp when) { set (when); iom.reg (this); } 156 void start (tstamp when) { set (when); io_manager::reg (*this); }
159 void stop () { iom.unreg (this); } 157 void stop () { io_manager::unreg (*this); }
160 158
161 template<class O1, class O2> 159 template<class O1, class O2>
162 time_watcher (O1 *object, void (O2::*method)(time_watcher &)) 160 time_watcher (O1 *object, void (O2::*method) (time_watcher &))
163 : callback1<void, time_watcher &>(object,method), at(0) 161 : callback1<void, time_watcher &> (object,method), at (0)
164 { } 162 { }
165 ~time_watcher () { stop (); } 163 ~time_watcher () { stop (); }
166}; 164};
167#endif 165#endif
168 166
169#if IOM_CHECK 167#if IOM_CHECK
170// run before checking for new events 168// run before checking for new events
171struct check_watcher : watcher, callback1<void, check_watcher &> { 169struct check_watcher : watcher, callback1<void, check_watcher &> {
172 void start () { iom.reg (this); } 170 void start () { io_manager::reg (*this); }
173 void stop () { iom.unreg (this); } 171 void stop () { io_manager::unreg (*this); }
174 172
175 template<class O1, class O2> 173 template<class O1, class O2>
176 check_watcher (O1 *object, void (O2::*method)(check_watcher &)) 174 check_watcher (O1 *object, void (O2::*method) (check_watcher &))
177 : callback1<void, check_watcher &>(object,method) 175 : callback1<void, check_watcher &> (object,method)
178 { } 176 { }
179 ~check_watcher () { stop (); } 177 ~check_watcher () { stop (); }
180}; 178};
181#endif 179#endif
182 180
183#if IOM_IDLE 181#if IOM_IDLE
184// run after checking for any i/o, but before waiting 182// run after checking for any i/o, but before waiting
185struct idle_watcher : watcher, callback1<void, idle_watcher &> { 183struct idle_watcher : watcher, callback1<void, idle_watcher &> {
186 void start () { iom.reg (this); } 184 void start () { io_manager::reg (*this); }
187 void stop () { iom.unreg (this); } 185 void stop () { io_manager::unreg (*this); }
188 186
189 template<class O1, class O2> 187 template<class O1, class O2>
190 idle_watcher (O1 *object, void (O2::*method)(idle_watcher &)) 188 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &))
191 : callback1<void, idle_watcher &>(object,method) 189 : callback1<void, idle_watcher &> (object,method)
192 { } 190 { }
193 ~idle_watcher () { stop (); } 191 ~idle_watcher () { stop (); }
194}; 192};
195#endif 193#endif
196 194
197#endif 195#if IOM_SIG
196struct sig_watcher : watcher, callback1<void, sig_watcher &> {
197 int signum;
198 198
199 void start (int signum);
200 void stop () { io_manager::unreg (*this); }
201
202 template<class O1, class O2>
203 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &))
204 : callback1<void, sig_watcher &> (object,method), signum (-1)
205 { }
206 ~sig_watcher () { stop (); }
207};
208#endif
209
210#endif
211

Diff Legend

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