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

Comparing rxvt-unicode/src/iom.h (file contents):
Revision 1.15 by root, Thu Sep 2 07:44:40 2004 UTC vs.
Revision 1.28 by root, Wed May 31 00:32:56 2006 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-2006 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#ifndef IOM_H__ 22#ifndef IOM_H__
21#define IOM_H__ 23#define IOM_H__
22 24
… …
24// - a vector template like simplevec or stl's vector 26// - a vector template like simplevec or stl's vector
25// - defines for all watcher types required in your app 27// - defines for all watcher types required in your app
26// edit iom_conf.h as appropriate. 28// edit iom_conf.h as appropriate.
27#include "iom_conf.h" 29#include "iom_conf.h"
28 30
31#if IOM_CHILD
32# undef IOM_SIG
33# define IOM_SIG 1
34#endif
35
29#include "callback.h" 36#include "callback.h"
30
31#ifndef IOM_IO
32# define IOM_IO 0
33#endif
34#ifndef IOM_TIME
35# define IOM_TIME 0
36#endif
37#ifndef IOM_CHECK
38# define IOM_CHECK 0
39#endif
40#ifndef IOM_IDLE
41# define IOM_IDLE 0
42#endif
43#ifndef IOM_SIG
44# define IOM_SIG 0
45#endif
46 37
47typedef double tstamp; 38typedef double tstamp;
48extern tstamp NOW; 39extern tstamp NOW;
40
41// TSTAMP_MAX must still fit into a positive struct timeval
42#define TSTAMP_MAX (double)(1UL<<31)
49 43
50struct watcher; 44struct watcher;
51#if IOM_IO 45#if IOM_IO
52struct io_watcher; 46struct io_watcher;
53#endif 47#endif
… …
61struct idle_watcher; 55struct idle_watcher;
62#endif 56#endif
63#if IOM_SIG 57#if IOM_SIG
64struct sig_watcher; 58struct sig_watcher;
65#endif 59#endif
60#if IOM_CHILD
61struct child_watcher;
62#endif
66 63
67template<class watcher> 64template<class watcher>
68struct io_manager_vec : vector<watcher *> { 65struct io_manager_vec : vector<watcher *> {
69#if IOM_CHECK
70 bool activity;
71#endif
72
73 void erase_unordered (unsigned int pos) 66 void erase_unordered (unsigned int pos)
74 { 67 {
75 watcher *w = (*this)[this->size () - 1]; 68 watcher *w = (*this)[this->size () - 1];
76 this->pop_back (); 69 this->pop_back ();
77 70
78 if (this->size ()) 71 if (!this->empty ())
79 if ((*this)[pos] = w) 72 if (((*this)[pos] = w)) // '=' is correct!
80 w->active = pos + 1; 73 w->active = pos + 1;
81 } 74 }
82}; 75};
83 76
84// only used as a namespace, and for initialisation purposes 77// only used as a namespace, and for initialisation purposes
… …
88 81
89 template<class watcher> 82 template<class watcher>
90 static void unreg (watcher &w, io_manager_vec<watcher> &queue); 83 static void unreg (watcher &w, io_manager_vec<watcher> &queue);
91 84
92public: 85public:
86#if IOM_TIME
87 // fetch time only
88 static tstamp now ();
89
90 // set NOW
91 static void set_now ();
92#endif
93
93 // register a watcher 94 // register a watcher
94#if IOM_IO 95#if IOM_IO
95 static void reg (io_watcher &w); static void unreg (io_watcher &w); 96 static void reg (io_watcher &w); static void unreg (io_watcher &w);
96#endif 97#endif
97#if IOM_TIME 98#if IOM_TIME
… …
104 static void reg (idle_watcher &w); static void unreg (idle_watcher &w); 105 static void reg (idle_watcher &w); static void unreg (idle_watcher &w);
105#endif 106#endif
106#if IOM_SIG 107#if IOM_SIG
107 static void reg (sig_watcher &w); static void unreg (sig_watcher &w); 108 static void reg (sig_watcher &w); static void unreg (sig_watcher &w);
108#endif 109#endif
110#if IOM_CHILD
111 static void reg (child_watcher &w); static void unreg (child_watcher &w);
112#endif
109 113
110 static void loop (); 114 static void loop ();
111}; 115};
112 116
113struct watcher { 117struct watcher {
114 int active; /* 0 == inactive, else index into respective vector */ 118 int active; /* 0 == inactive, else index into respective vector */
115 119
120 bool is_active () { return active; }
121
116 watcher () : active (0) { } 122 watcher () : active (0) { }
117}; 123};
118 124
119#if IOM_IO 125#if IOM_IO
120enum { EVENT_READ = 1, EVENT_WRITE = 2 }; 126enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
121 127
122struct io_watcher : watcher, callback2<void, io_watcher &, short> { 128struct io_watcher : watcher, callback<void (io_watcher &, short)> {
123 int fd; 129 int fd;
124 short events; 130 short events;
125 131
126 void set (int fd_, short events_) { fd = fd_; events = events_; } 132 void set (int fd_, short events_) { fd = fd_; events = events_; }
127 133
… …
130 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); } 136 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); }
131 void stop () { io_manager::unreg (*this); } 137 void stop () { io_manager::unreg (*this); }
132 138
133 template<class O1, class O2> 139 template<class O1, class O2>
134 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short)) 140 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
135 : callback2<void, io_watcher &, short> (object,method) 141 : callback<void (io_watcher &, short)> (object, method)
136 { } 142 { }
137 ~io_watcher () { stop (); } 143 ~io_watcher () { stop (); }
138}; 144};
139#endif 145#endif
140 146
141#if IOM_TIME 147#if IOM_TIME
142struct time_watcher : watcher, callback1<void, time_watcher &> { 148struct time_watcher : watcher, callback<void (time_watcher &)> {
143 tstamp at; 149 tstamp at;
144 150
145 void trigger (); 151 void trigger ();
146 152
147 void set (tstamp when) { at = when; } 153 void set (tstamp when) { at = when; }
… …
150 void start (tstamp when) { set (when); io_manager::reg (*this); } 156 void start (tstamp when) { set (when); io_manager::reg (*this); }
151 void stop () { io_manager::unreg (*this); } 157 void stop () { io_manager::unreg (*this); }
152 158
153 template<class O1, class O2> 159 template<class O1, class O2>
154 time_watcher (O1 *object, void (O2::*method) (time_watcher &)) 160 time_watcher (O1 *object, void (O2::*method) (time_watcher &))
155 : callback1<void, time_watcher &> (object,method), at (0) 161 : callback<void (time_watcher &)> (object, method), at (0)
156 { } 162 { }
157 ~time_watcher () { stop (); } 163 ~time_watcher () { stop (); }
158}; 164};
159#endif 165#endif
160 166
161#if IOM_CHECK 167#if IOM_CHECK
162// run before checking for new events 168// run before checking for new events
163struct check_watcher : watcher, callback1<void, check_watcher &> { 169struct check_watcher : watcher, callback<void (check_watcher &)> {
164 void start () { io_manager::reg (*this); } 170 void start () { io_manager::reg (*this); }
165 void stop () { io_manager::unreg (*this); } 171 void stop () { io_manager::unreg (*this); }
166 172
167 template<class O1, class O2> 173 template<class O1, class O2>
168 check_watcher (O1 *object, void (O2::*method) (check_watcher &)) 174 check_watcher (O1 *object, void (O2::*method) (check_watcher &))
169 : callback1<void, check_watcher &> (object,method) 175 : callback<void (check_watcher &)> (object, method)
170 { } 176 { }
171 ~check_watcher () { stop (); } 177 ~check_watcher () { stop (); }
172}; 178};
173#endif 179#endif
174 180
175#if IOM_IDLE 181#if IOM_IDLE
176// run after checking for any i/o, but before waiting 182// run after checking for any i/o, but before waiting
177struct idle_watcher : watcher, callback1<void, idle_watcher &> { 183struct idle_watcher : watcher, callback<void (idle_watcher &)> {
178 void start () { io_manager::reg (*this); } 184 void start () { io_manager::reg (*this); }
179 void stop () { io_manager::unreg (*this); } 185 void stop () { io_manager::unreg (*this); }
180 186
181 template<class O1, class O2> 187 template<class O1, class O2>
182 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &)) 188 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &))
183 : callback1<void, idle_watcher &> (object,method) 189 : callback<void (idle_watcher &)> (object, method)
184 { } 190 { }
185 ~idle_watcher () { stop (); } 191 ~idle_watcher () { stop (); }
186}; 192};
187#endif 193#endif
188 194
189#if IOM_SIG 195#if IOM_SIG
190struct sig_watcher : watcher, callback1<void, sig_watcher &> { 196struct sig_watcher : watcher, callback<void (sig_watcher &)> {
191 int signum; 197 int signum;
192 198
193 void start (int signum); 199 void start (int signum);
194 void stop () { io_manager::unreg (*this); } 200 void stop () { io_manager::unreg (*this); }
195 201
196 template<class O1, class O2> 202 template<class O1, class O2>
197 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &)) 203 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &))
198 : callback1<void, sig_watcher &> (object,method), signum (-1) 204 : callback<void(sig_watcher &)> (object, method), signum (0)
199 { } 205 { }
200 ~sig_watcher () { stop (); } 206 ~sig_watcher () { stop (); }
201}; 207};
202#endif 208#endif
203 209
204#endif 210#if IOM_CHILD
211struct child_watcher : watcher, callback<void (child_watcher &, int)> {
212 int /*pid_t*/ pid;
205 213
214 void start (int pid) { this->pid = pid; io_manager::reg (*this); }
215 void stop () { io_manager::unreg (*this); }
216
217 template<class O1, class O2>
218 child_watcher (O1 *object, void (O2::*method) (child_watcher &, int status))
219 : callback<void (child_watcher &, int)> (object, method), pid (0)
220 { }
221 ~child_watcher () { stop (); }
222};
223#endif
224
225#endif
226

Diff Legend

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