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.8 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.9 by pcg, Wed Apr 2 21:02:25 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
29inline bool lowest_first (const time_watcher *a, const time_watcher *b) 29inline bool earliest_first (const time_watcher *a, const time_watcher *b)
30{ 30{
31 return a->at > b->at; 31 return a->at > b->at;
32} 32}
33 33
34tstamp NOW; 34tstamp NOW;
… …
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
64void io_manager::reg (int fd, short events, io_watcher *w) 64void io_manager::reg (io_watcher *w)
65{ 65{
66 pollfd pfd; 66 pollfd pfd;
67 67
68 pfd.fd = fd; 68 pfd.fd = w->fd;
69 pfd.events = events; 69 pfd.events = w->events;
70 70
71 pfs.push_back (pfd); 71 pfs.push_back (pfd);
72 iow.push_back (w); 72 iow.push_back (w);
73} 73}
74 74
… …
97 } 97 }
98} 98}
99 99
100void io_manager::reschedule_time_watchers () 100void io_manager::reschedule_time_watchers ()
101{ 101{
102 make_heap (tw.begin (), tw.end (), lowest_first); 102 make_heap (tw.begin (), tw.end (), earliest_first);
103} 103}
104 104
105void io_manager::reg (time_watcher *w) 105void io_manager::reg (time_watcher *w)
106{ 106{
107 if (w->registered) 107 if (w->registered)
108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher"); 108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher");
109 109
110 w->registered = true; 110 w->registered = true;
111 111
112 tw.push_back (w); 112 tw.push_back (w);
113 push_heap (tw.begin (), tw.end (), lowest_first); 113 push_heap (tw.begin (), tw.end (), earliest_first);
114} 114}
115 115
116void io_manager::unreg (time_watcher *w) 116void io_manager::unreg (time_watcher *w)
117{ 117{
118 if (w->registered) 118 if (w->registered)
… …
151 while (tw[0]->at <= NOW) 151 while (tw[0]->at <= NOW)
152 { 152 {
153 // remove the first watcher 153 // remove the first watcher
154 time_watcher *w = tw[0]; 154 time_watcher *w = tw[0];
155 155
156 pop_heap (tw.begin (), tw.end (), lowest_first); 156 pop_heap (tw.begin (), tw.end (), earliest_first);
157 tw.pop_back (); 157 tw.pop_back ();
158 158
159 w->registered = false; 159 w->registered = false;
160 160
161 // call it 161 // call it
162 w->call (w->at); 162 w->call (*w);
163 163
164 // re-add it if necessary 164 // re-add it if necessary
165 if (w->at >= 0 && !w->registered) 165 if (w->at >= 0 && !w->registered)
166 reg (w); 166 reg (w);
167 } 167 }
… …
170 170
171 int fds = poll (&pfs[0], pfs.size (), timeout); 171 int fds = poll (&pfs[0], pfs.size (), timeout);
172 172
173 set_now (); 173 set_now ();
174 174
175 for (unsigned int i = 0; fds > 0 && i < iow.size (); ++i) 175 vector<io_watcher *>::iterator w;
176 vector<pollfd>::iterator p;
177
178 for (w = iow.begin (), p = pfs.begin ();
179 fds > 0 && w < iow.end ();
180 ++w, ++p)
176 if (pfs[i].revents) 181 if (p->revents)
177 { 182 {
178 --fds; 183 --fds;
179 iow[i]->call (pfs[i].fd, pfs[i].revents); 184 (*w)->call (**w, p->revents);
180 } 185 }
181 } 186 }
182} 187}
183 188
184void io_manager::idle_cb (tstamp &ts) 189void io_manager::idle_cb (time_watcher &w)
185{ 190{
186 ts = NOW + 86400; // wake up every day, for no good reason 191 w.at = NOW + 86400; // wake up every day, for no good reason
187} 192}
188 193
189io_manager::io_manager () 194io_manager::io_manager ()
190{ 195{
191 set_now (); 196 set_now ();

Diff Legend

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