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

Comparing gvpe/src/iom.C (file contents):
Revision 1.30 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.34 by pcg, Thu Jan 19 20:16:06 2006 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include "iom.h" 22#include "iom.h"
23 23
24#include <cstdio> 24#include <cstdio>
25#include <cstdlib> 25#include <cstdlib>
26#include <cerrno> 26#include <cerrno>
27#include <cassert>
27 28
29#include <sys/types.h>
28#include <sys/time.h> 30#include <sys/time.h>
29
30#include <assert.h>
31 31
32#if 1 // older unices need these includes for select (2) 32#if 1 // older unices need these includes for select (2)
33# include <unistd.h> 33# include <unistd.h>
34# include <sys/types.h>
35# include <time.h> 34# include <time.h>
36#endif 35#endif
37 36
38// for IOM_SIG 37#if IOM_CHILD
38# include <sys/wait.h>
39#endif
40
39#if IOM_SIG 41#if IOM_SIG
40# include <csignal> 42# include <csignal>
41# include <fcntl.h> 43# include <fcntl.h>
42#endif 44#endif
43 45
44// if the BSDs would at least be marginally POSIX-compatible.. *sigh* 46// if the BSDs would at least be marginally POSIX-compatible.. *sigh*
45// until that happens, sys/select.h must come last 47// until that happens, sys/select.h must come last
46#include <sys/select.h> 48#include <sys/select.h>
47
48// TSTAMP_MAX must still fit into a positive struct timeval
49#define TSTAMP_MAX (double)(1UL<<31)
50 49
51#define TIMEVAL timeval 50#define TIMEVAL timeval
52#define TV_FRAC tv_usec 51#define TV_FRAC tv_usec
53#define TV_MULT 1000000L 52#define TV_MULT 1000000L
54 53
… …
73 : pending (false) 72 : pending (false)
74 { } 73 { }
75}; 74};
76static vector<sig_vec *> sw; 75static vector<sig_vec *> sw;
77#endif 76#endif
77#if IOM_CHILD
78static io_manager_vec<child_watcher> pw;
79#endif
78 80
79// this is a dummy time watcher to ensure that the first 81// this is a dummy time watcher to ensure that the first
80// time watcher is _always_ valid, this gets rid of a lot 82// time watcher is _always_ valid, this gets rid of a lot
81// of null-pointer-checks 83// of null-pointer-checks
82// (must come _before_ iom is being defined) 84// (must come _before_ iom is being defined)
83static struct tw0 : time_watcher 85static struct tw0 : time_watcher
86{
87 void cb (time_watcher &w)
84 { 88 {
85 void cb (time_watcher &w)
86 {
87 // should never get called 89 // should never get called
88 // reached end-of-time, or tstamp has a bogus definition, 90 // reached end-of-time, or tstamp has a bogus definition,
89 // or compiler initialisation order broken, or something else :) 91 // or compiler initialisation order broken, or something else :)
90 abort (); 92 abort ();
91 } 93 }
92 94
93 tw0 () 95 tw0 ()
94 : time_watcher (this, &tw0::cb) 96 : time_watcher (this, &tw0::cb)
95 { } 97 { }
96 } tw0; 98} tw0;
97 99
98tstamp NOW; 100tstamp NOW;
101
102#if IOM_CHILD
103// sig_watcher for child signal(s)
104static struct sw0 : sig_watcher
105{
106 void cb (sig_watcher &w)
107 {
108 // SIGCHLD, call corresponding watchera
109 pid_t pid;
110 int status;
111
112 while ((pid = waitpid (-1, &status, WNOHANG)) > 0)
113 for (int i = pw.size (); i--; )
114 {
115 child_watcher *w = pw[i];
116
117 if (!w)
118 pw.erase_unordered (i);
119 else if (w->pid == pid)
120 {
121 w->stop ();
122 w->call (*w, status);
123 }
124 }
125
126 }
127
128 sw0 ()
129 : sig_watcher (this, &sw0::cb)
130 { }
131} sw0;
132#endif
99 133
100#if IOM_TIME 134#if IOM_TIME
101tstamp io_manager::now () 135tstamp io_manager::now ()
102{ 136{
103 struct timeval tv; 137 struct timeval tv;
… …
116 150
117// used for initialisation only 151// used for initialisation only
118static struct init { 152static struct init {
119 init () 153 init ()
120 { 154 {
155 iom_valid = true;
156
121#if IOM_SIG 157#if IOM_SIG
122 sigemptyset (&sigs); 158 sigemptyset (&sigs);
123 159
124 if (pipe (sigpipe)) 160 if (pipe (sigpipe))
125 { 161 {
… …
129 165
130 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC); 166 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
131 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC); 167 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
132#endif 168#endif
133 169
134 iom_valid = true; 170#if IOM_CHILD
171 sw0.start (SIGCHLD);
172#endif
135 173
136#if IOM_TIME 174#if IOM_TIME
137 io_manager::set_now (); 175 io_manager::set_now ();
138 176
139 tw0.start (TSTAMP_MAX); 177 tw0.start (TSTAMP_MAX);
140#endif 178#endif
179 }
180
181 ~init ()
182 {
183 iom_valid = false;
141 } 184 }
142 185
143 static void required (); 186 static void required ();
144} init; 187} init;
145 188
… …
217 write (sigpipe[1], &ch, 1); 260 write (sigpipe[1], &ch, 1);
218} 261}
219 262
220void io_manager::reg (sig_watcher &w) 263void io_manager::reg (sig_watcher &w)
221{ 264{
265 init::required ();
266
222 assert (0 < w.signum); 267 assert (0 < w.signum);
223 268
224 sw.reserve (w.signum); 269 sw.reserve (w.signum);
225 270
226 while (sw.size () < w.signum) // pathetic 271 while (sw.size () < w.signum) // pathetic
… …
251 io_manager::reg (w, *sv); 296 io_manager::reg (w, *sv);
252} 297}
253 298
254void io_manager::unreg (sig_watcher &w) 299void io_manager::unreg (sig_watcher &w)
255{ 300{
256 if (!w.active) 301 if (!w.active || !iom_valid)
257 return; 302 return;
258 303
259 assert (0 < w.signum && w.signum <= sw.size ()); 304 assert (0 < w.signum && w.signum <= sw.size ());
260 305
261 io_manager::unreg (w, *sw[w.signum - 1]); 306 io_manager::unreg (w, *sw[w.signum - 1]);
… …
265{ 310{
266 stop (); 311 stop ();
267 this->signum = signum; 312 this->signum = signum;
268 io_manager::reg (*this); 313 io_manager::reg (*this);
269} 314}
315#endif
316
317#if IOM_CHILD
318void io_manager::reg (child_watcher &w) { io_manager::reg (w, pw); }
319void io_manager::unreg (child_watcher &w) { io_manager::unreg (w, pw); }
270#endif 320#endif
271 321
272void io_manager::loop () 322void io_manager::loop ()
273{ 323{
274 init::required (); 324 init::required ();

Diff Legend

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