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.6 by pcg, Fri Mar 28 04:05:10 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;
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
96 tw.push_back (w); 110 tw.push_back (w);
97 push_heap (tw.begin (), tw.end (), lowest_first); 111 push_heap (tw.begin (), tw.end (), lowest_first);
98} 112}
99 113
100void io_manager::unreg (const time_watcher *w) 114void io_manager::unreg (const time_watcher *w)
106 { 120 {
107 if (i != sz - 1) 121 if (i != sz - 1)
108 tw[i] = tw[sz - 1]; 122 tw[i] = tw[sz - 1];
109 123
110 tw.pop_back (); 124 tw.pop_back ();
111 make_heap (tw.begin (), tw.end (), lowest_first); 125 reschedule_time_watchers ();
112 } 126 }
113} 127}
114 128
115inline void set_now (void) 129inline void set_now (void)
116{ 130{
129 { 143 {
130 while (tw[0]->at <= NOW) 144 while (tw[0]->at <= NOW)
131 { 145 {
132 pop_heap (tw.begin (), tw.end (), lowest_first); 146 pop_heap (tw.begin (), tw.end (), lowest_first);
133 time_watcher *w = *(tw.end () - 1); 147 time_watcher *w = *(tw.end () - 1);
148 tw.pop_back ();
134 149
135 if (w->at >= 0) 150 if (w->at >= 0)
136 { 151 {
137 w->call (w->at); 152 w->call (w->at);
138 push_heap (tw.begin (), tw.end (), lowest_first); 153
154 if (!w->registered)
155 reg (w);
139 } 156 }
140 else
141 tw.pop_back ();
142 } 157 }
143 158
144 int timeout = (int) ((tw[0]->at - NOW) * 1000); 159 int timeout = (int) ((tw[0]->at - NOW) * 1000);
145 160
146 int fds = poll (&pfs[0], pfs.size (), timeout); 161 int fds = poll (&pfs[0], pfs.size (), timeout);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines