You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/05/13 23:27:17 UTC
[2/2] git commit: remove obsolete USE_OLD_EVENTFD build option
remove obsolete USE_OLD_EVENTFD build option
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bc910ece
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bc910ece
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bc910ece
Branch: refs/heads/master
Commit: bc910ecea265e8fb889a2ccfb3aec79071dc658a
Parents: 9f9ba07
Author: James Peach <jp...@apache.org>
Authored: Mon May 13 14:26:18 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon May 13 14:26:18 2013 -0700
----------------------------------------------------------------------
iocore/eventsystem/I_EThread.h | 4 +---
iocore/eventsystem/P_UnixEThread.h | 8 --------
iocore/net/P_UnixNetProcessor.h | 4 +---
lib/ts/ink_thread.h | 8 --------
4 files changed, 2 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bc910ece/iocore/eventsystem/I_EThread.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 52837a2..11c00ff 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -318,9 +318,7 @@ public:
unsigned int event_types;
bool is_event_type(EventType et);
void set_event_type(EventType et);
-#if defined(USE_OLD_EVENTFD)
- int getEventFd();
-#endif
+
// Private Interface
void execute();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bc910ece/iocore/eventsystem/P_UnixEThread.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_UnixEThread.h b/iocore/eventsystem/P_UnixEThread.h
index ae7f06a..462de69 100644
--- a/iocore/eventsystem/P_UnixEThread.h
+++ b/iocore/eventsystem/P_UnixEThread.h
@@ -170,12 +170,4 @@ EThread::free_event(Event * e)
EVENT_FREE(e, eventAllocator, this);
}
-#if defined(USE_OLD_EVENTFD)
-TS_INLINE int
-EThread::getEventFd()
-{
- return EventQueueExternal.getReadFd();
-}
-#endif
-
#endif /*_EThread_h_*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bc910ece/iocore/net/P_UnixNetProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNetProcessor.h b/iocore/net/P_UnixNetProcessor.h
index b2f62ab..bd25e13 100644
--- a/iocore/net/P_UnixNetProcessor.h
+++ b/iocore/net/P_UnixNetProcessor.h
@@ -97,8 +97,6 @@ extern UnixNetProcessor unix_netProcessor;
// accept such events by the EventProcesor.
//
extern void initialize_thread_for_net(EThread * thread, int thread_index);
-#if defined(USE_OLD_EVENTFD)
-extern void initialize_eventfd(EThread * thread);
-#endif
+
//#include "UnixNet.h"
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bc910ece/lib/ts/ink_thread.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h
index 25fc59a..50b1ff4 100644
--- a/lib/ts/ink_thread.h
+++ b/lib/ts/ink_thread.h
@@ -307,14 +307,6 @@ ink_thread_exit(void *status)
pthread_exit(status);
}
-#if defined(USE_OLD_EVENTFD)
-static inline void
-ink_create_pipe( int pfd[2])
-{
- ink_assert(pipe(pfd)==0);
-}
-#endif
-
// This define is from Linux's <sys/prctl.h> and is most likely very
// Linux specific... Feel free to add support for other platforms
// that has a feature to give a thread specific name / tag.