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.5 by pcg, Wed Mar 26 01:58:46 2003 UTC vs.
Revision 1.8 by pcg, Wed Apr 2 05:15:00 2003 UTC

… …
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 (at);
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 (int fd, short events, io_watcher *w)
59{ 65{
60 pollfd pfd; 66 pollfd pfd;
… …
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
69void io_manager::unreg (const io_watcher *w) 75void io_manager::unreg (io_watcher *w)
70{ 76{
71 unsigned int sz = iow.size (); 77 unsigned int sz = iow.size ();
72 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin (); 78 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
73 79
74 if (i != sz) 80 if (i != sz)
… …
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 (), lowest_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 (), lowest_first);
98} 114}
99 115
100void io_manager::unreg (const 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 (), lowest_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->at);
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 for (unsigned int i = 0; fds > 0 && i < iow.size (); ++i)
151 if (pfs[i].revents) 176 if (pfs[i].revents)
152 { 177 {
153 --fds; 178 --fds;
154 iow[i]->call (pfs[i].revents); 179 iow[i]->call (pfs[i].fd, pfs[i].revents);
155 } 180 }
156 } 181 }
157} 182}
158 183
159void io_manager::idle_cb (tstamp &ts) 184void io_manager::idle_cb (tstamp &ts)

Diff Legend

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