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.4 by pcg, Fri Mar 21 23:17:01 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;
35 35
36io_manager iom; 36io_manager iom;
37 37
38void time_watcher::set (tstamp when) 38void time_watcher::set (tstamp when)
39{ 39{
40 iom.unreg (this);
41 at = when; 40 at = when;
41
42 if (registered)
43 iom.reschedule_time_watchers ();
44 else
42 iom.reg (this); 45 iom.reg (this);
43} 46}
44 47
45void time_watcher::trigger () 48void time_watcher::trigger ()
46{ 49{
47 iom.unreg (this);
48 call (at); 50 call (*this);
51
52 if (registered)
53 iom.reschedule_time_watchers ();
54 else
49 iom.reg (this); 55 iom.reg (this);
50} 56}
51 57
52void time_watcher::start () 58void time_watcher::start ()
53{ 59{
54 iom.unreg (this); 60 if (!registered)
55 iom.reg (this); 61 iom.reg (this);
56} 62}
57 63
58void io_manager::reg (int fd, short events, io_watcher *w) 64void io_manager::reg (io_watcher *w)
59{ 65{
60 pollfd pfd; 66 pollfd pfd;
61 67
62 pfd.fd = fd; 68 pfd.fd = w->fd;
63 pfd.events = events; 69 pfd.events = w->events;
64 70
65 pfs.push_back (pfd); 71 pfs.push_back (pfd);
66 iow.push_back (w); 72 iow.push_back (w);
67} 73}
68 74
… …
89 pfs[i] = pfs[sz - 1]; pfs.pop_back (); 95 pfs[i] = pfs[sz - 1]; pfs.pop_back ();
90 } 96 }
91 } 97 }
92} 98}
93 99
100void io_manager::reschedule_time_watchers ()
101{
102 make_heap (tw.begin (), tw.end (), earliest_first);
103}
104
94void io_manager::reg (time_watcher *w) 105void io_manager::reg (time_watcher *w)
95{ 106{
107 if (w->registered)
108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher");
109
110 w->registered = true;
111
96 tw.push_back (w); 112 tw.push_back (w);
97 push_heap (tw.begin (), tw.end (), lowest_first); 113 push_heap (tw.begin (), tw.end (), earliest_first);
98} 114}
99 115
100void io_manager::unreg (time_watcher *w) 116void io_manager::unreg (time_watcher *w)
101{ 117{
102 unsigned int sz = tw.size (); 118 if (w->registered)
103 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
104
105 if (i != sz)
106 { 119 {
120 unsigned int sz = tw.size ();
121 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
122
123 if (i != sz)
124 {
107 if (i != sz - 1) 125 if (i != sz - 1)
108 tw[i] = tw[sz - 1]; 126 tw[i] = tw[sz - 1];
109 127
110 tw.pop_back (); 128 tw.pop_back ();
111 make_heap (tw.begin (), tw.end (), lowest_first); 129 reschedule_time_watchers ();
130 }
131
132 w->registered = false;
112 } 133 }
113} 134}
114 135
115inline void set_now (void) 136inline void set_now (void)
116{ 137{
… …
127 148
128 for (;;) 149 for (;;)
129 { 150 {
130 while (tw[0]->at <= NOW) 151 while (tw[0]->at <= NOW)
131 { 152 {
153 // remove the first watcher
154 time_watcher *w = tw[0];
155
132 pop_heap (tw.begin (), tw.end (), lowest_first); 156 pop_heap (tw.begin (), tw.end (), earliest_first);
133 time_watcher *w = *(tw.end () - 1);
134
135 if (w->at >= 0)
136 {
137 w->call (w->at);
138 push_heap (tw.begin (), tw.end (), lowest_first);
139 }
140 else
141 tw.pop_back (); 157 tw.pop_back ();
158
159 w->registered = false;
160
161 // call it
162 w->call (*w);
163
164 // re-add it if necessary
165 if (w->at >= 0 && !w->registered)
166 reg (w);
142 } 167 }
143 168
144 int timeout = (int) ((tw[0]->at - NOW) * 1000); 169 int timeout = (int) ((tw[0]->at - NOW) * 1000);
145 170
146 int fds = poll (&pfs[0], pfs.size (), timeout); 171 int fds = poll (&pfs[0], pfs.size (), timeout);
147 172
148 set_now (); 173 set_now ();
149 174
150 for (unsigned int i = iow.size (); fds > 0 && 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)
151 if (pfs[i].revents) 181 if (p->revents)
152 { 182 {
153 --fds; 183 --fds;
154 iow[i]->call (pfs[i].revents); 184 (*w)->call (**w, p->revents);
155 } 185 }
156 } 186 }
157} 187}
158 188
159void io_manager::idle_cb (tstamp &ts) 189void io_manager::idle_cb (time_watcher &w)
160{ 190{
161 ts = NOW + 86400; // wake up every day, for no good reason 191 w.at = NOW + 86400; // wake up every day, for no good reason
162} 192}
163 193
164io_manager::io_manager () 194io_manager::io_manager ()
165{ 195{
166 set_now (); 196 set_now ();

Diff Legend

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