ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/iom.h
(Generate patch)

Comparing rxvt-unicode/src/iom.h (file contents):
Revision 1.15 by root, Thu Sep 2 07:44:40 2004 UTC vs.
Revision 1.24 by root, Mon Jan 9 22:41:41 2006 UTC

1/* 1/*
2 iom.h -- generic I/O multiplexor 2 iom.h -- generic I/O multiplexer
3 Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003, 2004 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#ifndef IOM_H__ 22#ifndef IOM_H__
21#define IOM_H__ 23#define IOM_H__
22 24
… …
45#endif 47#endif
46 48
47typedef double tstamp; 49typedef double tstamp;
48extern tstamp NOW; 50extern tstamp NOW;
49 51
52// TSTAMP_MAX must still fit into a positive struct timeval
53#define TSTAMP_MAX (double)(1UL<<31)
54
50struct watcher; 55struct watcher;
51#if IOM_IO 56#if IOM_IO
52struct io_watcher; 57struct io_watcher;
53#endif 58#endif
54#if IOM_TIME 59#if IOM_TIME
… …
64struct sig_watcher; 69struct sig_watcher;
65#endif 70#endif
66 71
67template<class watcher> 72template<class watcher>
68struct io_manager_vec : vector<watcher *> { 73struct io_manager_vec : vector<watcher *> {
69#if IOM_CHECK
70 bool activity;
71#endif
72
73 void erase_unordered (unsigned int pos) 74 void erase_unordered (unsigned int pos)
74 { 75 {
75 watcher *w = (*this)[this->size () - 1]; 76 watcher *w = (*this)[this->size () - 1];
76 this->pop_back (); 77 this->pop_back ();
77 78
78 if (this->size ()) 79 if (!this->empty ())
79 if ((*this)[pos] = w) 80 if (((*this)[pos] = w)) // '=' is correct!
80 w->active = pos + 1; 81 w->active = pos + 1;
81 } 82 }
82}; 83};
83 84
84// only used as a namespace, and for initialisation purposes 85// only used as a namespace, and for initialisation purposes
… …
88 89
89 template<class watcher> 90 template<class watcher>
90 static void unreg (watcher &w, io_manager_vec<watcher> &queue); 91 static void unreg (watcher &w, io_manager_vec<watcher> &queue);
91 92
92public: 93public:
94#if IOM_TIME
95 // fetch time only
96 static tstamp now ();
97
98 // set NOW
99 static void set_now ();
100#endif
101
93 // register a watcher 102 // register a watcher
94#if IOM_IO 103#if IOM_IO
95 static void reg (io_watcher &w); static void unreg (io_watcher &w); 104 static void reg (io_watcher &w); static void unreg (io_watcher &w);
96#endif 105#endif
97#if IOM_TIME 106#if IOM_TIME
… …
115 124
116 watcher () : active (0) { } 125 watcher () : active (0) { }
117}; 126};
118 127
119#if IOM_IO 128#if IOM_IO
120enum { EVENT_READ = 1, EVENT_WRITE = 2 }; 129enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
121 130
122struct io_watcher : watcher, callback2<void, io_watcher &, short> { 131struct io_watcher : watcher, callback2<void, io_watcher &, short> {
123 int fd; 132 int fd;
124 short events; 133 short events;
125 134

Diff Legend

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