mirror of
https://github.com/libevent/libevent.git
synced 2025-01-09 00:56:20 +08:00
f74e7258fd
This is one of those patches which will either make matters far simpler after the bugs shake out, or will get reverted pretty quick once we realize that it is a stupid idea. We now post-process the config.h file into a new event-config.h file, whose macros are prefixed with _EVENT_ and which is thus safe for headers to include. Using this, we can define replacement timeval manipulation functions in evutil.h, and use them uniformly through our code. We can also detect which headers are needful in event.h, and include them as required. This is also the perfect time to remove the long-deprecated acconfig.h file, so that autoheader no longer warns. Should resolve the following issues: [ 1826530 ] Header files should have access to autoconf output. [ 1826545 ] acconfig.h is deprecated. [ 1826564 ] On some platforms, event.h can't be included alone. svn:r492
117 lines
3.7 KiB
C
117 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 2007 Niels Provos <provos@citi.umich.edu>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifndef _EVUTIL_H_
|
|
#define _EVUTIL_H_
|
|
|
|
/** @file evutil.h
|
|
|
|
Common convenience functions for cross-platform portability and
|
|
related socket manipulations.
|
|
|
|
*/
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <event-config.h>
|
|
#ifdef _EVENT_HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
|
|
int evutil_socketpair(int d, int type, int protocol, int sv[2]);
|
|
int evutil_make_socket_nonblocking(int sock);
|
|
#ifdef WIN32
|
|
#define EVUTIL_CLOSESOCKET(s) closesocket(s)
|
|
#else
|
|
#define EVUTIL_CLOSESOCKET(s) close(s)
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
#define EVUTIL_SOCKET_ERROR() WSAGetLastError()
|
|
#define EVUTIL_SET_SOCKET_ERROR(errcode) \
|
|
do { WSASetLastError(errcode); } while (0)
|
|
#else
|
|
#define EVUTIL_SOCKET_ERROR() (errno)
|
|
#define EVUTIL_SET_SOCKET_ERROR(errcode) \
|
|
do { errno = (errcode); } while (0)
|
|
#endif
|
|
|
|
/*
|
|
* Manipulation functions for struct timeval
|
|
*/
|
|
#ifdef _EVENT_HAVE_TIMERADD
|
|
#define evutil_timeradd(tvp, uvp, vvp) timeradd((tvp), (uvp), (vvp))
|
|
#define evutil_timersub(tvp, uvp, vvp) timersub((tvp), (uvp), (vvp))
|
|
#else
|
|
#define evutil_timeradd(tvp, uvp, vvp) \
|
|
do { \
|
|
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
|
|
(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
|
|
if ((vvp)->tv_usec >= 1000000) { \
|
|
(vvp)->tv_sec++; \
|
|
(vvp)->tv_usec -= 1000000; \
|
|
} \
|
|
} while (0)
|
|
#define evutil_timersub(tvp, uvp, vvp) \
|
|
do { \
|
|
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
|
|
(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
|
|
if ((vvp)->tv_usec < 0) { \
|
|
(vvp)->tv_sec--; \
|
|
(vvp)->tv_usec += 1000000; \
|
|
} \
|
|
} while (0)
|
|
#endif /* !_EVENT_HAVE_HAVE_TIMERADD */
|
|
|
|
#ifdef _EVENT_HAVE_TIMERCLEAR
|
|
#define evutil_timerclear(tvp) timerclear(tvp)
|
|
#else
|
|
#define evutil_timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
|
|
#endif
|
|
|
|
#ifdef _EVENT_HAVE_TIMERCMP
|
|
#define evutil_timercmp(tvp, uvp, cmp) timercmp((tvp), (uvp), cmp)
|
|
#else
|
|
#define evutil_timercmp(tvp, uvp, cmp) \
|
|
(((tvp)->tv_sec == (uvp)->tv_sec) ? \
|
|
((tvp)->tv_usec cmp (uvp)->tv_usec) : \
|
|
((tvp)->tv_sec cmp (uvp)->tv_sec))
|
|
#endif
|
|
|
|
#ifdef _EVENT_HAVE_TIMERISSET
|
|
#define evutil_timerisset(tvp) timerisset(tvp)
|
|
#else
|
|
#define evutil_timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _EVUTIL_H_ */
|