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

Comparing gvpe/src/iom.h (file contents):
Revision 1.21 by pcg, Thu Sep 2 07:50:43 2004 UTC vs.
Revision 1.27 by pcg, Thu Mar 3 16:54:34 2005 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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#ifndef IOM_H__ 22#ifndef IOM_H__
21#define IOM_H__ 23#define IOM_H__
64struct sig_watcher; 66struct sig_watcher;
65#endif 67#endif
66 68
67template<class watcher> 69template<class watcher>
68struct io_manager_vec : vector<watcher *> { 70struct io_manager_vec : vector<watcher *> {
69#if IOM_CHECK
70 bool activity;
71#endif
72
73 void erase_unordered (unsigned int pos) 71 void erase_unordered (unsigned int pos)
74 { 72 {
75 watcher *w = (*this)[this->size () - 1]; 73 watcher *w = (*this)[this->size () - 1];
76 this->pop_back (); 74 this->pop_back ();
77 75
78 if (this->size ()) 76 if (!this->empty ())
79 if ((*this)[pos] = w) 77 if (((*this)[pos] = w)) // '=' is correct!
80 w->active = pos + 1; 78 w->active = pos + 1;
81 } 79 }
82}; 80};
83 81
84// only used as a namespace, and for initialisation purposes 82// only used as a namespace, and for initialisation purposes
88 86
89 template<class watcher> 87 template<class watcher>
90 static void unreg (watcher &w, io_manager_vec<watcher> &queue); 88 static void unreg (watcher &w, io_manager_vec<watcher> &queue);
91 89
92public: 90public:
91#if IOM_TIME
92 // fetch time only
93 static tstamp now ();
94
95 // set NOW
96 static void set_now ();
97#endif
98
93 // register a watcher 99 // register a watcher
94#if IOM_IO 100#if IOM_IO
95 static void reg (io_watcher &w); static void unreg (io_watcher &w); 101 static void reg (io_watcher &w); static void unreg (io_watcher &w);
96#endif 102#endif
97#if IOM_TIME 103#if IOM_TIME

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines