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.6 by pcg, Fri Mar 28 04:05:10 2003 UTC vs.
Revision 1.10 by pcg, Fri Apr 4 05:26:45 2003 UTC

… …
24#include <functional> 24#include <functional>
25 25
26#include "slog.h" 26#include "slog.h"
27#include "iom.h" 27#include "iom.h"
28 28
29tstamp NOW;
30bool iom_valid;
31io_manager iom;
32
29inline bool lowest_first (const time_watcher *a, const time_watcher *b) 33inline bool earliest_first (const time_watcher *a, const time_watcher *b)
30{ 34{
31 return a->at > b->at; 35 return a->at > b->at;
32} 36}
33
34tstamp NOW;
35
36io_manager iom;
37 37
38void time_watcher::set (tstamp when) 38void time_watcher::set (tstamp when)
39{ 39{
40 at = when; 40 at = when;
41 41
… …
45 iom.reg (this); 45 iom.reg (this);
46} 46}
47 47
48void time_watcher::trigger () 48void time_watcher::trigger ()
49{ 49{
50 call (at); 50 call (*this);
51 51
52 if (registered) 52 if (registered)
53 iom.reschedule_time_watchers (); 53 iom.reschedule_time_watchers ();
54 else 54 else
55 iom.reg (this); 55 iom.reg (this);
… …
59{ 59{
60 if (!registered) 60 if (!registered)
61 iom.reg (this); 61 iom.reg (this);
62} 62}
63 63
64time_watcher::~time_watcher ()
65{
66 if (iom_valid)
67 iom.unreg (this);
68}
69
70io_watcher::~io_watcher ()
71{
72 if (iom_valid)
73 iom.unreg (this);
74}
75
64void io_manager::reg (int fd, short events, io_watcher *w) 76void io_manager::reg (io_watcher *w)
65{ 77{
66 pollfd pfd; 78 pollfd pfd;
67
68 pfd.fd = fd;
69 pfd.events = events;
70 79
71 pfs.push_back (pfd); 80 pfs.push_back (pfd);
72 iow.push_back (w); 81 iow.push_back (w);
73}
74 82
83 w->p = &(*(pfs.end () - 1));
84}
85
75void io_manager::unreg (const io_watcher *w) 86void io_manager::unreg (io_watcher *w)
76{ 87{
77 unsigned int sz = iow.size (); 88 if (w->p)
78 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
79
80 if (i != sz)
81 { 89 {
90 unsigned int sz = iow.size ();
91 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
92
93 assert (i != sz);
94
82 if (sz == 1) 95 if (sz == 1)
83 { 96 {
84 pfs.clear (); 97 pfs.clear ();
85 iow.clear (); 98 iow.clear ();
86 } 99 }
… …
92 else 105 else
93 { 106 {
94 iow[i] = iow[sz - 1]; iow.pop_back (); 107 iow[i] = iow[sz - 1]; iow.pop_back ();
95 pfs[i] = pfs[sz - 1]; pfs.pop_back (); 108 pfs[i] = pfs[sz - 1]; pfs.pop_back ();
96 } 109 }
110
111 w->p = 0;
97 } 112 }
98} 113}
99 114
100void io_manager::reschedule_time_watchers () 115void io_manager::reschedule_time_watchers ()
101{ 116{
102 make_heap (tw.begin (), tw.end (), lowest_first); 117 make_heap (tw.begin (), tw.end (), earliest_first);
103} 118}
104 119
105void io_manager::reg (time_watcher *w) 120void io_manager::reg (time_watcher *w)
106{ 121{
122 w->registered = true;
123
124 tw.push_back (w);
125 push_heap (tw.begin (), tw.end (), earliest_first);
126}
127
128void io_manager::unreg (time_watcher *w)
129{
107 if (w->registered) 130 if (w->registered)
108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher");
109
110 tw.push_back (w);
111 push_heap (tw.begin (), tw.end (), lowest_first);
112}
113
114void io_manager::unreg (const time_watcher *w)
115{
116 unsigned int sz = tw.size ();
117 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
118
119 if (i != sz)
120 { 131 {
132 unsigned int sz = tw.size ();
133 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
134
135 assert (i != sz);
136
121 if (i != sz - 1) 137 if (i != sz - 1)
122 tw[i] = tw[sz - 1]; 138 tw[i] = tw[sz - 1];
123 139
124 tw.pop_back (); 140 tw.pop_back ();
125 reschedule_time_watchers (); 141 reschedule_time_watchers ();
142
143 w->registered = false;
126 } 144 }
127} 145}
128 146
129inline void set_now (void) 147inline void set_now (void)
130{ 148{
… …
141 159
142 for (;;) 160 for (;;)
143 { 161 {
144 while (tw[0]->at <= NOW) 162 while (tw[0]->at <= NOW)
145 { 163 {
164 // remove the first watcher
165 time_watcher *w = tw[0];
166
146 pop_heap (tw.begin (), tw.end (), lowest_first); 167 pop_heap (tw.begin (), tw.end (), earliest_first);
147 time_watcher *w = *(tw.end () - 1);
148 tw.pop_back (); 168 tw.pop_back ();
149 169
150 if (w->at >= 0) 170 w->registered = false;
151 { 171
172 // call it
152 w->call (w->at); 173 w->call (*w);
153 174
175 // re-add it if necessary
154 if (!w->registered) 176 if (w->at >= 0 && !w->registered)
155 reg (w); 177 reg (w);
156 }
157 } 178 }
158 179
159 int timeout = (int) ((tw[0]->at - NOW) * 1000); 180 int timeout = (int) ((tw[0]->at - NOW) * 1000);
160 181
161 int fds = poll (&pfs[0], pfs.size (), timeout); 182 int fds = poll (&pfs[0], pfs.size (), timeout);
162 183
163 set_now (); 184 set_now ();
164 185
165 for (unsigned int i = iow.size (); fds > 0 && i--; ) 186 vector<io_watcher *>::iterator w;
187 vector<pollfd>::iterator p;
188
189 for (w = iow.begin (), p = pfs.begin ();
190 fds > 0 && w < iow.end ();
191 ++w, ++p)
166 if (pfs[i].revents) 192 if (p->revents)
167 { 193 {
168 --fds; 194 --fds;
169 iow[i]->call (pfs[i].revents); 195 (*w)->call (**w, p->revents);
170 } 196 }
171 } 197 }
172} 198}
173 199
174void io_manager::idle_cb (tstamp &ts) 200void io_manager::idle_cb (time_watcher &w)
175{ 201{
176 ts = NOW + 86400; // wake up every day, for no good reason 202 w.at = NOW + 86400; // wake up every day, for no good reason
177} 203}
178 204
179io_manager::io_manager () 205io_manager::io_manager ()
180{ 206{
207 iom_valid = true;
208
181 set_now (); 209 set_now ();
182 idle = new time_watcher (this, &io_manager::idle_cb); 210 idle = new time_watcher (this, &io_manager::idle_cb);
183 idle->start (0); 211 idle->start (0);
184} 212}
185 213
186io_manager::~io_manager () 214io_manager::~io_manager ()
187{ 215{
188 // 216 iom_valid = false;
189} 217}
190 218

Diff Legend

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