TS-2082: remove STANDALONE_IOCORE defines
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/51ce9aec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/51ce9aec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/51ce9aec Branch: refs/heads/5.0.x Commit: 51ce9aec5fe8edb129c4cf1df29accdac35c5222 Parents: d6ab748 Author: Zhao Yongming <ming....@gmail.com> Authored: Thu Nov 7 17:22:18 2013 +0800 Committer: Zhao Yongming <ming....@gmail.com> Committed: Sat Dec 7 14:29:31 2013 +0800 ---------------------------------------------------------------------- Makefile.am | 6 ++---- configure.ac | 27 +++------------------------ iocore/Makefile.am | 7 +------ iocore/aio/Makefile.am | 1 - iocore/cache/Makefile.am | 15 --------------- iocore/cluster/Makefile.am | 2 -- iocore/dns/DNS.cc | 2 -- iocore/dns/Makefile.am | 13 ------------- iocore/eventsystem/Makefile.am | 1 - iocore/hostdb/Makefile.am | 13 ------------- iocore/net/Makefile.am | 12 ------------ iocore/net/UnixNetProcessor.cc | 2 -- iocore/utils/Makefile.am | 2 -- lib/ts/ink_config.h.in | 6 +----- proxy/Makefile.am | 14 -------------- 15 files changed, 7 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 0ececb4..0ad9b06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,11 +28,9 @@ export CCACHE_BASEDIR # proxy/api/ts has to be built first, since so much of libraries and "core # depends on the generates ts/ts.h include file. -if STANDALONE_IOCORE -SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy plugins cmd tools example -else + SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy rc doc plugins cmd tools example -endif + DIST_BUILD_USER=`id -nu` DIST_BUILD_USER_GROUP=`id -ng` http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index c06c173..fd41a1b 100644 --- a/configure.ac +++ b/configure.ac @@ -228,30 +228,9 @@ AC_MSG_RESULT([$enable_micro]) AS_IF([test "x$enable_micro" = "xyes"], [is_micro_build=1], [is_micro_build=0]) AC_SUBST(is_micro_build) -# -# Standalone iocore -# -AC_MSG_CHECKING([whether to build a standalone iocore]) -AC_ARG_ENABLE([standalone-iocore], - [AS_HELP_STRING([--enable-standalone-iocore],[build just standalone iocore])], - [], - [enable_standalone_iocore=no] -) -AC_MSG_RESULT([$enable_standalone_iocore]) -TS_ARG_ENABLE_VAR([has],[standalone-iocore]) -AC_SUBST(has_standalone_iocore) -AS_IF([test 0 -ne $has_standalone_iocore], - [AC_SUBST([IOCORE_MODULARIZED_DEFS],[""]) - AC_SUBST([ink_with_modules_def],["-DREC_BUILD_STAND_ALONE"]) - AC_SUBST([ink_with_modules_local],[""]) - AC_SUBST([ink_with_modules_process],[""]) - ], - [AC_SUBST([ink_with_modules_def],["-DREC_BUILD_MGMT"]) - AC_SUBST([ink_with_modules_local],["-DLOCAL_MANAGER"]) - AC_SUBST([ink_with_modules_process],["-DPROCESS_MANAGER"]) - ] -) -AM_CONDITIONAL([STANDALONE_IOCORE], [test 0 -ne $has_standalone_iocore]) +AC_SUBST([ink_with_modules_def],["-DREC_BUILD_MGMT"]) +AC_SUBST([ink_with_modules_local],["-DLOCAL_MANAGER"]) +AC_SUBST([ink_with_modules_process],["-DPROCESS_MANAGER"]) # # Force some static linkage (for testing / development only) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/Makefile.am b/iocore/Makefile.am index 5178b56..cb597b6 100644 --- a/iocore/Makefile.am +++ b/iocore/Makefile.am @@ -16,9 +16,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -if STANDALONE_IOCORE -SUBDIRS = eventsystem net aio dns hostdb utils cache -else -SUBDIRS = eventsystem net aio dns hostdb utils cache cluster -endif - +SUBDIRS = eventsystem net aio dns hostdb utils cache cluster http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/aio/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index a19b04d..d270520 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -22,7 +22,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts -DEFS += @IOCORE_MODULARIZED_DEFS@ TESTS = test_AIO.sample noinst_LIBRARIES = libinkaio.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/cache/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am index c4faaa1..1ef08a6 100644 --- a/iocore/cache/Makefile.am +++ b/iocore/cache/Makefile.am @@ -16,17 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -if STANDALONE_IOCORE -AM_CPPFLAGS = \ - $(iocore_include_dirs) \ - -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts - -ADD_SRC = -else AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ @@ -48,10 +37,6 @@ if BUILD_TESTS ADD_SRC += CacheTest.cc P_CacheTest.h endif -endif - -DEFS += @IOCORE_MODULARIZED_DEFS@ - noinst_LIBRARIES = libinkcache.a libinkcache_a_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am index 1ffe089..7a09cf7 100644 --- a/iocore/cluster/Makefile.am +++ b/iocore/cluster/Makefile.am @@ -30,8 +30,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils -DEFS += @IOCORE_MODULARIZED_DEFS@ - noinst_LIBRARIES = libinkcluster.a libinkcluster_a_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/dns/DNS.cc ---------------------------------------------------------------------- diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc index ba24a8c..0a7d7cf 100644 --- a/iocore/dns/DNS.cc +++ b/iocore/dns/DNS.cc @@ -194,12 +194,10 @@ DNSProcessor::start(int, size_t stacksize) { dns_failover_try_period = dns_timeout + 1; // Modify the "default" accordingly -#ifndef STANDALONE_IOCORE if (SplitDNSConfig::gsplit_dns_enabled) { //reconfigure after threads start SplitDNSConfig::reconfigure(); } -#endif // Setup the default DNSHandler, it's used both by normal DNS, and SplitDNS (for PTR lookups etc.) dns_init(); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/dns/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am index 3d5e59f..5a002fd 100644 --- a/iocore/dns/Makefile.am +++ b/iocore/dns/Makefile.am @@ -16,16 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -if STANDALONE_IOCORE -AM_CPPFLAGS = \ - $(iocore_include_dirs) \ - -I. \ - -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts -else AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ @@ -37,9 +27,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/mgmt/preparse -endif - -DEFS += @IOCORE_MODULARIZED_DEFS@ noinst_LIBRARIES = libinkdns.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/eventsystem/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am index c75f5f5..7d43def 100644 --- a/iocore/eventsystem/Makefile.am +++ b/iocore/eventsystem/Makefile.am @@ -21,7 +21,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts -DEFS += @IOCORE_MODULARIZED_DEFS@ TESTS = $(check_PROGRAMS) noinst_LIBRARIES = libinkevent.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/hostdb/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am index 90381d7..1ad06f7 100644 --- a/iocore/hostdb/Makefile.am +++ b/iocore/hostdb/Makefile.am @@ -16,15 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -if STANDALONE_IOCORE -AM_CPPFLAGS = \ - $(iocore_include_dirs) \ - -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts -else AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ @@ -36,10 +27,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/mgmt/preparse -endif - - -DEFS += @IOCORE_MODULARIZED_DEFS@ EXTRA_DIST = I_HostDB.h http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/net/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am index b19c36b..b3e1d52 100644 --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@ -16,15 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -if STANDALONE_IOCORE -AM_CPPFLAGS = \ - $(iocore_include_dirs) \ - -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts -else AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ @@ -36,10 +27,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils -endif - -DEFS += @IOCORE_MODULARIZED_DEFS@ TESTS = $(check_PROGRAMS) check_PROGRAMS = test_certlookup http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/net/UnixNetProcessor.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNetProcessor.cc b/iocore/net/UnixNetProcessor.cc index 5ff4087..b3b121c 100644 --- a/iocore/net/UnixNetProcessor.cc +++ b/iocore/net/UnixNetProcessor.cc @@ -406,10 +406,8 @@ UnixNetProcessor::start(int, size_t) netthreads = eventProcessor.eventthread[etype]; for (int i = 0; i < n_netthreads; ++i) { initialize_thread_for_net(netthreads[i]); -#ifndef STANDALONE_IOCORE extern void initialize_thread_for_http_sessions(EThread *thread, int thread_index); initialize_thread_for_http_sessions(netthreads[i], i); -#endif } RecData d; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/iocore/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am index 4d6fcac..da46aa0 100644 --- a/iocore/utils/Makefile.am +++ b/iocore/utils/Makefile.am @@ -22,8 +22,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/iocore/eventsystem -DEFS += @IOCORE_MODULARIZED_DEFS@ - noinst_LIBRARIES = libinkutils.a libinkutils_a_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/lib/ts/ink_config.h.in ---------------------------------------------------------------------- diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in index 026e431..3a31c9f 100644 --- a/lib/ts/ink_config.h.in +++ b/lib/ts/ink_config.h.in @@ -81,7 +81,6 @@ #define TS_HAS_128BIT_CAS @has_128bit_cas@ /* API */ -#define TS_HAS_STANDALONE_IOCORE @has_standalone_iocore@ #define TS_HAS_TESTS @has_tests@ #define TS_HAS_WCCP @has_wccp@ @@ -92,14 +91,11 @@ # define TS_MAX_API_STATS @max_api_stats@ -#if TS_HAS_STANDALONE_IOCORE -# define STANDALONE_IOCORE 1 -#else + # define FIXME_NONMODULAR 1 # define SPLIT_DNS 1 # define NON_MODULAR 1 # define HTTP_CACHE 1 -#endif /* Defaults for user / group */ #define TS_PKGSYSUSER "@pkgsysuser@" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/51ce9aec/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 98bad98..04d72c8 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -17,10 +17,6 @@ # limitations under the License. # Note that hdrs is targeted from ../Makefile.am -if STANDALONE_IOCORE -noinst_LIBRARIES = libTrafficServerStandalone.a -bin_PROGRAMS = -else SUBDIRS = congest http logging config noinst_LIBRARIES = bin_PROGRAMS = \ @@ -28,7 +24,6 @@ bin_PROGRAMS = \ traffic_logcat \ traffic_logstats \ traffic_sac -endif noinst_PROGRAMS = \ test_xml_parser @@ -57,8 +52,6 @@ noinst_HEADERS = \ ConfigParse.h \ Show.h -EXTRA_LIBRARIES = \ - libTrafficServerStandalone.a if STATIC_LIBTS which_libts = $(top_builddir)/lib/ts/.libs/libtsutil.a @@ -260,13 +253,6 @@ if BUILD_TESTS traffic_sac_SOURCES += RegressionSM.cc endif -libTrafficServerStandalone_a_SOURCES = \ - signals.cc \ - EventName.cc \ - StatPages.cc \ - StatSystem.cc \ - AbstractBuffer.cc \ - Initialize.cc test_xml_parser_SOURCES = test_xml_parser.cc test_xml_parser_LDADD = \
