You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/24 16:57:48 UTC
svn commit: r947662 - in /trafficserver/traffic/trunk/iocore/eventsystem:
I_SocketManager.h P_UnixSocketManager.h
Author: mturk
Date: Mon May 24 14:57:47 2010
New Revision: 947662
URL: http://svn.apache.org/viewvc?rev=947662&view=rev
Log:
Rename forgotten feature defines
Modified:
trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h
trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h?rev=947662&r1=947661&r2=947662&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_SocketManager.h Mon May 24 14:57:47 2010
@@ -79,23 +79,25 @@ struct SocketManager
int ftruncate(int fildes, off_t length);
int lockf(int fildes, int function, long size);
int poll(struct pollfd *fds, unsigned long nfds, int timeout);
-#if defined(USE_EPOLL)
+#if ATS_USE_EPOLL
int epoll_create(int size);
int epoll_close(int eps);
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event);
int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout);
-#elif defined(USE_KQUEUE)
+#endif
+#if ATS_USE_KQUEUE
int kqueue();
int kevent(int kq, const struct kevent *changelist, int nchanges,
struct kevent *eventlist, int nevents,
const struct timespec *timeout);
-#elif defined(USE_PORT)
+#endif
+#if ATS_USE_PORT
int port_create();
int port_associate(int port, int fd, uintptr_t obj,
- int events, void *user);
+ int events, void *user);
int port_dissociate(int port, int fd, uintptr_t obj);
int port_getn(int port, port_event_t *list, uint_t max,
- uint_t *nget, timespec_t *timeout);
+ uint_t *nget, timespec_t *timeout);
#endif
int shutdown(int s, int how);
int dup(int s);
Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h?rev=947662&r1=947661&r2=947662&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h Mon May 24 14:57:47 2010
@@ -338,7 +338,7 @@ SocketManager::poll(struct pollfd *fds,
return r;
}
-#if defined(USE_EPOLL)
+#if ATS_USE_EPOLL
TS_INLINE int
SocketManager::epoll_create(int size)
{
@@ -391,7 +391,9 @@ SocketManager::epoll_wait(int epfd, stru
return r;
}
-#elif defined(USE_KQUEUE)
+#endif /* ATS_USE_EPOLL */
+
+#if ATS_USE_KQUEUE
TS_INLINE int
SocketManager::kqueue()
{
@@ -414,7 +416,9 @@ SocketManager::kevent(int kq, const stru
} while (errno == -EINTR);
return r;
}
-#elif defined(USE_PORT)
+#endif /* ATS_USE_KQUEUE */
+
+#if ATS_USE_PORT
TS_INLINE int
SocketManager::port_create()
{
@@ -454,7 +458,7 @@ SocketManager::port_getn(int port, port_
} while (errno == -EINTR); //TODO: possible EAGAIN(undocumented)
return r;
}
-#endif /* USE_PORT */
+#endif /* ATS_USE_PORT */
TS_INLINE int