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.9 by pcg, Wed Apr 2 21:02:25 2003 UTC vs.
Revision 1.10 by pcg, Fri Apr 4 05:26:45 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
29tstamp NOW;
30bool iom_valid;
31io_manager iom;
32
29inline bool earliest_first (const time_watcher *a, const time_watcher *b) 33inline bool earliest_first (const time_watcher *a, const time_watcher *b)
30{ 34{
31 return a->at > b->at; 35 return a->at > b->at;
32} 36}
33
34tstamp NOW;
35
36io_manager iom;
37 37
38void time_watcher::set (tstamp when) 38void time_watcher::set (tstamp when)
39{ 39{
40 at = when; 40 at = when;
41 41
59{ 59{
60 if (!registered) 60 if (!registered)
61 iom.reg (this); 61 iom.reg (this);
62} 62}
63 63
64time_watcher::~time_watcher ()
65{
66 if (iom_valid)
67 iom.unreg (this);
68}
69
70io_watcher::~io_watcher ()
71{
72 if (iom_valid)
73 iom.unreg (this);
74}
75
64void io_manager::reg (io_watcher *w) 76void io_manager::reg (io_watcher *w)
65{ 77{
66 pollfd pfd; 78 pollfd pfd;
67
68 pfd.fd = w->fd;
69 pfd.events = w->events;
70 79
71 pfs.push_back (pfd); 80 pfs.push_back (pfd);
72 iow.push_back (w); 81 iow.push_back (w);
82
83 w->p = &(*(pfs.end () - 1));
73} 84}
74 85
75void io_manager::unreg (io_watcher *w) 86void io_manager::unreg (io_watcher *w)
76{ 87{
77 unsigned int sz = iow.size (); 88 if (w->p)
78 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
79
80 if (i != sz)
81 { 89 {
90 unsigned int sz = iow.size ();
91 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
92
93 assert (i != sz);
94
82 if (sz == 1) 95 if (sz == 1)
83 { 96 {
84 pfs.clear (); 97 pfs.clear ();
85 iow.clear (); 98 iow.clear ();
86 } 99 }
92 else 105 else
93 { 106 {
94 iow[i] = iow[sz - 1]; iow.pop_back (); 107 iow[i] = iow[sz - 1]; iow.pop_back ();
95 pfs[i] = pfs[sz - 1]; pfs.pop_back (); 108 pfs[i] = pfs[sz - 1]; pfs.pop_back ();
96 } 109 }
110
111 w->p = 0;
97 } 112 }
98} 113}
99 114
100void io_manager::reschedule_time_watchers () 115void io_manager::reschedule_time_watchers ()
101{ 116{
102 make_heap (tw.begin (), tw.end (), earliest_first); 117 make_heap (tw.begin (), tw.end (), earliest_first);
103} 118}
104 119
105void io_manager::reg (time_watcher *w) 120void io_manager::reg (time_watcher *w)
106{ 121{
107 if (w->registered)
108 slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher");
109
110 w->registered = true; 122 w->registered = true;
111 123
112 tw.push_back (w); 124 tw.push_back (w);
113 push_heap (tw.begin (), tw.end (), earliest_first); 125 push_heap (tw.begin (), tw.end (), earliest_first);
114} 126}
118 if (w->registered) 130 if (w->registered)
119 { 131 {
120 unsigned int sz = tw.size (); 132 unsigned int sz = tw.size ();
121 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin (); 133 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
122 134
123 if (i != sz) 135 assert (i != sz);
124 { 136
125 if (i != sz - 1) 137 if (i != sz - 1)
126 tw[i] = tw[sz - 1]; 138 tw[i] = tw[sz - 1];
127 139
128 tw.pop_back (); 140 tw.pop_back ();
129 reschedule_time_watchers (); 141 reschedule_time_watchers ();
130 }
131 142
132 w->registered = false; 143 w->registered = false;
133 } 144 }
134} 145}
135 146
191 w.at = NOW + 86400; // wake up every day, for no good reason 202 w.at = NOW + 86400; // wake up every day, for no good reason
192} 203}
193 204
194io_manager::io_manager () 205io_manager::io_manager ()
195{ 206{
207 iom_valid = true;
208
196 set_now (); 209 set_now ();
197 idle = new time_watcher (this, &io_manager::idle_cb); 210 idle = new time_watcher (this, &io_manager::idle_cb);
198 idle->start (0); 211 idle->start (0);
199} 212}
200 213
201io_manager::~io_manager () 214io_manager::~io_manager ()
202{ 215{
203 // 216 iom_valid = false;
204} 217}
205 218

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines