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.3 by pcg, Fri Mar 21 21:21:02 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);
46}
47
48void time_watcher::trigger ()
49{
50 call (at);
51
52 if (registered)
53 iom.reschedule_time_watchers ();
54 else
55 iom.reg (this);
56}
57
58void time_watcher::start ()
59{
60 if (!registered)
61 iom.reg (this);
43} 62}
44 63
45void io_manager::reg (int fd, short events, io_watcher *w) 64void io_manager::reg (int fd, short events, io_watcher *w)
46{ 65{
47 pollfd pfd; 66 pollfd pfd;
… …
51 70
52 pfs.push_back (pfd); 71 pfs.push_back (pfd);
53 iow.push_back (w); 72 iow.push_back (w);
54} 73}
55 74
56void io_manager::unreg (io_watcher *w) 75void io_manager::unreg (const io_watcher *w)
57{ 76{
58 unsigned int sz = iow.size (); 77 unsigned int sz = iow.size ();
59 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin (); 78 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
60 79
61 if (i != sz) 80 if (i != sz)
… …
76 pfs[i] = pfs[sz - 1]; pfs.pop_back (); 95 pfs[i] = pfs[sz - 1]; pfs.pop_back ();
77 } 96 }
78 } 97 }
79} 98}
80 99
100void io_manager::reschedule_time_watchers ()
101{
102 make_heap (tw.begin (), tw.end (), lowest_first);
103}
104
81void io_manager::reg (time_watcher *w) 105void io_manager::reg (time_watcher *w)
82{ 106{
107 if (w->registered)
108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher");
109
83 tw.push_back (w); 110 tw.push_back (w);
84 push_heap (tw.begin (), tw.end (), lowest_first); 111 push_heap (tw.begin (), tw.end (), lowest_first);
85} 112}
86 113
87void io_manager::unreg (time_watcher *w) 114void io_manager::unreg (const time_watcher *w)
88{ 115{
89 unsigned int sz = tw.size (); 116 unsigned int sz = tw.size ();
90 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin (); 117 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
91 118
92 if (i != sz) 119 if (i != sz)
93 { 120 {
94 if (sz == 1)
95 tw.clear ();
96 else
97 {
98 if (i != sz - 1) 121 if (i != sz - 1)
99 tw[i] = tw[sz - 1]; 122 tw[i] = tw[sz - 1];
100 123
101 tw.pop_back (); 124 tw.pop_back ();
102 make_heap (tw.begin (), tw.end (), lowest_first); 125 reschedule_time_watchers ();
103 }
104 } 126 }
105} 127}
106 128
107inline void set_now (void) 129inline void set_now (void)
108{ 130{
… …
115 137
116void io_manager::loop () 138void io_manager::loop ()
117{ 139{
118 set_now (); 140 set_now ();
119 141
120 while (!(iow.empty () && tw.empty ())) 142 for (;;)
121 { 143 {
122 int timeout = tw.empty () 144 while (tw[0]->at <= NOW)
123 ? 3600 * 1000 // wake up at least every hour 145 {
124 : (int) ((tw[0]->at - NOW) * 1000); 146 pop_heap (tw.begin (), tw.end (), lowest_first);
147 time_watcher *w = *(tw.end () - 1);
148 tw.pop_back ();
125 149
126 printf ("s%d t%d #%d\n", pfs.size (), timeout, tw.size ()); 150 if (w->at >= 0)
151 {
152 w->call (w->at);
127 153
128 if (timeout >= 0) 154 if (!w->registered)
129 { 155 reg (w);
130 int fds = poll (&pfs[0], pfs.size (), timeout);
131
132 set_now ();
133
134 for (unsigned int i = iow.size (); fds && i--; )
135 if (pfs[i].revents)
136 {
137 --fds;
138 iow[i]->call (pfs[i].revents);
139 } 156 }
140 } 157 }
141 158
142 while (!tw.empty () && tw[0]->at <= NOW) 159 int timeout = (int) ((tw[0]->at - NOW) * 1000);
160
161 int fds = poll (&pfs[0], pfs.size (), timeout);
162
163 set_now ();
164
165 for (unsigned int i = iow.size (); fds > 0 && i--; )
166 if (pfs[i].revents)
143 { 167 {
144 pop_heap (tw.begin (), tw.end (), lowest_first); 168 --fds;
145 (*(tw.end () - 1))->trigger (); 169 iow[i]->call (pfs[i].revents);
146 push_heap (tw.begin (), tw.end (), lowest_first);
147 } 170 }
148 } 171 }
172}
173
174void io_manager::idle_cb (tstamp &ts)
175{
176 ts = NOW + 86400; // wake up every day, for no good reason
149} 177}
150 178
151io_manager::io_manager () 179io_manager::io_manager ()
152{ 180{
153 set_now (); 181 set_now ();
182 idle = new time_watcher (this, &io_manager::idle_cb);
183 idle->start (0);
154} 184}
155 185
156io_manager::~io_manager () 186io_manager::~io_manager ()
157{ 187{
158 // 188 //

Diff Legend

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