* eventxx::dispatcher& d;
* int i;
* handler(eventxx::dispatcher& d): d(d), i(0) {}
- * void operator() (int signum, short event)
+ * void operator() (int signum, eventxx::type event)
* {
* if (i < 5) std::cout << "keep going...\n";
* else
* patch your libevent (for example, using this <a
* href="http://monkeymail.org/archives/libevent-users/2006-April/000141.html">patch</a>
* written by Mark D. Anderson, and who knows why it's not still applied). If
- * you do so, you can compile your programs with @c -DEVENT_BASE_FREE_FIX so
- * @c event_base_free() gets called in the eventxx::dispatcher @link
+ * you do so, you can compile your programs with @c -DEVENTXX_EVENT_BASE_FREE_FIX
+ * so @c event_base_free() gets called in the eventxx::dispatcher @link
* eventxx::dispatcher::~dispatcher() destructor @endlink.
*
* That said, I think it's still pretty usable anyways. If something is broken
*
* @author Leandro Lucarella <llucax+eventxx@gmail.com>
*
- * @version 0.2
+ * @version 0.4
*
* @par License
* This program is under the BOLA license (see
};
-/// C function used as callback in the C API.
-typedef void (*ccallback_type)(int, short, void*);
-
-
/**
* Time used for timeout values.
*
* A member function wrapper functor (eventxx::mem_cb) is also included,
* so you can use any member function (method) as an event handler.
*
+ * Please note that C-like function callback take a short as the type of event,
+ * while functors (or member functions) use eventxx::type.
+ *
* All events derive from a plain class (not template) eventxx::basic_event, one
* of the main utilities of it (besides containing common code ;) is to be used
* in STL containers.
*/
//@{
+
+/// C function used as callback in the C API.
+typedef void (*ccallback_type)(int, short, void*);
+
+
/**
* Type of events.
*
PERSIST = EV_PERSIST ///< Not really an event, is an event modifier.
};
+inline
+type operator| (const type& t1, const type& t2)
+{
+ int r = static_cast< int >(t1) | static_cast< int >(t2);
+ return *reinterpret_cast< type* >(&r);
+}
+
+
/**
* Basic event from which all events derive.
*
* @param ev Type of events to monitor (see eventxx::type).
* @param handler Callback functor.
*/
- event(int fd, short ev, F& handler) throw()
+ event(int fd, type ev, F& handler) throw()
{
- event_set(this, fd, ev, &wrapper,
+ event_set(this, fd, static_cast< short >(ev), &wrapper,
reinterpret_cast< void* >(&handler));
}
* @param handler C-style callback function.
* @param arg Arbitrary pointer to pass to the handler as argument.
*/
- event(int fd, short ev, ccallback_type handler, void* arg = 0) throw()
+ event(int fd, type ev, ccallback_type handler, void* arg = 0) throw()
{
- event_set(this, fd, ev, handler, arg);
+ event_set(this, fd, static_cast< short >(ev), handler, arg);
}
protected:
template < typename O, typename M >
struct mem_cb
{
+
/**
* Member function callback constructor.
*
*/
mem_cb(O& object, M method) throw():
_object(object), _method(method) {}
- void operator() (int fd, short ev) { (_object.*_method)(fd, ev); }
+
+ void operator() (int fd, type ev) { (_object.*_method)(fd, ev); }
protected:
O& _object;
M _method;
+
}; // struct mem_cb
//@}
internal::event_base_priority_init(_event_base, npriorities);
}
-#ifdef EVENT_BASE_FREE_FIX
+#ifdef EVENTXX_BASE_FREE_FIX
/// Free dispatcher resources, see @ref Status section for details.
~dispatcher() throw() { event_base_free(_event_base); }
#else
+#ifndef EVENTXX_NO_WARNING
#warning "The dispatcher class *will* leak memory because of a libevent bug, " \
"see http://www.mail-archive.com/libevent-users@monkey.org/msg00110.html " \
"for more info an a patch. If you already have this patch, please " \
- "-DEVENT_BASE_FREE_FIX to your compiler to make this message disappear " \
+ "-DEVENTXX_EVENT_BASE_FREE_FIX to your compiler to make this message disappear " \
"and really free the dispatcher memory using event_base_free()."
+#endif
#endif
/**
template < typename F >
void add_once(int fd, type ev, F& handler)
{
- internal::event_once(fd, ev, &dispatcher::wrapper< F >,
- reinterpret_cast< void* >(&handler), 0);
+ internal::event_once(fd, static_cast< short>(ev),
+ &dispatcher::wrapper< F >,
+ reinterpret_cast< void* >(&handler), 0);
}
/**
*/
void add_once(int fd, type ev, ccallback_type handler, void* arg)
{
- internal::event_once(fd, ev, handler, arg, 0);
+ internal::event_once(fd, static_cast< short >(ev), handler,
+ arg, 0);
}
/**
template < typename F >
void add_once(int fd, type ev, F& handler, const time& to)
{
- internal::event_once(fd, ev, &dispatcher::wrapper< F >,
- reinterpret_cast< void* >(&handler),
- // XXX HACK libevent don't use const
- const_cast< time* >(&to));
+ internal::event_once(fd, static_cast< short >(ev),
+ &dispatcher::wrapper< F >,
+ reinterpret_cast< void* >(&handler),
+ // XXX HACK libevent don't use const
+ const_cast< time* >(&to));
}
/**
void add_once(int fd, type ev, ccallback_type handler, void* arg,
const time& to)
{
- internal::event_once(fd, ev, handler, arg,
+ internal::event_once(fd, static_cast< short >(ev), handler, arg,
// XXX HACK libevent don't use const
const_cast< time* >(&to));
}
protected:
internal::event_base* _event_base;
template < typename F >
- static void wrapper(int fd, type ev, void* h)
+ static void wrapper(int fd, short ev, void* h)
{
F& handler = *reinterpret_cast< F* >(h);
handler(fd, *reinterpret_cast< type* >(&ev));
projects / software / eventxx.git / blobdiff