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

Comparing rxvt-unicode/src/iom.C (file contents):
Revision 1.30 by root, Tue Nov 29 19:22:48 2005 UTC vs.
Revision 1.36 by root, Thu Dec 14 03:18:34 2006 UTC

1/* 1/*
2 iom.C -- generic I/O multiplexer 2 iom.C -- generic I/O multiplexer
3 Copyright (C) 2003, 2004 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2006 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
8 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
… …
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
… …
70 : pending (false) 72 : pending (false)
71 { } 73 { }
72}; 74};
73static vector<sig_vec *> sw; 75static vector<sig_vec *> sw;
74#endif 76#endif
77#if IOM_CHILD
78static io_manager_vec<child_watcher> pw;
79#endif
75 80
76// this is a dummy time watcher to ensure that the first 81// this is a dummy time watcher to ensure that the first
77// time watcher is _always_ valid, this gets rid of a lot 82// time watcher is _always_ valid, this gets rid of a lot
78// of null-pointer-checks 83// of null-pointer-checks
79// (must come _before_ iom is being defined) 84// (must come _before_ iom is being defined)
80static struct tw0 : time_watcher 85static struct tw0 : time_watcher
86{
87 void cb (time_watcher &w)
81 { 88 {
82 void cb (time_watcher &w)
83 {
84 // should never get called 89 // should never get called
85 // reached end-of-time, or tstamp has a bogus definition, 90 // reached end-of-time, or tstamp has a bogus definition,
86 // or compiler initialisation order broken, or something else :) 91 // or compiler initialisation order broken, or something else :)
87 abort (); 92 abort ();
88 } 93 }
89 94
90 tw0 () 95 tw0 ()
91 : time_watcher (this, &tw0::cb) 96 : time_watcher (this, &tw0::cb)
92 { } 97 { }
93 } tw0; 98} tw0;
94 99
95tstamp 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 io_manager::unreg (*w);
122 w->call (*w, status);
123 }
124 }
125 }
126
127 sw0 ()
128 : sig_watcher (this, &sw0::cb)
129 { }
130} sw0;
131#endif
96 132
97#if IOM_TIME 133#if IOM_TIME
98tstamp io_manager::now () 134tstamp io_manager::now ()
99{ 135{
100 struct timeval tv; 136 struct timeval tv;
… …
113 149
114// used for initialisation only 150// used for initialisation only
115static struct init { 151static struct init {
116 init () 152 init ()
117 { 153 {
154 iom_valid = true;
155
118#if IOM_SIG 156#if IOM_SIG
119 sigemptyset (&sigs); 157 sigemptyset (&sigs);
120 158
121 if (pipe (sigpipe)) 159 if (pipe (sigpipe))
122 { 160 {
… …
126 164
127 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC); 165 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
128 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC); 166 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
129#endif 167#endif
130 168
131 iom_valid = true; 169#if IOM_CHILD
170 sw0.start (SIGCHLD);
171#endif
132 172
133#if IOM_TIME 173#if IOM_TIME
134 io_manager::set_now (); 174 io_manager::set_now ();
135 175
136 tw0.start (TSTAMP_MAX); 176 tw0.start (TSTAMP_MAX);
137#endif 177#endif
178 }
179
180 ~init ()
181 {
182 iom_valid = false;
138 } 183 }
139 184
140 static void required (); 185 static void required ();
141} init; 186} init;
142 187
… …
214 write (sigpipe[1], &ch, 1); 259 write (sigpipe[1], &ch, 1);
215} 260}
216 261
217void io_manager::reg (sig_watcher &w) 262void io_manager::reg (sig_watcher &w)
218{ 263{
264 init::required ();
265
219 assert (0 < w.signum); 266 assert (0 < w.signum);
220 267
221 sw.reserve (w.signum); 268 sw.reserve (w.signum);
222 269
223 while (sw.size () < w.signum) // pathetic 270 while (sw.size () < w.signum) // pathetic
… …
248 io_manager::reg (w, *sv); 295 io_manager::reg (w, *sv);
249} 296}
250 297
251void io_manager::unreg (sig_watcher &w) 298void io_manager::unreg (sig_watcher &w)
252{ 299{
253 if (!w.active) 300 if (!w.active || !iom_valid)
254 return; 301 return;
255 302
256 assert (0 < w.signum && w.signum <= sw.size ()); 303 assert (0 < w.signum && w.signum <= sw.size ());
257 304
258 io_manager::unreg (w, *sw[w.signum - 1]); 305 io_manager::unreg (w, *sw[w.signum - 1]);
… …
262{ 309{
263 stop (); 310 stop ();
264 this->signum = signum; 311 this->signum = signum;
265 io_manager::reg (*this); 312 io_manager::reg (*this);
266} 313}
314#endif
315
316#if IOM_CHILD
317void io_manager::reg (child_watcher &w) { io_manager::reg (w, pw); }
318void io_manager::unreg (child_watcher &w) { io_manager::unreg (w, pw); }
267#endif 319#endif
268 320
269void io_manager::loop () 321void io_manager::loop ()
270{ 322{
271 init::required (); 323 init::required ();

Diff Legend

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