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.10 by pcg, Fri Apr 4 05:26:45 2003 UTC vs.
Revision 1.11 by pcg, Sat Apr 5 02:32:40 2003 UTC

21#include <sys/time.h> 21#include <sys/time.h>
22 22
23#include <algorithm> 23#include <algorithm>
24#include <functional> 24#include <functional>
25 25
26#include "gettext.h"
27
26#include "slog.h" 28#include "slog.h"
27#include "iom.h" 29#include "iom.h"
28 30
29tstamp NOW; 31tstamp NOW;
30bool iom_valid; 32bool iom_valid;
36} 38}
37 39
38void time_watcher::set (tstamp when) 40void time_watcher::set (tstamp when)
39{ 41{
40 at = when; 42 at = when;
43
44 if (registered)
45 iom.reschedule_time_watchers ();
46}
47
48void time_watcher::trigger ()
49{
50 call (*this);
41 51
42 if (registered) 52 if (registered)
43 iom.reschedule_time_watchers (); 53 iom.reschedule_time_watchers ();
44 else 54 else
45 iom.reg (this); 55 iom.reg (this);
46} 56}
47 57
48void time_watcher::trigger ()
49{
50 call (*this);
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);
62}
63
64time_watcher::~time_watcher () 58time_watcher::~time_watcher ()
65{ 59{
66 if (iom_valid) 60 if (iom_valid)
67 iom.unreg (this); 61 iom.unreg (this);
68} 62}
69 63
64void io_watcher::set(int fd_, short events_)
65{
66 fd = fd_;
67 events = events_;
68
69 if (registered)
70 {
71 iom.unreg (this);
72 iom.reg (this);
73 }
74}
75
70io_watcher::~io_watcher () 76io_watcher::~io_watcher ()
71{ 77{
72 if (iom_valid) 78 if (iom_valid)
73 iom.unreg (this); 79 iom.unreg (this);
74} 80}
75 81
76void io_manager::reg (io_watcher *w) 82void io_manager::reg (io_watcher *w)
77{ 83{
84 if (!w->registered)
85 {
86 w->registered = true;
87
78 pollfd pfd; 88 pollfd pfd;
79 89
90 pfd.fd = w->fd;
91 pfd.events = w->events;
92
80 pfs.push_back (pfd); 93 pfs.push_back (pfd);
81 iow.push_back (w); 94 iow.push_back (w);
82 95 }
83 w->p = &(*(pfs.end () - 1));
84} 96}
85 97
86void io_manager::unreg (io_watcher *w) 98void io_manager::unreg (io_watcher *w)
87{ 99{
88 if (w->p) 100 if (w->registered)
89 { 101 {
102 w->registered = false;
103
90 unsigned int sz = iow.size (); 104 unsigned int sz = iow.size ();
91 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin (); 105 unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
92 106
93 assert (i != sz); 107 assert (i != sz);
94 108
105 else 119 else
106 { 120 {
107 iow[i] = iow[sz - 1]; iow.pop_back (); 121 iow[i] = iow[sz - 1]; iow.pop_back ();
108 pfs[i] = pfs[sz - 1]; pfs.pop_back (); 122 pfs[i] = pfs[sz - 1]; pfs.pop_back ();
109 } 123 }
110
111 w->p = 0;
112 } 124 }
113} 125}
114 126
115void io_manager::reschedule_time_watchers () 127void io_manager::reschedule_time_watchers ()
116{ 128{
117 make_heap (tw.begin (), tw.end (), earliest_first); 129 make_heap (tw.begin (), tw.end (), earliest_first);
118} 130}
119 131
120void io_manager::reg (time_watcher *w) 132void io_manager::reg (time_watcher *w)
121{ 133{
134 if (!w->registered)
135 {
122 w->registered = true; 136 w->registered = true;
123 137
124 tw.push_back (w); 138 tw.push_back (w);
125 push_heap (tw.begin (), tw.end (), earliest_first); 139 push_heap (tw.begin (), tw.end (), earliest_first);
140 }
126} 141}
127 142
128void io_manager::unreg (time_watcher *w) 143void io_manager::unreg (time_watcher *w)
129{ 144{
130 if (w->registered) 145 if (w->registered)
131 { 146 {
147 w->registered = false;
148
132 unsigned int sz = tw.size (); 149 unsigned int sz = tw.size ();
133 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin (); 150 unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
134 151
135 assert (i != sz); 152 assert (i != sz);
136 153
137 if (i != sz - 1) 154 if (i != sz - 1)
138 tw[i] = tw[sz - 1]; 155 tw[i] = tw[sz - 1];
139 156
140 tw.pop_back (); 157 tw.pop_back ();
141 reschedule_time_watchers (); 158 reschedule_time_watchers ();
142
143 w->registered = false;
144 } 159 }
145} 160}
146 161
147inline void set_now (void) 162inline void set_now (void)
148{ 163{
190 fds > 0 && w < iow.end (); 205 fds > 0 && w < iow.end ();
191 ++w, ++p) 206 ++w, ++p)
192 if (p->revents) 207 if (p->revents)
193 { 208 {
194 --fds; 209 --fds;
210
211 if (p->revents & POLLNVAL)
212 {
213 slog (L_ERR, _("io_watcher started on illegal file descriptor, disabling."));
214 (*w)->stop ();
215 }
216 else
195 (*w)->call (**w, p->revents); 217 (*w)->call (**w, p->revents);
196 } 218 }
197 } 219 }
198} 220}
199 221
200void io_manager::idle_cb (time_watcher &w) 222void io_manager::idle_cb (time_watcher &w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines