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.26 by root, Thu Jan 19 11:56:00 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 {
… …
115 119
116 watcher () : active (0) { } 120 watcher () : active (0) { }
117}; 121};
118 122
119#if IOM_IO 123#if IOM_IO
120enum { EVENT_READ = 1, EVENT_WRITE = 2 }; 124enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
121 125
122struct io_watcher : watcher, callback2<void, io_watcher &, short> { 126struct io_watcher : watcher, callback2<void, io_watcher &, short> {
123 int fd; 127 int fd;
124 short events; 128 short events;
125 129
… …
130 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); } 134 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); }
131 void stop () { io_manager::unreg (*this); } 135 void stop () { io_manager::unreg (*this); }
132 136
133 template<class O1, class O2> 137 template<class O1, class O2>
134 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short)) 138 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
135 : callback2<void, io_watcher &, short> (object,method) 139 : callback2<void, io_watcher &, short> (object, method)
136 { } 140 { }
137 ~io_watcher () { stop (); } 141 ~io_watcher () { stop (); }
138}; 142};
139#endif 143#endif
140 144
… …
150 void start (tstamp when) { set (when); io_manager::reg (*this); } 154 void start (tstamp when) { set (when); io_manager::reg (*this); }
151 void stop () { io_manager::unreg (*this); } 155 void stop () { io_manager::unreg (*this); }
152 156
153 template<class O1, class O2> 157 template<class O1, class O2>
154 time_watcher (O1 *object, void (O2::*method) (time_watcher &)) 158 time_watcher (O1 *object, void (O2::*method) (time_watcher &))
155 : callback1<void, time_watcher &> (object,method), at (0) 159 : callback1<void, time_watcher &> (object, method), at (0)
156 { } 160 { }
157 ~time_watcher () { stop (); } 161 ~time_watcher () { stop (); }
158}; 162};
159#endif 163#endif
160 164
… …
164 void start () { io_manager::reg (*this); } 168 void start () { io_manager::reg (*this); }
165 void stop () { io_manager::unreg (*this); } 169 void stop () { io_manager::unreg (*this); }
166 170
167 template<class O1, class O2> 171 template<class O1, class O2>
168 check_watcher (O1 *object, void (O2::*method) (check_watcher &)) 172 check_watcher (O1 *object, void (O2::*method) (check_watcher &))
169 : callback1<void, check_watcher &> (object,method) 173 : callback1<void, check_watcher &> (object, method)
170 { } 174 { }
171 ~check_watcher () { stop (); } 175 ~check_watcher () { stop (); }
172}; 176};
173#endif 177#endif
174 178
… …
178 void start () { io_manager::reg (*this); } 182 void start () { io_manager::reg (*this); }
179 void stop () { io_manager::unreg (*this); } 183 void stop () { io_manager::unreg (*this); }
180 184
181 template<class O1, class O2> 185 template<class O1, class O2>
182 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &)) 186 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &))
183 : callback1<void, idle_watcher &> (object,method) 187 : callback1<void, idle_watcher &> (object, method)
184 { } 188 { }
185 ~idle_watcher () { stop (); } 189 ~idle_watcher () { stop (); }
186}; 190};
187#endif 191#endif
188 192
… …
193 void start (int signum); 197 void start (int signum);
194 void stop () { io_manager::unreg (*this); } 198 void stop () { io_manager::unreg (*this); }
195 199
196 template<class O1, class O2> 200 template<class O1, class O2>
197 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &)) 201 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &))
198 : callback1<void, sig_watcher &> (object,method), signum (-1) 202 : callback1<void, sig_watcher &> (object, method), signum (0)
199 { } 203 { }
200 ~sig_watcher () { stop (); } 204 ~sig_watcher () { stop (); }
201}; 205};
202#endif 206#endif
203 207
204#endif 208#if IOM_CHILD
209struct child_watcher : watcher, callback2<void, child_watcher &, int> {
210 int /*pid_t*/ pid;
205 211
212 void start (int pid) { this->pid = pid; io_manager::reg (*this); }
213 void stop () { io_manager::unreg (*this); }
214
215 template<class O1, class O2>
216 child_watcher (O1 *object, void (O2::*method) (child_watcher &, int status))
217 : callback2<void, child_watcher &, int> (object, method), pid (0)
218 { }
219 ~child_watcher () { stop (); }
220};
221#endif
222
223#endif
224

Diff Legend

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