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.9 by pcg, Wed Apr 2 21:02:25 2003 UTC vs.
Revision 1.11 by pcg, Sat Apr 5 02:32:40 2003 UTC

21#include <sys/time.h> 21#include <sys/time.h>
22 22
23#include <algorithm> 23#include <algorithm>
24#include <functional> 24#include <functional>
25 25
26#include "gettext.h"
27
26#include "slog.h" 28#include "slog.h"
27#include "iom.h" 29#include "iom.h"
28 30
31tstamp NOW;
32bool iom_valid;
33io_manager iom;
34
29inline bool earliest_first (const time_watcher *a, const time_watcher *b) 35inline bool earliest_first (const time_watcher *a, const time_watcher *b)
30{ 36{
31 return a->at > b->at; 37 return a->at > b->at;
32} 38}
33 39
34tstamp NOW;
35
36io_manager iom;
37
38void time_watcher::set (tstamp when) 40void time_watcher::set (tstamp when)
39{ 41{
40 at = when; 42 at = when;
43
44 if (registered)
45 iom.reschedule_time_watchers ();
46}
47
48void time_watcher::trigger ()
49{
50 call (*this);
41 51
42 if (registered) 52 if (registered)
43 iom.reschedule_time_watchers (); 53 iom.reschedule_time_watchers ();
44 else 54 else
45 iom.reg (this); 55 iom.reg (this);
46} 56}
47 57
48void time_watcher::trigger () 58time_watcher::~time_watcher ()
49{ 59{
50 call (*this); 60 if (iom_valid)
61 iom.unreg (this);
62}
63
64void io_watcher::set(int fd_, short events_)
65{
66 fd = fd_;
67 events = events_;
51 68
52 if (registered) 69 if (registered)
53 iom.reschedule_time_watchers (); 70 {
54 else 71 iom.unreg (this);
55 iom.reg (this); 72 iom.reg (this);
73 }
56} 74}
57 75
58void time_watcher::start () 76io_watcher::~io_watcher ()
59{ 77{
60 if (!registered) 78 if (iom_valid)
61 iom.reg (this); 79 iom.unreg (this);
62} 80}
63 81
64void io_manager::reg (io_watcher *w) 82void io_manager::reg (io_watcher *w)
65{ 83{
84 if (!w->registered)
85 {
86 w->registered = true;
87
66 pollfd pfd; 88 pollfd pfd;
67 89
68 pfd.fd = w->fd; 90 pfd.fd = w->fd;
69 pfd.events = w->events; 91 pfd.events = w->events;
70 92
71 pfs.push_back (pfd); 93 pfs.push_back (pfd);
72 iow.push_back (w); 94 iow.push_back (w);
95 }
73} 96}
74 97
75void io_manager::unreg (io_watcher *w) 98void io_manager::unreg (io_watcher *w)
76{ 99{
100 if (w->registered)
101 {
102 w->registered = false;
103
77 unsigned int sz = iow.size (); 104 unsigned int sz = iow.size ();
78 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin (); 105 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
79 106
80 if (i != sz) 107 assert (i != sz);
81 { 108
82 if (sz == 1) 109 if (sz == 1)
83 { 110 {
84 pfs.clear (); 111 pfs.clear ();
85 iow.clear (); 112 iow.clear ();
86 } 113 }
102 make_heap (tw.begin (), tw.end (), earliest_first); 129 make_heap (tw.begin (), tw.end (), earliest_first);
103} 130}
104 131
105void io_manager::reg (time_watcher *w) 132void io_manager::reg (time_watcher *w)
106{ 133{
134 if (!w->registered)
135 {
136 w->registered = true;
137
138 tw.push_back (w);
139 push_heap (tw.begin (), tw.end (), earliest_first);
140 }
141}
142
143void io_manager::unreg (time_watcher *w)
144{
107 if (w->registered) 145 if (w->registered)
108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher"); 146 {
109
110 w->registered = true; 147 w->registered = false;
111 148
112 tw.push_back (w);
113 push_heap (tw.begin (), tw.end (), earliest_first);
114}
115
116void io_manager::unreg (time_watcher *w)
117{
118 if (w->registered)
119 {
120 unsigned int sz = tw.size (); 149 unsigned int sz = tw.size ();
121 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin (); 150 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
122 151
123 if (i != sz) 152 assert (i != sz);
124 { 153
125 if (i != sz - 1) 154 if (i != sz - 1)
126 tw[i] = tw[sz - 1]; 155 tw[i] = tw[sz - 1];
127 156
128 tw.pop_back (); 157 tw.pop_back ();
129 reschedule_time_watchers (); 158 reschedule_time_watchers ();
130 }
131
132 w->registered = false;
133 } 159 }
134} 160}
135 161
136inline void set_now (void) 162inline void set_now (void)
137{ 163{
179 fds > 0 && w < iow.end (); 205 fds > 0 && w < iow.end ();
180 ++w, ++p) 206 ++w, ++p)
181 if (p->revents) 207 if (p->revents)
182 { 208 {
183 --fds; 209 --fds;
210
211 if (p->revents & POLLNVAL)
212 {
213 slog (L_ERR, _("io_watcher started on illegal file descriptor, disabling."));
214 (*w)->stop ();
215 }
216 else
184 (*w)->call (**w, p->revents); 217 (*w)->call (**w, p->revents);
185 } 218 }
186 } 219 }
187} 220}
188 221
189void io_manager::idle_cb (time_watcher &w) 222void io_manager::idle_cb (time_watcher &w)
191 w.at = NOW + 86400; // wake up every day, for no good reason 224 w.at = NOW + 86400; // wake up every day, for no good reason
192} 225}
193 226
194io_manager::io_manager () 227io_manager::io_manager ()
195{ 228{
229 iom_valid = true;
230
196 set_now (); 231 set_now ();
197 idle = new time_watcher (this, &io_manager::idle_cb); 232 idle = new time_watcher (this, &io_manager::idle_cb);
198 idle->start (0); 233 idle->start (0);
199} 234}
200 235
201io_manager::~io_manager () 236io_manager::~io_manager ()
202{ 237{
203 // 238 iom_valid = false;
204} 239}
205 240

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines