http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index 7c6207a..d6fc98b 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "records/I_RecHttp.h" #include "P_Net.h" #include "P_SSLNextProtocolSet.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLNextProtocolSet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNextProtocolSet.cc b/iocore/net/SSLNextProtocolSet.cc index 454f336..31c2b8f 100644 --- a/iocore/net/SSLNextProtocolSet.cc +++ b/iocore/net/SSLNextProtocolSet.cc @@ -21,9 +21,9 @@ limitations under the License. */ -#include "ink_config.h" -#include "apidefs.h" -#include "libts.h" +#include "ts/ink_config.h" +#include "ts/apidefs.h" +#include "ts/libts.h" #include "P_SSLNextProtocolSet.h" // For currently defined protocol strings, see http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLSessionCache.h ---------------------------------------------------------------------- diff --git a/iocore/net/SSLSessionCache.h b/iocore/net/SSLSessionCache.h index 15a0a3f..135b2dd 100644 --- a/iocore/net/SSLSessionCache.h +++ b/iocore/net/SSLSessionCache.h @@ -22,15 +22,15 @@ #ifndef __SSLSESSIONCACHE_H__ #define __SSLSESSIONCACHE_H__ -#include "Map.h" -#include "List.h" -#include "ink_mutex.h" +#include "ts/Map.h" +#include "ts/List.h" +#include "ts/ink_mutex.h" #include "P_EventSystem.h" #include "P_AIO.h" #include "I_RecProcess.h" -#include "libts.h" +#include "ts/libts.h" #include "P_SSLUtils.h" -#include "RbTree.h" +#include "ts/RbTree.h" #include <openssl/ssl.h> #define SSL_MAX_SESSION_SIZE 256 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index eda962b..4b42df6 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -19,12 +19,12 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "records/I_RecHttp.h" -#include "libts.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" #include "P_Net.h" -#include "ink_cap.h" +#include "ts/ink_cap.h" #include "P_OCSPStapling.h" #include "SSLSessionCache.h" #include "SSLDynlock.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/Socks.cc ---------------------------------------------------------------------- diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc index a0350f6..08239e8 100644 --- a/iocore/net/Socks.cc +++ b/iocore/net/Socks.cc @@ -31,7 +31,7 @@ */ #include "P_Net.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #include <ts/IpMapConf.h> socks_conf_struct *g_socks_conf_stuff = 0; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/UnixNetPages.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNetPages.cc b/iocore/net/UnixNetPages.cc index c1d9f74..41a286d 100644 --- a/iocore/net/UnixNetPages.cc +++ b/iocore/net/UnixNetPages.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "P_Net.h" #include "Show.h" #include "I_Tasks.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/UnixNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc index ecfd3bf..c3d7540 100644 --- a/iocore/net/UnixNetVConnection.cc +++ b/iocore/net/UnixNetVConnection.cc @@ -22,7 +22,7 @@ */ #include "P_Net.h" -#include "libts.h" +#include "ts/libts.h" #include "Log.h" #define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/test_I_UDPNet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/test_I_UDPNet.cc b/iocore/net/test_I_UDPNet.cc index 37b0952..81d4a77 100644 --- a/iocore/net/test_I_UDPNet.cc +++ b/iocore/net/test_I_UDPNet.cc @@ -25,7 +25,7 @@ #include <stdlib.h> #include "I_Net.h" -#include "List.h" +#include "ts/List.h" // Diags stuff from test_I_Net.cc: Diags *diags; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/net/test_P_UDPNet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/test_P_UDPNet.cc b/iocore/net/test_P_UDPNet.cc index 751fe18..76ee379 100644 --- a/iocore/net/test_P_UDPNet.cc +++ b/iocore/net/test_P_UDPNet.cc @@ -25,7 +25,7 @@ #include <stdlib.h> #include "P_Net.h" -#include "libts.h" +#include "ts/libts.h" // Diags stuff from test_I_Net.cc: Diags *diags; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/utils/Machine.cc ---------------------------------------------------------------------- diff --git a/iocore/utils/Machine.cc b/iocore/utils/Machine.cc index 7d3ace1..9af5551 100644 --- a/iocore/utils/Machine.cc +++ b/iocore/utils/Machine.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "I_Machine.h" #if HAVE_IFADDRS_H http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/iocore/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am index fc95e06..04eb284 100644 --- a/iocore/utils/Makefile.am +++ b/iocore/utils/Makefile.am @@ -19,8 +19,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/iocore/eventsystem noinst_LIBRARIES = libinkutils.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/atscppapi/src/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am index 64abfd7..300cf06 100644 --- a/lib/atscppapi/src/Makefile.am +++ b/lib/atscppapi/src/Makefile.am @@ -15,12 +15,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -TS_PLUGIN_CPPFLAGS = \ +AM_CPPFLAGS = \ + -I$(top_srcdir)/$(subdir)/include \ + -I$(top_builddir)/proxy/api \ -I$(top_srcdir)/proxy/api \ - -I$(top_builddir)/lib/ts \ - -I$(top_srcdir)/lib/ts + -I$(top_srcdir)/lib -AM_CXXFLAGS = -I$(top_srcdir)/$(subdir)/include $(TS_PLUGIN_CPPFLAGS) # build the library lib_LTLIBRARIES = libatscppapi.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/atscppapi/src/Transaction.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc index 1f01b7f..7361cbd 100644 --- a/lib/atscppapi/src/Transaction.cc +++ b/lib/atscppapi/src/Transaction.cc @@ -25,7 +25,7 @@ #include <cstring> #include <map> #include <string> -#include <ink_memory.h> +#include "ts/ink_memory.h" #include "atscppapi/shared_ptr.h" #include "logging_internal.h" #include "utils_internal.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/I_RecCore.h ---------------------------------------------------------------------- diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h index a09abdf..719021f 100644 --- a/lib/records/I_RecCore.h +++ b/lib/records/I_RecCore.h @@ -24,7 +24,7 @@ #ifndef _I_REC_CORE_H_ #define _I_REC_CORE_H_ -#include "Diags.h" +#include "ts/Diags.h" #include "I_RecDefs.h" #include "I_RecAlarms.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/I_RecDefs.h ---------------------------------------------------------------------- diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h index 839bcd7..c0317dd 100644 --- a/lib/records/I_RecDefs.h +++ b/lib/records/I_RecDefs.h @@ -24,8 +24,8 @@ #ifndef _I_REC_DEFS_H_ #define _I_REC_DEFS_H_ -#include "ink_mutex.h" -#include "ink_rwlock.h" +#include "ts/ink_mutex.h" +#include "ts/ink_rwlock.h" #include "I_RecMutex.h" #define STAT_PROCESSOR http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/I_RecMutex.h ---------------------------------------------------------------------- diff --git a/lib/records/I_RecMutex.h b/lib/records/I_RecMutex.h index 1d6d498..6067439 100644 --- a/lib/records/I_RecMutex.h +++ b/lib/records/I_RecMutex.h @@ -24,8 +24,8 @@ #ifndef _I_REC_MUTEX_H_ #define _I_REC_MUTEX_H_ -#include "ink_mutex.h" -#include "ink_thread.h" +#include "ts/ink_mutex.h" +#include "ts/ink_thread.h" /** A wrapper to ink_mutex class. It allows multiple acquire of mutex lock http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am index b38e279..2306d48 100644 --- a/lib/records/Makefile.am +++ b/lib/records/Makefile.am @@ -22,9 +22,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts + -I$(top_srcdir)/lib noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/P_RecCore.cc ---------------------------------------------------------------------- diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc index ae4d2df..6eede2d 100644 --- a/lib/records/P_RecCore.cc +++ b/lib/records/P_RecCore.cc @@ -21,12 +21,12 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" -#include "TextBuffer.h" -#include "Tokenizer.h" -#include "ink_defs.h" -#include "ink_string.h" +#include "ts/TextBuffer.h" +#include "ts/Tokenizer.h" +#include "ts/ink_defs.h" +#include "ts/ink_string.h" #include "P_RecFile.h" #include "P_RecUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/P_RecCore.h ---------------------------------------------------------------------- diff --git a/lib/records/P_RecCore.h b/lib/records/P_RecCore.h index 6023072..b2f7f63 100644 --- a/lib/records/P_RecCore.h +++ b/lib/records/P_RecCore.h @@ -24,11 +24,11 @@ #ifndef _P_REC_CORE_H_ #define _P_REC_CORE_H_ -#include "ink_thread.h" -#include "ink_hash_table.h" -#include "ink_llqueue.h" -#include "ink_rwlock.h" -#include "TextBuffer.h" +#include "ts/ink_thread.h" +#include "ts/ink_hash_table.h" +#include "ts/ink_llqueue.h" +#include "ts/ink_rwlock.h" +#include "ts/TextBuffer.h" #include "I_RecCore.h" #include "P_RecDefs.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/P_RecUtils.h ---------------------------------------------------------------------- diff --git a/lib/records/P_RecUtils.h b/lib/records/P_RecUtils.h index c7e7eaa..92d790c 100644 --- a/lib/records/P_RecUtils.h +++ b/lib/records/P_RecUtils.h @@ -24,8 +24,8 @@ #ifndef _P_REC_UTILS_H_ #define _P_REC_UTILS_H_ -#include "Diags.h" -#include "ink_atomic.h" +#include "ts/Diags.h" +#include "ts/ink_atomic.h" #include "P_RecDefs.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecConfigParse.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc index 5798fb2..a801aba 100644 --- a/lib/records/RecConfigParse.cc +++ b/lib/records/RecConfigParse.cc @@ -21,18 +21,18 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" -#include "TextBuffer.h" -#include "Tokenizer.h" -#include "ink_defs.h" -#include "ink_string.h" +#include "ts/TextBuffer.h" +#include "ts/Tokenizer.h" +#include "ts/ink_defs.h" +#include "ts/ink_string.h" #include "P_RecFile.h" #include "P_RecUtils.h" #include "P_RecMessage.h" #include "P_RecCore.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" const char *g_rec_config_fpath = NULL; LLQ *g_rec_config_contents_llq = NULL; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecCore.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc index fe4cbc0..34cef55 100644 --- a/lib/records/RecCore.cc +++ b/lib/records/RecCore.cc @@ -21,12 +21,12 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "P_RecFile.h" #include "P_RecCore.h" #include "P_RecUtils.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" static bool g_initialized = false; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecFile.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecFile.cc b/lib/records/RecFile.cc index ba254de..8464923 100644 --- a/lib/records/RecFile.cc +++ b/lib/records/RecFile.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "P_RecFile.h" #include "P_RecDefs.h" #include "P_RecUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecLocal.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecLocal.cc b/lib/records/RecLocal.cc index 0338d7a..c9ad6a0 100644 --- a/lib/records/RecLocal.cc +++ b/lib/records/RecLocal.cc @@ -21,9 +21,9 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "Rollback.h" -#include "ParseRules.h" +#include "ts/ParseRules.h" #include "P_RecCore.h" #include "P_RecLocal.h" #include "P_RecMessage.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecMessage.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecMessage.cc b/lib/records/RecMessage.cc index 0ca2eef..016d15a 100644 --- a/lib/records/RecMessage.cc +++ b/lib/records/RecMessage.cc @@ -21,14 +21,14 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "P_RecCore.h" #include "P_RecFile.h" #include "P_RecMessage.h" #include "P_RecUtils.h" #include "P_RecCore.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" static RecMessageRecvCb g_recv_cb = NULL; static void *g_recv_cookie = NULL; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecMutex.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecMutex.cc b/lib/records/RecMutex.cc index 63bdc97..35d0190 100644 --- a/lib/records/RecMutex.cc +++ b/lib/records/RecMutex.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "I_RecMutex.h" int http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecProcess.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc index f0c59bb..255f9e5 100644 --- a/lib/records/RecProcess.cc +++ b/lib/records/RecProcess.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "I_Tasks.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/RecUtils.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecUtils.cc b/lib/records/RecUtils.cc index cd9246b..c47b5c8 100644 --- a/lib/records/RecUtils.cc +++ b/lib/records/RecUtils.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "P_RecUtils.h" #include "P_RecCore.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/records/test_RecProcess.i ---------------------------------------------------------------------- diff --git a/lib/records/test_RecProcess.i b/lib/records/test_RecProcess.i index 3d11424..666bae3 100644 --- a/lib/records/test_RecProcess.i +++ b/lib/records/test_RecProcess.i @@ -21,7 +21,7 @@ limitations under the License. */ -#include "ink_hrtime.h" +#include "ts/ink_hrtime.h" #include "P_RecUtils.h" #include "test_RecordsConfig.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Arena.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Arena.cc b/lib/ts/Arena.cc index a67f2fe..bc3aac7 100644 --- a/lib/ts/Arena.cc +++ b/lib/ts/Arena.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "ink_mutex.h" -#include "libts.h" +#include "ts/ink_mutex.h" +#include "ts/libts.h" #include <assert.h> #include <string.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Bitops.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Bitops.cc b/lib/ts/Bitops.cc index ee0a26f..4a51e3e 100644 --- a/lib/ts/Bitops.cc +++ b/lib/ts/Bitops.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "Bitops.h" +#include "ts/Bitops.h" unsigned char bit_table[256] = { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/CompileParseRules.cc ---------------------------------------------------------------------- diff --git a/lib/ts/CompileParseRules.cc b/lib/ts/CompileParseRules.cc index 53406fe..1e64a51 100644 --- a/lib/ts/CompileParseRules.cc +++ b/lib/ts/CompileParseRules.cc @@ -23,7 +23,7 @@ #define COMPILE_PARSE_RULES -#include "ParseRules.h" +#include "ts/ParseRules.h" const unsigned int parseRulesCType[256] = {0}; const char parseRulesCTypeToUpper[256] = {0}; @@ -36,7 +36,7 @@ char tparseRulesCTypeToLower[256]; #include <stdio.h> #include <ctype.h> -#include "ink_string.h" +#include "ts/ink_string.h" static char * uint_to_binary(unsigned int u) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ConsistentHash.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ConsistentHash.cc b/lib/ts/ConsistentHash.cc index c983ccb..461c39f 100644 --- a/lib/ts/ConsistentHash.cc +++ b/lib/ts/ConsistentHash.cc @@ -19,7 +19,7 @@ limitations under the License. */ -#include "ConsistentHash.h" +#include "ts/ConsistentHash.h" #include <cstring> #include <string> #include <sstream> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Diags.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Diags.cc b/lib/ts/Diags.cc index 97c4911..da8b9a9 100644 --- a/lib/ts/Diags.cc +++ b/lib/ts/Diags.cc @@ -34,14 +34,14 @@ ****************************************************************************/ -#include "ink_platform.h" -#include "ink_memory.h" -#include "ink_defs.h" -#include "ink_error.h" -#include "ink_assert.h" -#include "ink_time.h" -#include "ink_hrtime.h" -#include "Diags.h" +#include "ts/ink_platform.h" +#include "ts/ink_memory.h" +#include "ts/ink_defs.h" +#include "ts/ink_error.h" +#include "ts/ink_assert.h" +#include "ts/ink_time.h" +#include "ts/ink_hrtime.h" +#include "ts/Diags.h" int diags_on_for_plugins = 0; bool DiagsConfigState::enabled[2] = {false, false}; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/EventNotify.cc ---------------------------------------------------------------------- diff --git a/lib/ts/EventNotify.cc b/lib/ts/EventNotify.cc index dce9d81..28b509c 100644 --- a/lib/ts/EventNotify.cc +++ b/lib/ts/EventNotify.cc @@ -27,9 +27,9 @@ Generic event notify mechanism among threads. **************************************************************************/ -#include "EventNotify.h" -#include "ink_hrtime.h" -#include "ink_defs.h" +#include "ts/EventNotify.h" +#include "ts/ink_hrtime.h" +#include "ts/ink_defs.h" #ifdef HAVE_EVENTFD #include <sys/eventfd.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Hash.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Hash.cc b/lib/ts/Hash.cc index 31a74b7..e8debb4 100644 --- a/lib/ts/Hash.cc +++ b/lib/ts/Hash.cc @@ -19,7 +19,7 @@ limitations under the License. */ -#include "Hash.h" +#include "ts/Hash.h" #include <cstring> ATSHashBase::~ATSHashBase() http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HashFNV.cc ---------------------------------------------------------------------- diff --git a/lib/ts/HashFNV.cc b/lib/ts/HashFNV.cc index c4897bb..6fca238 100644 --- a/lib/ts/HashFNV.cc +++ b/lib/ts/HashFNV.cc @@ -7,7 +7,7 @@ Currently implemented FNV-1a 32bit and FNV-1a 64bit */ -#include "HashFNV.h" +#include "ts/HashFNV.h" static const uint32_t FNV_INIT_32 = 0x811c9dc5u; static const uint64_t FNV_INIT_64 = 0xcbf29ce484222325ull; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HashMD5.cc ---------------------------------------------------------------------- diff --git a/lib/ts/HashMD5.cc b/lib/ts/HashMD5.cc index 93fb787..c771c13 100644 --- a/lib/ts/HashMD5.cc +++ b/lib/ts/HashMD5.cc @@ -19,7 +19,7 @@ limitations under the License. */ -#include "HashMD5.h" +#include "ts/HashMD5.h" ATSHashMD5::ATSHashMD5(void) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HashSip.cc ---------------------------------------------------------------------- diff --git a/lib/ts/HashSip.cc b/lib/ts/HashSip.cc index 80a2c00..22899d6 100644 --- a/lib/ts/HashSip.cc +++ b/lib/ts/HashSip.cc @@ -8,7 +8,7 @@ https://github.com/floodyberry/siphash */ -#include "HashSip.h" +#include "ts/HashSip.h" #include <cstring> #define SIP_BLOCK_SIZE 8 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/HostLookup.cc ---------------------------------------------------------------------- diff --git a/lib/ts/HostLookup.cc b/lib/ts/HostLookup.cc index c0d88e0..2b6bdaf 100644 --- a/lib/ts/HostLookup.cc +++ b/lib/ts/HostLookup.cc @@ -27,9 +27,9 @@ * * ****************************************************************************/ -#include "libts.h" -#include "HostLookup.h" -#include "MatcherUtils.h" +#include "ts/libts.h" +#include "ts/HostLookup.h" +#include "ts/MatcherUtils.h" // bool domaincmp(const char* hostname, const char* domain) // http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/IpMap.cc ---------------------------------------------------------------------- diff --git a/lib/ts/IpMap.cc b/lib/ts/IpMap.cc index 67cba39..dee651f 100644 --- a/lib/ts/IpMap.cc +++ b/lib/ts/IpMap.cc @@ -1,4 +1,4 @@ -#include "IpMap.h" +#include "ts/IpMap.h" /** @file IP address map support. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Layout.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Layout.cc b/lib/ts/Layout.cc index 8669953..730b399 100644 --- a/lib/ts/Layout.cc +++ b/lib/ts/Layout.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "libts.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" static Layout *layout = NULL; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MMH.cc ---------------------------------------------------------------------- diff --git a/lib/ts/MMH.cc b/lib/ts/MMH.cc index 4154aee..007928e 100644 --- a/lib/ts/MMH.cc +++ b/lib/ts/MMH.cc @@ -23,9 +23,9 @@ #include <stdlib.h> #include <string.h> -#include "ink_assert.h" -#include "ink_platform.h" -#include "MMH.h" +#include "ts/ink_assert.h" +#include "ts/ink_platform.h" +#include "ts/MMH.h" #define MMH_X_SIZE 512 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MatcherUtils.cc ---------------------------------------------------------------------- diff --git a/lib/ts/MatcherUtils.cc b/lib/ts/MatcherUtils.cc index 1449b4f..8e8935b 100644 --- a/lib/ts/MatcherUtils.cc +++ b/lib/ts/MatcherUtils.cc @@ -29,7 +29,7 @@ * ****************************************************************************/ -#include "libts.h" /* MAGIC_EDITING_TAG */ +#include "ts/libts.h" /* MAGIC_EDITING_TAG */ config_parse_error::config_parse_error(const char *fmt, ...) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MatcherUtils.h ---------------------------------------------------------------------- diff --git a/lib/ts/MatcherUtils.h b/lib/ts/MatcherUtils.h index d9ad8d4..89342c3 100644 --- a/lib/ts/MatcherUtils.h +++ b/lib/ts/MatcherUtils.h @@ -32,7 +32,7 @@ #ifndef _MATCHER_UTILS_H_ #define _MATCHER_UTILS_H_ -#include "ParseRules.h" +#include "ts/ParseRules.h" // Look in MatcherUtils.cc for comments on function usage char *readIntoBuffer(const char *file_path, const char *module_name, int *read_size_ptr); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/MimeTable.cc ---------------------------------------------------------------------- diff --git a/lib/ts/MimeTable.cc b/lib/ts/MimeTable.cc index 83cc337..6e4e8cf 100644 --- a/lib/ts/MimeTable.cc +++ b/lib/ts/MimeTable.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" /* MAGIC_EDITING_TAG */ +#include "ts/libts.h" /* MAGIC_EDITING_TAG */ MimeTableEntry MimeTable::m_table[] = {{"ai", "application/postscript", "8bit", "text"}, {"aif", "audio/x-aiff", "binary", "sound"}, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ParseRules.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ParseRules.cc b/lib/ts/ParseRules.cc index 5864e70..12a221a 100644 --- a/lib/ts/ParseRules.cc +++ b/lib/ts/ParseRules.cc @@ -28,7 +28,7 @@ ****************************************************************************/ -#include "libts.h" /* MAGIC_EDITING_TAG */ +#include "ts/libts.h" /* MAGIC_EDITING_TAG */ const unsigned int parseRulesCType[256] = { #include "ParseRulesCType" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/RawHashTable.cc ---------------------------------------------------------------------- diff --git a/lib/ts/RawHashTable.cc b/lib/ts/RawHashTable.cc index 192a4fa..c4ea99e 100644 --- a/lib/ts/RawHashTable.cc +++ b/lib/ts/RawHashTable.cc @@ -28,4 +28,4 @@ */ -#include "RawHashTable.h" +#include "ts/RawHashTable.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/RbTree.cc ---------------------------------------------------------------------- diff --git a/lib/ts/RbTree.cc b/lib/ts/RbTree.cc index 64b80fa..124cea6 100644 --- a/lib/ts/RbTree.cc +++ b/lib/ts/RbTree.cc @@ -19,7 +19,7 @@ limitations under the License. */ -#include "RbTree.h" +#include "ts/RbTree.h" namespace ts { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Regex.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Regex.cc b/lib/ts/Regex.cc index 916ca68..dcaae99 100644 --- a/lib/ts/Regex.cc +++ b/lib/ts/Regex.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "libts.h" -#include "Regex.h" +#include "ts/libts.h" +#include "ts/Regex.h" #ifdef PCRE_CONFIG_JIT struct RegexThreadKey { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Regression.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Regression.cc b/lib/ts/Regression.cc index e64632c..7cd52c5 100644 --- a/lib/ts/Regression.cc +++ b/lib/ts/Regression.cc @@ -28,8 +28,8 @@ ****************************************************************************/ -#include "libts.h" -#include "Regression.h" +#include "ts/libts.h" +#include "ts/Regression.h" static RegressionTest *test = NULL; static RegressionTest *exclusive_test = NULL; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Regression.h ---------------------------------------------------------------------- diff --git a/lib/ts/Regression.h b/lib/ts/Regression.h index ef0f5c7..0a29804 100644 --- a/lib/ts/Regression.h +++ b/lib/ts/Regression.h @@ -24,8 +24,8 @@ #ifndef _Regression_h #define _Regression_h -#include "libts.h" -#include "Regex.h" +#include "ts/libts.h" +#include "ts/Regex.h" // Each module should provide one or more regression tests // http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/TestHttpHeader.cc ---------------------------------------------------------------------- diff --git a/lib/ts/TestHttpHeader.cc b/lib/ts/TestHttpHeader.cc index 3a03bb9..3fdb0f6 100644 --- a/lib/ts/TestHttpHeader.cc +++ b/lib/ts/TestHttpHeader.cc @@ -29,7 +29,7 @@ ****************************************************************************/ #include "HttpHeaderTokenizer.h" -#include "ink_assert.h" +#include "ts/ink_assert.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/TextBuffer.cc ---------------------------------------------------------------------- diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc index b41fbce..08fe4fe 100644 --- a/lib/ts/TextBuffer.cc +++ b/lib/ts/TextBuffer.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "libts.h" -#include "TextBuffer.h" +#include "ts/libts.h" +#include "ts/TextBuffer.h" /**************************************************************************** * http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Tokenizer.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Tokenizer.cc b/lib/ts/Tokenizer.cc index b2a6f21..4c0e635 100644 --- a/lib/ts/Tokenizer.cc +++ b/lib/ts/Tokenizer.cc @@ -22,10 +22,10 @@ */ /***************************************/ -#include "ink_platform.h" -#include "Tokenizer.h" -#include "ink_assert.h" -#include "ink_memory.h" +#include "ts/ink_platform.h" +#include "ts/Tokenizer.h" +#include "ts/ink_assert.h" +#include "ts/ink_memory.h" /**************************************************************************** * @@ -372,7 +372,7 @@ Tokenizer::ReUse() } #if TS_HAS_TESTS -#include "TestBox.h" +#include "ts/TestBox.h" REGRESSION_TEST(libts_Tokenizer)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Vec.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Vec.cc b/lib/ts/Vec.cc index 669d413..b11b91e 100644 --- a/lib/ts/Vec.cc +++ b/lib/ts/Vec.cc @@ -23,7 +23,7 @@ /* UnionFind after Tarjan */ #include <stdint.h> -#include "Vec.h" +#include "ts/Vec.h" const uintptr_t prime2[] = {1, 3, 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139, 524287, 1048573, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Vec.h ---------------------------------------------------------------------- diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h index d44e93a..e1c40be 100644 --- a/lib/ts/Vec.h +++ b/lib/ts/Vec.h @@ -28,7 +28,7 @@ #include <stdlib.h> #include <unistd.h> #include <sys/types.h> -#include "defalloc.h" +#include "ts/defalloc.h" #include "ts/ink_assert.h" // Simple Vector class, also supports open hashed sets http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/Version.cc ---------------------------------------------------------------------- diff --git a/lib/ts/Version.cc b/lib/ts/Version.cc index 30669c0..69121cb 100644 --- a/lib/ts/Version.cc +++ b/lib/ts/Version.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" AppVersionInfo::AppVersionInfo() { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/X509HostnameValidator.cc ---------------------------------------------------------------------- diff --git a/lib/ts/X509HostnameValidator.cc b/lib/ts/X509HostnameValidator.cc index 9ab01d8..18cf94f 100644 --- a/lib/ts/X509HostnameValidator.cc +++ b/lib/ts/X509HostnameValidator.cc @@ -26,7 +26,7 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -#include <ink_memory.h> +#include "ts/ink_memory.h" typedef bool (*equal_fn)(const unsigned char *prefix, size_t prefix_len, const unsigned char *suffix, size_t suffix_len); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/hugepages.cc ---------------------------------------------------------------------- diff --git a/lib/ts/hugepages.cc b/lib/ts/hugepages.cc index d7d94a4..7763da0 100644 --- a/lib/ts/hugepages.cc +++ b/lib/ts/hugepages.cc @@ -21,8 +21,8 @@ #include <cstdio> #include <sys/mman.h> -#include "Diags.h" -#include "ink_align.h" +#include "ts/Diags.h" +#include "ts/ink_align.h" #define DEBUG_TAG "hugepages" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_args.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc index 91cebd8..983d002 100644 --- a/lib/ts/ink_args.cc +++ b/lib/ts/ink_args.cc @@ -26,7 +26,7 @@ Process arguments ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" // // Global variables http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_assert.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_assert.cc b/lib/ts/ink_assert.cc index b87bae8..0855f48 100644 --- a/lib/ts/ink_assert.cc +++ b/lib/ts/ink_assert.cc @@ -26,10 +26,10 @@ Assertions ***************************************************************************/ -#include "ink_platform.h" -#include "ink_assert.h" -#include "ink_error.h" -#include "ink_string.h" +#include "ts/ink_platform.h" +#include "ts/ink_assert.h" +#include "ts/ink_error.h" +#include "ts/ink_string.h" void _ink_assert(const char *expression, const char *file, int line) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_auth_api.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_auth_api.cc b/lib/ts/ink_auth_api.cc index 401a66c..34aab2d 100644 --- a/lib/ts/ink_auth_api.cc +++ b/lib/ts/ink_auth_api.cc @@ -23,9 +23,9 @@ #include <time.h> #include <stdint.h> -#include "ink_rand.h" -#include "ink_code.h" -#include "ink_auth_api.h" +#include "ts/ink_rand.h" +#include "ts/ink_code.h" +#include "ts/ink_auth_api.h" static int s_rand_seed = time(NULL); // + s_rand_seed; static InkRand s_rand_gen(ink_rand_r((unsigned int *) & s_rand_seed) ^ (uintptr_t)&s_rand_seed); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_base64.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_base64.cc b/lib/ts/ink_base64.cc index 7a67ad1..7fa771f 100644 --- a/lib/ts/ink_base64.cc +++ b/lib/ts/ink_base64.cc @@ -31,8 +31,8 @@ * These routines return char*'s to malloc-ed strings. The caller is * responsible for freeing the strings. */ -#include "libts.h" -#include "ink_assert.h" +#include "ts/libts.h" +#include "ts/ink_assert.h" // TODO: The code here seems a bit klunky, and could probably be improved a bit. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_cap.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_cap.cc b/lib/ts/ink_cap.cc index 569e3f8..91647f0 100644 --- a/lib/ts/ink_cap.cc +++ b/lib/ts/ink_cap.cc @@ -21,10 +21,10 @@ limitations under the License. */ -#include "ink_config.h" -#include "Diags.h" -#include "ink_cap.h" -#include "ink_thread.h" +#include "ts/ink_config.h" +#include "ts/Diags.h" +#include "ts/ink_cap.h" +#include "ts/ink_thread.h" #include <grp.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_code.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_code.cc b/lib/ts/ink_code.cc index e099b9c..d140df1 100644 --- a/lib/ts/ink_code.cc +++ b/lib/ts/ink_code.cc @@ -23,10 +23,10 @@ #include <string.h> #include <stdio.h> -#include "ink_code.h" -#include "INK_MD5.h" -#include "ink_assert.h" -#include "INK_MD5.h" +#include "ts/ink_code.h" +#include "ts/INK_MD5.h" +#include "ts/ink_assert.h" +#include "ts/INK_MD5.h" ats::CryptoHash const ats::CRYPTO_HASH_ZERO; // default constructed is correct. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_defs.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_defs.cc b/lib/ts/ink_defs.cc index 3deb389..d913174 100644 --- a/lib/ts/ink_defs.cc +++ b/lib/ts/ink_defs.cc @@ -28,8 +28,8 @@ ****************************************************************************/ -#include "libts.h" -#include "ink_platform.h" +#include "ts/libts.h" +#include "ts/ink_platform.h" #if defined(linux) || defined(freebsd) || defined(darwin) #include <sys/types.h> #include <sys/param.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_error.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_error.cc b/lib/ts/ink_error.cc index da4f432..481992c 100644 --- a/lib/ts/ink_error.cc +++ b/lib/ts/ink_error.cc @@ -22,9 +22,9 @@ */ -#include "libts.h" -#include "ink_error.h" -#include "ink_stack_trace.h" +#include "ts/libts.h" +#include "ts/ink_error.h" +#include "ts/ink_stack_trace.h" #include <syslog.h> #include <signal.h> /* MAGIC_EDITING_TAG */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_file.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_file.cc b/lib/ts/ink_file.cc index b810ba6..e095b14 100644 --- a/lib/ts/ink_file.cc +++ b/lib/ts/ink_file.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include <unistd.h> #include <limits.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_hash_table.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_hash_table.cc b/lib/ts/ink_hash_table.cc index 3ba691b..b197d8b 100644 --- a/lib/ts/ink_hash_table.cc +++ b/lib/ts/ink_hash_table.cc @@ -30,9 +30,9 @@ ****************************************************************************/ -#include "ink_error.h" -#include "ink_hash_table.h" -#include "ink_memory.h" +#include "ts/ink_error.h" +#include "ts/ink_hash_table.h" +#include "ts/ink_memory.h" /*===========================================================================* http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_hrtime.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_hrtime.cc b/lib/ts/ink_hrtime.cc index 1da8d24..7432d10 100644 --- a/lib/ts/ink_hrtime.cc +++ b/lib/ts/ink_hrtime.cc @@ -28,9 +28,9 @@ This file contains code supporting the Inktomi high-resolution timer. **************************************************************************/ -#include "ink_hrtime.h" -#include "ink_assert.h" -#include "ink_defs.h" +#include "ts/ink_hrtime.h" +#include "ts/ink_assert.h" +#include "ts/ink_defs.h" #if defined(freebsd) #include <sys/types.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_inet.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc index 1812f75..a880a41 100644 --- a/lib/ts/ink_inet.cc +++ b/lib/ts/ink_inet.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "ts/TestBox.h" #if defined(darwin) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_memory.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc index 4c18c43..ffbc9ae 100644 --- a/lib/ts/ink_memory.cc +++ b/lib/ts/ink_memory.cc @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include <assert.h> #if defined(linux) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_mutex.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_mutex.cc b/lib/ts/ink_mutex.cc index 98cc70a..36a68bd 100644 --- a/lib/ts/ink_mutex.cc +++ b/lib/ts/ink_mutex.cc @@ -21,10 +21,10 @@ limitations under the License. */ -#include "ink_error.h" -#include "ink_defs.h" +#include "ts/ink_error.h" +#include "ts/ink_defs.h" #include <assert.h> #include "stdio.h" -#include "ink_mutex.h" +#include "ts/ink_mutex.h" ink_mutex __global_death = PTHREAD_MUTEX_INITIALIZER; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_queue.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc index 38eaae6..8fa2902 100644 --- a/lib/ts/ink_queue.cc +++ b/lib/ts/ink_queue.cc @@ -36,20 +36,20 @@ ****************************************************************************/ -#include "ink_config.h" +#include "ts/ink_config.h" #include <assert.h> #include <memory.h> #include <stdlib.h> #include <unistd.h> #include <sys/types.h> #include <sys/mman.h> -#include "ink_atomic.h" -#include "ink_queue.h" -#include "ink_memory.h" -#include "ink_error.h" -#include "ink_assert.h" -#include "ink_align.h" -#include "hugepages.h" +#include "ts/ink_atomic.h" +#include "ts/ink_queue.h" +#include "ts/ink_memory.h" +#include "ts/ink_error.h" +#include "ts/ink_assert.h" +#include "ts/ink_align.h" +#include "ts/hugepages.h" inkcoreapi volatile int64_t fastalloc_mem_in_use = 0; inkcoreapi volatile int64_t fastalloc_mem_total = 0; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_queue_utils.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_queue_utils.cc b/lib/ts/ink_queue_utils.cc index 25b5b6e..332fe4f 100644 --- a/lib/ts/ink_queue_utils.cc +++ b/lib/ts/ink_queue_utils.cc @@ -21,11 +21,11 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include <assert.h> -#include "ink_atomic.h" -#include "ink_queue.h" +#include "ts/ink_atomic.h" +#include "ts/ink_queue.h" /* * This file was added during the debugging of Bug 50475. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_rand.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc index b4c780f..5251790 100644 --- a/lib/ts/ink_rand.cc +++ b/lib/ts/ink_rand.cc @@ -55,7 +55,7 @@ */ -#include "libts.h" +#include "ts/libts.h" #define NN 312 #define MM 156 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_res_init.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc index 8dbe091..b86b3cf 100644 --- a/lib/ts/ink_res_init.cc +++ b/lib/ts/ink_res_init.cc @@ -65,8 +65,8 @@ */ -#include "ink_platform.h" -#include "ink_defs.h" +#include "ts/ink_platform.h" +#include "ts/ink_defs.h" #include <sys/types.h> #include <sys/param.h> @@ -85,10 +85,10 @@ #include <stdlib.h> #include <string.h> -#include "ink_string.h" -#include "ink_resolver.h" -#include "ink_inet.h" -#include "Tokenizer.h" +#include "ts/ink_string.h" +#include "ts/ink_resolver.h" +#include "ts/ink_inet.h" +#include "ts/Tokenizer.h" #if !defined(isascii) /* XXX - could be a function */ #define isascii(c) (!(c & 0200)) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_res_mkquery.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_res_mkquery.cc b/lib/ts/ink_res_mkquery.cc index 1101628..3d37ad1 100644 --- a/lib/ts/ink_res_mkquery.cc +++ b/lib/ts/ink_res_mkquery.cc @@ -65,8 +65,8 @@ */ -#include "ink_config.h" -#include "ink_defs.h" +#include "ts/ink_config.h" +#include "ts/ink_defs.h" #include <sys/types.h> #include <sys/param.h> @@ -80,8 +80,8 @@ #include <stdio.h> #include <string.h> -#include "ink_error.h" -#include "ink_resolver.h" +#include "ts/ink_error.h" +#include "ts/ink_resolver.h" #define SPRINTF(x) (sprintf x) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_resource.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_resource.cc b/lib/ts/ink_resource.cc index cbb4b58..c887c6e 100644 --- a/lib/ts/ink_resource.cc +++ b/lib/ts/ink_resource.cc @@ -21,9 +21,9 @@ limitations under the License. */ -#include "ink_assert.h" -#include "ink_atomic.h" -#include "ink_resource.h" +#include "ts/ink_assert.h" +#include "ts/ink_atomic.h" +#include "ts/ink_resource.h" volatile int res_track_memory = 0; // Disabled by default http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_rwlock.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_rwlock.cc b/lib/ts/ink_rwlock.cc index a28f8ee..a2eb785 100644 --- a/lib/ts/ink_rwlock.cc +++ b/lib/ts/ink_rwlock.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "ink_config.h" -#include "ink_rwlock.h" +#include "ts/ink_config.h" +#include "ts/ink_rwlock.h" //------------------------------------------------------------------------- // ink_rwlock_init http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_sock.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_sock.cc b/lib/ts/ink_sock.cc index 3c72103..94c3f8a 100644 --- a/lib/ts/ink_sock.cc +++ b/lib/ts/ink_sock.cc @@ -27,7 +27,7 @@ ***************************************************************************/ -#include "libts.h" +#include "ts/libts.h" // // Compilation options http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_sprintf.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_sprintf.cc b/lib/ts/ink_sprintf.cc index 26a0716..9d58f9d 100644 --- a/lib/ts/ink_sprintf.cc +++ b/lib/ts/ink_sprintf.cc @@ -31,7 +31,7 @@ ****************************************************************************/ -#include "ink_sprintf.h" +#include "ts/ink_sprintf.h" #define NUL '\0' http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_stack_trace.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_stack_trace.cc b/lib/ts/ink_stack_trace.cc index b38b8e1..1375eaf 100644 --- a/lib/ts/ink_stack_trace.cc +++ b/lib/ts/ink_stack_trace.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "libts.h" -#include "ink_stack_trace.h" +#include "ts/libts.h" +#include "ts/ink_stack_trace.h" #include <strings.h> #include <stdio.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_string++.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_string++.cc b/lib/ts/ink_string++.cc index dacc870..77d51f4 100644 --- a/lib/ts/ink_string++.cc +++ b/lib/ts/ink_string++.cc @@ -30,7 +30,7 @@ ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" /*********************************************************************** * * http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_string.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc index f8178e1..5d56c7b 100644 --- a/lib/ts/ink_string.cc +++ b/lib/ts/ink_string.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" /* MAGIC_EDITING_TAG */ +#include "ts/libts.h" /* MAGIC_EDITING_TAG */ #include <assert.h> #include <stdarg.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_sys_control.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_sys_control.cc b/lib/ts/ink_sys_control.cc index 626b496..0e43228 100644 --- a/lib/ts/ink_sys_control.cc +++ b/lib/ts/ink_sys_control.cc @@ -21,9 +21,9 @@ limitations under the License. */ -#include "ink_defs.h" -#include "ink_assert.h" -#include "ink_sys_control.h" +#include "ts/ink_defs.h" +#include "ts/ink_assert.h" +#include "ts/ink_sys_control.h" rlim_t ink_max_out_rlimit(int which, bool max_it, bool unlim_it) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_syslog.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_syslog.cc b/lib/ts/ink_syslog.cc index 65f8d04..ad8b00c 100644 --- a/lib/ts/ink_syslog.cc +++ b/lib/ts/ink_syslog.cc @@ -28,7 +28,7 @@ * * ****************************************************************************/ -#include "libts.h" +#include "ts/libts.h" struct syslog_fac { char *long_str; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_thread.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_thread.cc b/lib/ts/ink_thread.cc index ef38815..d84812e 100644 --- a/lib/ts/ink_thread.cc +++ b/lib/ts/ink_thread.cc @@ -28,7 +28,7 @@ Generic threads interface. **************************************************************************/ -#include "libts.h" +#include "ts/libts.h" // // ignore the compiler warning... so that this can be used // // in the face of changes to the Solaris header files (see "man thread") http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/ink_time.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_time.cc b/lib/ts/ink_time.cc index 38f47fe..11cd891 100644 --- a/lib/ts/ink_time.cc +++ b/lib/ts/ink_time.cc @@ -28,11 +28,11 @@ ****************************************************************************/ -#include "ink_platform.h" -#include "ink_defs.h" -#include "ink_time.h" -#include "ink_assert.h" -#include "ink_string.h" +#include "ts/ink_platform.h" +#include "ts/ink_defs.h" +#include "ts/ink_time.h" +#include "ts/ink_assert.h" +#include "ts/ink_string.h" #include <locale.h> #include <sys/resource.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/libts.h ---------------------------------------------------------------------- diff --git a/lib/ts/libts.h b/lib/ts/libts.h index 40c6835..8c2edf1 100644 --- a/lib/ts/libts.h +++ b/lib/ts/libts.h @@ -41,7 +41,7 @@ #define std *** _FIXME_REMOVE_DEPENDENCY_ON_THE_STL_ *** */ -#include "hugepages.h" +#include "ts/hugepages.h" #include "ts/ink_config.h" #include "ts/ink_platform.h" #include "ts/ink_align.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/llqueue.cc ---------------------------------------------------------------------- diff --git a/lib/ts/llqueue.cc b/lib/ts/llqueue.cc index 414ecb6..04cb182 100644 --- a/lib/ts/llqueue.cc +++ b/lib/ts/llqueue.cc @@ -21,15 +21,15 @@ limitations under the License. */ -#include "ink_config.h" -#include "ink_memory.h" +#include "ts/ink_config.h" +#include "ts/ink_memory.h" #include <stdio.h> #include <stdlib.h> #include <assert.h> #include <limits.h> -#include "ink_llqueue.h" +#include "ts/ink_llqueue.h" #include "errno.h" #define RECORD_CHUNK 1024 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/load_http_hdr.cc ---------------------------------------------------------------------- diff --git a/lib/ts/load_http_hdr.cc b/lib/ts/load_http_hdr.cc index 66de373..284b3f4 100644 --- a/lib/ts/load_http_hdr.cc +++ b/lib/ts/load_http_hdr.cc @@ -35,7 +35,7 @@ #include "Marshal.h" #include "MIME.h" #include "HTTP.h" -#include "Tokenizer.h" +#include "ts/Tokenizer.h" #include <stdio.h> #include <errno.h> #include <sys/types.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/lockfile.cc ---------------------------------------------------------------------- diff --git a/lib/ts/lockfile.cc b/lib/ts/lockfile.cc index 7ca9b83..624f158 100644 --- a/lib/ts/lockfile.cc +++ b/lib/ts/lockfile.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "ink_platform.h" -#include "ink_lockfile.h" +#include "ts/ink_platform.h" +#include "ts/ink_lockfile.h" #define LOCKFILE_BUF_LEN 16 // 16 bytes should be enought for a pid http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/signals.cc ---------------------------------------------------------------------- diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc index 0c415fd..6397b96 100644 --- a/lib/ts/signals.cc +++ b/lib/ts/signals.cc @@ -26,9 +26,9 @@ **************************************************************************/ -#include "libts.h" -#include "signals.h" -#include "ink_stack_trace.h" +#include "ts/libts.h" +#include "ts/signals.h" +#include "ts/ink_stack_trace.h" bool signal_check_handler(int signal, signal_handler_t handler) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_Map.cc ---------------------------------------------------------------------- diff --git a/lib/ts/test_Map.cc b/lib/ts/test_Map.cc index bb0c12c..64f5f2a 100644 --- a/lib/ts/test_Map.cc +++ b/lib/ts/test_Map.cc @@ -21,7 +21,7 @@ limitations under the License. */ #include <stdint.h> -#include "Map.h" +#include "ts/Map.h" typedef const char cchar; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_Vec.cc ---------------------------------------------------------------------- diff --git a/lib/ts/test_Vec.cc b/lib/ts/test_Vec.cc index 2eb7cc6..9f5a838 100644 --- a/lib/ts/test_Vec.cc +++ b/lib/ts/test_Vec.cc @@ -24,8 +24,8 @@ #include <stdint.h> #include <stdio.h> -#include <ink_assert.h> -#include "Vec.h" +#include "ts/ink_assert.h" +#include "ts/Vec.h" static void test_append() http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_arena.cc ---------------------------------------------------------------------- diff --git a/lib/ts/test_arena.cc b/lib/ts/test_arena.cc index 515a8bf..9f93522 100644 --- a/lib/ts/test_arena.cc +++ b/lib/ts/test_arena.cc @@ -33,7 +33,7 @@ ****************************************************************************/ -#include "Arena.h" +#include "ts/Arena.h" #include <stdio.h> void http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/ts/test_freelist.cc ---------------------------------------------------------------------- diff --git a/lib/ts/test_freelist.cc b/lib/ts/test_freelist.cc index 9d8e5b4..c7b3e3f 100644 --- a/lib/ts/test_freelist.cc +++ b/lib/ts/test_freelist.cc @@ -23,8 +23,8 @@ #include <stdlib.h> #include <string.h> -#include "ink_thread.h" -#include "ink_queue.h" +#include "ts/ink_thread.h" +#include "ts/ink_queue.h" #define NTHREADS 64 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/tsconfig/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am index 19e1acd..932604f 100644 --- a/lib/tsconfig/Makefile.am +++ b/lib/tsconfig/Makefile.am @@ -24,9 +24,7 @@ AM_CFLAGS += @FLEX_CFLAGS@ AM_YFLAGS = --yacc -d -p tsconfig AM_CPPFLAGS = \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts + -I$(top_srcdir)/lib BUILT_SOURCES = \ TsConfigGrammar.hpp http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am index abbf632..fdb12e4 100644 --- a/lib/wccp/Makefile.am +++ b/lib/wccp/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/proxy/api/ts #WCCP_DEFS = @WCCP_DEFS@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/Wccp.h ---------------------------------------------------------------------- diff --git a/lib/wccp/Wccp.h b/lib/wccp/Wccp.h index 8dd92d7..5fdf1c2 100644 --- a/lib/wccp/Wccp.h +++ b/lib/wccp/Wccp.h @@ -26,8 +26,8 @@ #include <ts/TsBuffer.h> #include <tsconfig/Errata.h> #include <memory.h> -#include <ink_defs.h> -#include <ink_memory.h> +#include "ts/ink_defs.h" +#include "ts/ink_memory.h" // Nasty, defining this with no prefix. The value is still available // in TS_VERSION_STRING. #undef VERSION http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/WccpEndPoint.cc ---------------------------------------------------------------------- diff --git a/lib/wccp/WccpEndPoint.cc b/lib/wccp/WccpEndPoint.cc index 41bfe16..2157413 100644 --- a/lib/wccp/WccpEndPoint.cc +++ b/lib/wccp/WccpEndPoint.cc @@ -23,8 +23,8 @@ #include "WccpUtil.h" #include "WccpMeta.h" #include <errno.h> -#include "ink_string.h" -#include "ink_defs.h" +#include "ts/ink_string.h" +#include "ts/ink_defs.h" // ------------------------------------------------------ namespace wccp { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/WccpMsg.cc ---------------------------------------------------------------------- diff --git a/lib/wccp/WccpMsg.cc b/lib/wccp/WccpMsg.cc index c4ed4f9..dfc404b 100644 --- a/lib/wccp/WccpMsg.cc +++ b/lib/wccp/WccpMsg.cc @@ -24,8 +24,8 @@ #include <errno.h> #include <openssl/md5.h> #include <TsException.h> -#include "ink_memory.h" -#include "ink_string.h" +#include "ts/ink_memory.h" +#include "ts/ink_string.h" namespace wccp { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/lib/wccp/WccpStatic.cc ---------------------------------------------------------------------- diff --git a/lib/wccp/WccpStatic.cc b/lib/wccp/WccpStatic.cc index d0fd91e..36c4405 100644 --- a/lib/wccp/WccpStatic.cc +++ b/lib/wccp/WccpStatic.cc @@ -22,8 +22,8 @@ #include "WccpLocal.h" #include "WccpMeta.h" -#include "ink_error.h" -#include "ink_defs.h" +#include "ts/ink_error.h" +#include "ts/ink_defs.h" /* Solaris considers SIOCGIFCONF obsolete and only defines it if * BSD compatibility activated. */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Alarms.cc ---------------------------------------------------------------------- diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc index 2b260b9..fe2c4af 100644 --- a/mgmt/Alarms.cc +++ b/mgmt/Alarms.cc @@ -22,12 +22,12 @@ */ -#include "libts.h" +#include "ts/libts.h" #include "LocalManager.h" #include "ClusterCom.h" #include "MgmtUtils.h" #include "Alarms.h" -#include "Diags.h" +#include "ts/Diags.h" #include "P_RecCore.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Alarms.h ---------------------------------------------------------------------- diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h index b699d4c..0ec9854 100644 --- a/mgmt/Alarms.h +++ b/mgmt/Alarms.h @@ -38,8 +38,8 @@ #include <stdlib.h> #include <stdio.h> -#include "ink_hash_table.h" -#include "ink_mutex.h" +#include "ts/ink_hash_table.h" +#include "ts/ink_mutex.h" class AppVersionInfo; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/BaseManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/BaseManager.cc b/mgmt/BaseManager.cc index c72c4a9..3e93deb 100644 --- a/mgmt/BaseManager.cc +++ b/mgmt/BaseManager.cc @@ -31,7 +31,7 @@ * */ -#include "libts.h" +#include "ts/libts.h" #include "BaseManager.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/BaseManager.h ---------------------------------------------------------------------- diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h index 2075d54..dbaca14 100644 --- a/mgmt/BaseManager.h +++ b/mgmt/BaseManager.h @@ -34,9 +34,9 @@ #ifndef _BASE_MANAGER_H #define _BASE_MANAGER_H -#include "ink_thread.h" -#include "ink_mutex.h" -#include "ink_llqueue.h" +#include "ts/ink_thread.h" +#include "ts/ink_mutex.h" +#include "ts/ink_llqueue.h" #include "MgmtDefs.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/FileManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc index 55e1dd8..963687e 100644 --- a/mgmt/FileManager.cc +++ b/mgmt/FileManager.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "libts.h" -#include "I_Layout.h" +#include "ts/libts.h" +#include "ts/I_Layout.h" #include "FileManager.h" #include "Main.h" #include "Rollback.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/FileManager.h ---------------------------------------------------------------------- diff --git a/mgmt/FileManager.h b/mgmt/FileManager.h index 8fd31bd..6f9a262 100644 --- a/mgmt/FileManager.h +++ b/mgmt/FileManager.h @@ -33,8 +33,8 @@ #include <stdio.h> -#include "ink_hash_table.h" -#include "List.h" +#include "ts/ink_hash_table.h" +#include "ts/List.h" #include "Rollback.h" #include "MultiFile.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/LocalManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc index 4d8fddf..67978ff 100644 --- a/mgmt/LocalManager.cc +++ b/mgmt/LocalManager.cc @@ -22,13 +22,13 @@ */ -#include "libts.h" -#include "ink_platform.h" +#include "ts/libts.h" +#include "ts/ink_platform.h" #include "MgmtUtils.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" #include "LocalManager.h" #include "MgmtSocket.h" -#include "ink_cap.h" +#include "ts/ink_cap.h" #include "FileManager.h" #include "ClusterCom.h" #include "VMap.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index cc0cb82..0cfabdf 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -34,8 +34,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib libmgmt_c_la_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/MgmtDefs.h ---------------------------------------------------------------------- diff --git a/mgmt/MgmtDefs.h b/mgmt/MgmtDefs.h index 1d0ad67..c4cd86a 100644 --- a/mgmt/MgmtDefs.h +++ b/mgmt/MgmtDefs.h @@ -37,8 +37,8 @@ /* * Type definitions. */ -#include "ink_defs.h" -#include "ink_hrtime.h" +#include "ts/ink_defs.h" +#include "ts/ink_hrtime.h" typedef int64_t MgmtIntCounter; typedef int64_t MgmtInt; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/MultiFile.cc ---------------------------------------------------------------------- diff --git a/mgmt/MultiFile.cc b/mgmt/MultiFile.cc index e00b1e7..5643312 100644 --- a/mgmt/MultiFile.cc +++ b/mgmt/MultiFile.cc @@ -21,20 +21,20 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" -#include "ink_platform.h" -#include "ink_defs.h" -#include "ink_assert.h" -#include "ink_error.h" -#include "ink_file.h" -#include "ink_string.h" -#include "ink_time.h" +#include "ts/ink_platform.h" +#include "ts/ink_defs.h" +#include "ts/ink_assert.h" +#include "ts/ink_error.h" +#include "ts/ink_file.h" +#include "ts/ink_string.h" +#include "ts/ink_time.h" #include "MgmtUtils.h" #include "MultiFile.h" #include "ExpandingArray.h" -#include "TextBuffer.h" +#include "ts/TextBuffer.h" #include "WebMgmtUtils.h" /**************************************************************************** http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProcessManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc index 6c9bdf9..0b48350 100644 --- a/mgmt/ProcessManager.cc +++ b/mgmt/ProcessManager.cc @@ -22,15 +22,15 @@ */ -#include "libts.h" +#include "ts/libts.h" #undef HTTP_CACHE #include "InkAPIInternal.h" #include "MgmtUtils.h" #include "ProcessManager.h" -#include "ink_apidefs.h" +#include "ts/ink_apidefs.h" #include "MgmtSocket.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" /* * Global ProcessManager http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProcessManager.h ---------------------------------------------------------------------- diff --git a/mgmt/ProcessManager.h b/mgmt/ProcessManager.h index 8b89da6..ea2388c 100644 --- a/mgmt/ProcessManager.h +++ b/mgmt/ProcessManager.h @@ -38,9 +38,9 @@ #include "MgmtUtils.h" #include "BaseManager.h" -#include "ink_sock.h" +#include "ts/ink_sock.h" -#include "ink_apidefs.h" +#include "ts/ink_apidefs.h" class ConfigUpdateCbTable; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProxyConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc index 09545e2..13af7f8 100644 --- a/mgmt/ProxyConfig.cc +++ b/mgmt/ProxyConfig.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "ProxyConfig.h" #include "P_EventSystem.h" #include "ts/TestBox.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/ProxyConfig.h ---------------------------------------------------------------------- diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h index 8699296..d17fec5 100644 --- a/mgmt/ProxyConfig.h +++ b/mgmt/ProxyConfig.h @@ -31,7 +31,7 @@ #ifndef _Proxy_Config_h #define _Proxy_Config_h -#include "libts.h" +#include "ts/libts.h" #include "ProcessManager.h" #include "I_EventSystem.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 7ee3154..74ff03c 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -22,7 +22,7 @@ */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "RecordsConfig.h" #if TS_USE_REMOTE_UNWINDING http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/RecordsConfigUtils.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfigUtils.cc b/mgmt/RecordsConfigUtils.cc index 7c16503..debfef6 100644 --- a/mgmt/RecordsConfigUtils.cc +++ b/mgmt/RecordsConfigUtils.cc @@ -21,9 +21,9 @@ limitations under the License. */ -#include "ink_config.h" +#include "ts/ink_config.h" #include "RecordsConfig.h" -#include "ParseRules.h" +#include "ts/ParseRules.h" //------------------------------------------------------------------------- // RecordsConfigOverrideFromEnvironment http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Rollback.cc ---------------------------------------------------------------------- diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc index a218a7d..05044ea 100644 --- a/mgmt/Rollback.cc +++ b/mgmt/Rollback.cc @@ -21,15 +21,15 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "LocalManager.h" #include "Rollback.h" #include "WebMgmtUtils.h" #include "MgmtUtils.h" #include "ExpandingArray.h" #include "MgmtSocket.h" -#include "ink_cap.h" -#include "I_Layout.h" +#include "ts/ink_cap.h" +#include "ts/I_Layout.h" #include "FileManager.h" #define MAX_VERSION_DIGITS 11 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/Rollback.h ---------------------------------------------------------------------- diff --git a/mgmt/Rollback.h b/mgmt/Rollback.h index abc6388..082addb 100644 --- a/mgmt/Rollback.h +++ b/mgmt/Rollback.h @@ -32,11 +32,11 @@ * ****************************************************************************/ -#include "ink_platform.h" -#include "ink_mutex.h" -#include "ink_assert.h" -#include "TextBuffer.h" -#include "List.h" +#include "ts/ink_platform.h" +#include "ts/ink_mutex.h" +#include "ts/ink_assert.h" +#include "ts/TextBuffer.h" +#include "ts/List.h" class FileManager; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/WebMgmtUtils.cc ---------------------------------------------------------------------- diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc index b6572e2..0d97307 100644 --- a/mgmt/WebMgmtUtils.cc +++ b/mgmt/WebMgmtUtils.cc @@ -21,12 +21,12 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "LocalManager.h" #include "MgmtUtils.h" #include "WebMgmtUtils.h" #include "MultiFile.h" -#include "Regex.h" +#include "ts/Regex.h" /**************************************************************************** * http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/WebMgmtUtils.h ---------------------------------------------------------------------- diff --git a/mgmt/WebMgmtUtils.h b/mgmt/WebMgmtUtils.h index 0e00d29..a29c1c1 100644 --- a/mgmt/WebMgmtUtils.h +++ b/mgmt/WebMgmtUtils.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#include "ink_hash_table.h" -#include "TextBuffer.h" +#include "ts/ink_hash_table.h" +#include "ts/TextBuffer.h" #include "ExpandingArray.h" #include "P_RecCore.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/APITestCliRemote.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc index a783e68..28328f3 100644 --- a/mgmt/api/APITestCliRemote.cc +++ b/mgmt/api/APITestCliRemote.cc @@ -93,13 +93,13 @@ * reset_stats - resets all statistics to default values */ -#include "ink_config.h" -#include "ink_defs.h" +#include "ts/ink_config.h" +#include "ts/ink_defs.h" #include <stdlib.h> #include <string.h> #include <stdio.h> #include <strings.h> -#include "ink_string.h" +#include "ts/ink_string.h" #include "mgmtapi.h" #include "CfgContextUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextDefs.h ---------------------------------------------------------------------- diff --git a/mgmt/api/CfgContextDefs.h b/mgmt/api/CfgContextDefs.h index 30e3bd8..90d984a 100644 --- a/mgmt/api/CfgContextDefs.h +++ b/mgmt/api/CfgContextDefs.h @@ -28,7 +28,7 @@ #define _MGMT_API_DEFS_ #include "mgmtapi.h" -#include "ink_llqueue.h" +#include "ts/ink_llqueue.h" // for buffer used temporarily to parse incoming commands. #ifndef MAX_BUF_SIZE http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextImpl.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/CfgContextImpl.cc b/mgmt/api/CfgContextImpl.cc index 9a5f0e3..3756599 100644 --- a/mgmt/api/CfgContextImpl.cc +++ b/mgmt/api/CfgContextImpl.cc @@ -22,8 +22,8 @@ */ -#include "libts.h" -#include "ink_platform.h" +#include "ts/libts.h" +#include "ts/ink_platform.h" #include "CfgContextImpl.h" #include "CfgContextUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextImpl.h ---------------------------------------------------------------------- diff --git a/mgmt/api/CfgContextImpl.h b/mgmt/api/CfgContextImpl.h index 1c50084..db9364b 100644 --- a/mgmt/api/CfgContextImpl.h +++ b/mgmt/api/CfgContextImpl.h @@ -34,7 +34,7 @@ #include "CfgContextDefs.h" #include "GenericParser.h" /* use for TokenList */ -#include "List.h" +#include "ts/List.h" /********************************************************************** http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/CfgContextManager.cc b/mgmt/api/CfgContextManager.cc index d8a7196..315c61e 100644 --- a/mgmt/api/CfgContextManager.cc +++ b/mgmt/api/CfgContextManager.cc @@ -31,8 +31,8 @@ * Created by: Lan Tran * ***************************************************************************/ -#include "ink_platform.h" -#include "ink_string.h" +#include "ts/ink_platform.h" +#include "ts/ink_string.h" #include "CfgContextManager.h" #include "CfgContextUtils.h" #include "CoreAPI.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CfgContextUtils.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc index 873a6eb..2db5077 100644 --- a/mgmt/api/CfgContextUtils.cc +++ b/mgmt/api/CfgContextUtils.cc @@ -21,10 +21,10 @@ limitations under the License. */ -#include "libts.h" -#include "ink_platform.h" +#include "ts/libts.h" +#include "ts/ink_platform.h" #include "CfgContextUtils.h" -#include "Tokenizer.h" +#include "ts/Tokenizer.h" /*************************************************************************** * Conversion Functions ***************************************************************************/ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPI.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc index 48da1e2..e7d61c7 100644 --- a/mgmt/api/CoreAPI.cc +++ b/mgmt/api/CoreAPI.cc @@ -29,15 +29,15 @@ * ***************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include "MgmtUtils.h" #include "LocalManager.h" #include "ClusterCom.h" #include "FileManager.h" #include "Rollback.h" #include "WebMgmtUtils.h" -#include "Diags.h" -#include "ink_hash_table.h" +#include "ts/Diags.h" +#include "ts/ink_hash_table.h" #include "ExpandingArray.h" //#include "I_AccCrypto.h" @@ -45,8 +45,8 @@ #include "CoreAPIShared.h" #include "CfgContextUtils.h" #include "EventCallback.h" -#include "I_Layout.h" -#include "ink_cap.h" +#include "ts/I_Layout.h" +#include "ts/ink_cap.h" // global variable CallbackTable *local_event_callbacks; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPI.h ---------------------------------------------------------------------- diff --git a/mgmt/api/CoreAPI.h b/mgmt/api/CoreAPI.h index cb5ee88..c803299 100644 --- a/mgmt/api/CoreAPI.h +++ b/mgmt/api/CoreAPI.h @@ -27,12 +27,12 @@ #include <stdarg.h> // for va_list -#include "ink_llqueue.h" +#include "ts/ink_llqueue.h" #include "MgmtDefs.h" // MgmtInt, MgmtFloat, etc #include "mgmtapi.h" #include "CfgContextDefs.h" -#include "Tokenizer.h" +#include "ts/Tokenizer.h" TSMgmtError Init(const char *socket_path = NULL, TSInitOptionT options = TS_MGMT_OPT_DEFAULTS); TSMgmtError Terminate(); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPIRemote.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/CoreAPIRemote.cc b/mgmt/api/CoreAPIRemote.cc index 60592ad..2626880 100644 --- a/mgmt/api/CoreAPIRemote.cc +++ b/mgmt/api/CoreAPIRemote.cc @@ -36,12 +36,12 @@ * ***************************************************************************/ -#include "ink_config.h" -#include "ink_defs.h" +#include "ts/ink_config.h" +#include "ts/ink_defs.h" #include <strings.h> -#include "ink_string.h" -#include "I_Layout.h" -#include "ParseRules.h" +#include "ts/ink_string.h" +#include "ts/I_Layout.h" +#include "ts/ParseRules.h" #include "CoreAPI.h" #include "CoreAPIShared.h" #include "CfgContextUtils.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/CoreAPIShared.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/CoreAPIShared.cc b/mgmt/api/CoreAPIShared.cc index 746dc60..188f40c 100644 --- a/mgmt/api/CoreAPIShared.cc +++ b/mgmt/api/CoreAPIShared.cc @@ -21,7 +21,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "CoreAPIShared.h" #include "MgmtSocket.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/EventCallback.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/EventCallback.cc b/mgmt/api/EventCallback.cc index 4634cf3..f9736d8 100644 --- a/mgmt/api/EventCallback.cc +++ b/mgmt/api/EventCallback.cc @@ -29,8 +29,8 @@ * ***************************************************************************/ -#include "ink_config.h" -#include "ink_memory.h" +#include "ts/ink_config.h" +#include "ts/ink_memory.h" #include "EventCallback.h" #include "CoreAPIShared.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/EventCallback.h ---------------------------------------------------------------------- diff --git a/mgmt/api/EventCallback.h b/mgmt/api/EventCallback.h index b9ea187..8965392 100644 --- a/mgmt/api/EventCallback.h +++ b/mgmt/api/EventCallback.h @@ -38,7 +38,7 @@ #ifndef _EVENT_CALLBACK_H_ #define _EVENT_CALLBACK_H_ -#include "ink_llqueue.h" +#include "ts/ink_llqueue.h" #include "mgmtapi.h" #include "CoreAPIShared.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/EventControlMain.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/EventControlMain.cc b/mgmt/api/EventControlMain.cc index 2f0ce77..c7a87bc 100644 --- a/mgmt/api/EventControlMain.cc +++ b/mgmt/api/EventControlMain.cc @@ -29,7 +29,7 @@ * ***************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include "LocalManager.h" #include "MgmtSocket.h" #include "MgmtMarshall.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/GenericParser.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc index eb97e4f..575fd40 100644 --- a/mgmt/api/GenericParser.cc +++ b/mgmt/api/GenericParser.cc @@ -21,7 +21,7 @@ limitations under the License. */ -#include "libts.h" +#include "ts/libts.h" #include "GenericParser.h" /*************************************************************************** http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/GenericParser.h ---------------------------------------------------------------------- diff --git a/mgmt/api/GenericParser.h b/mgmt/api/GenericParser.h index 954681e..935069a 100644 --- a/mgmt/api/GenericParser.h +++ b/mgmt/api/GenericParser.h @@ -30,9 +30,9 @@ #define _GENERIC_PARSER_H_ #include <string.h> -#include "ink_assert.h" -#include "Tokenizer.h" -#include "List.h" +#include "ts/ink_assert.h" +#include "ts/Tokenizer.h" +#include "ts/List.h" #include "mgmtapi.h" // INKFileNameT #define MIN_CONFIG_TOKEN 1 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/INKMgmtAPI.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc index d10bcf8..4d56070 100644 --- a/mgmt/api/INKMgmtAPI.cc +++ b/mgmt/api/INKMgmtAPI.cc @@ -29,9 +29,9 @@ * * ***************************************************************************/ -#include "libts.h" +#include "ts/libts.h" #include <limits.h> -#include "I_Layout.h" +#include "ts/I_Layout.h" #include "mgmtapi.h" #include "CfgContextManager.h" @@ -40,7 +40,7 @@ #include "CoreAPI.h" #include "CoreAPIShared.h" -#include "TextBuffer.h" +#include "ts/TextBuffer.h" // forward declarations void init_pdss_format(TSPdSsFormat &info); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am index 62adea1..e479a77 100644 --- a/mgmt/api/Makefile.am +++ b/mgmt/api/Makefile.am @@ -22,8 +22,6 @@ SUBDIRS = include AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/utils \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkMessage.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/NetworkMessage.cc b/mgmt/api/NetworkMessage.cc index 160bed8..9fb5e21 100644 --- a/mgmt/api/NetworkMessage.cc +++ b/mgmt/api/NetworkMessage.cc @@ -21,10 +21,10 @@ limitations under the License. */ -#include "ink_config.h" -#include "ink_defs.h" -#include "ink_assert.h" -#include "ink_memory.h" +#include "ts/ink_config.h" +#include "ts/ink_defs.h" +#include "ts/ink_assert.h" +#include "ts/ink_memory.h" #include "mgmtapi.h" #include "NetworkMessage.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkUtilsLocal.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/NetworkUtilsLocal.cc b/mgmt/api/NetworkUtilsLocal.cc index 7bd6c81..a627b2d 100644 --- a/mgmt/api/NetworkUtilsLocal.cc +++ b/mgmt/api/NetworkUtilsLocal.cc @@ -30,9 +30,9 @@ * ***************************************************************************/ -#include "ink_platform.h" -#include "ink_sock.h" -#include "Diags.h" +#include "ts/ink_platform.h" +#include "ts/ink_sock.h" +#include "ts/Diags.h" #include "MgmtUtils.h" #include "MgmtSocket.h" #include "MgmtMarshall.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkUtilsLocal.h ---------------------------------------------------------------------- diff --git a/mgmt/api/NetworkUtilsLocal.h b/mgmt/api/NetworkUtilsLocal.h index 0dc0547..791bc10 100644 --- a/mgmt/api/NetworkUtilsLocal.h +++ b/mgmt/api/NetworkUtilsLocal.h @@ -24,7 +24,7 @@ #ifndef _NETWORK_UTILS_LOCAL_H_ #define _NETWORK_UTILS_LOCAL_H_ -#include "ink_defs.h" +#include "ts/ink_defs.h" #include "mgmtapi.h" /***************************************************************************** http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/NetworkUtilsRemote.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/NetworkUtilsRemote.cc b/mgmt/api/NetworkUtilsRemote.cc index 5d70366..f70768a 100644 --- a/mgmt/api/NetworkUtilsRemote.cc +++ b/mgmt/api/NetworkUtilsRemote.cc @@ -21,12 +21,12 @@ limitations under the License. */ -#include "ink_config.h" -#include "ink_defs.h" -#include "ink_sock.h" -#include "ink_string.h" -#include "ink_memory.h" -#include "I_Layout.h" +#include "ts/ink_config.h" +#include "ts/ink_defs.h" +#include "ts/ink_sock.h" +#include "ts/ink_string.h" +#include "ts/ink_memory.h" +#include "ts/I_Layout.h" #include "NetworkUtilsRemote.h" #include "CoreAPI.h" #include "CoreAPIShared.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/api/TSControlMain.cc ---------------------------------------------------------------------- diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc index a771ca3..54113f0 100644 --- a/mgmt/api/TSControlMain.cc +++ b/mgmt/api/TSControlMain.cc @@ -31,7 +31,7 @@ ***************************************************************************/ #include "mgmtapi.h" -#include "libts.h" +#include "ts/libts.h" #include "LocalManager.h" #include "MgmtUtils.h" #include "MgmtSocket.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/ClusterCom.cc ---------------------------------------------------------------------- diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc index 5ec30ed..2c814a9 100644 --- a/mgmt/cluster/ClusterCom.cc +++ b/mgmt/cluster/ClusterCom.cc @@ -31,11 +31,11 @@ * */ -#include "libts.h" +#include "ts/libts.h" -#include "I_Version.h" +#include "ts/I_Version.h" -#include "TextBuffer.h" +#include "ts/TextBuffer.h" #include "MgmtSocket.h" #include "LocalManager.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/ClusterCom.h ---------------------------------------------------------------------- diff --git a/mgmt/cluster/ClusterCom.h b/mgmt/cluster/ClusterCom.h index 7687f2f..c0ecc86 100644 --- a/mgmt/cluster/ClusterCom.h +++ b/mgmt/cluster/ClusterCom.h @@ -42,9 +42,9 @@ #ifndef _CLUSTER_COM_H #define _CLUSTER_COM_H -#include "ink_platform.h" +#include "ts/ink_platform.h" #include "P_RecDefs.h" -#include "I_Version.h" +#include "ts/I_Version.h" #include "Rollback.h" class FileManager; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am index 404bffc..34ca779 100644 --- a/mgmt/cluster/Makefile.am +++ b/mgmt/cluster/Makefile.am @@ -19,8 +19,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/utils \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/VMap.cc ---------------------------------------------------------------------- diff --git a/mgmt/cluster/VMap.cc b/mgmt/cluster/VMap.cc index 710a44f..e48987e 100644 --- a/mgmt/cluster/VMap.cc +++ b/mgmt/cluster/VMap.cc @@ -28,14 +28,14 @@ * * */ -#include "ink_platform.h" +#include "ts/ink_platform.h" #include "LocalManager.h" #include "VMap.h" #include "ClusterCom.h" #include "MgmtUtils.h" #include "P_RecLocal.h" -#include "I_Layout.h" +#include "ts/I_Layout.h" // for linux and freebsd #ifndef C_ISUID http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/cluster/VMap.h ---------------------------------------------------------------------- diff --git a/mgmt/cluster/VMap.h b/mgmt/cluster/VMap.h index 2959ab8..6bdf0e5 100644 --- a/mgmt/cluster/VMap.h +++ b/mgmt/cluster/VMap.h @@ -24,7 +24,7 @@ #ifndef _VMAP_H #define _VMAP_H -#include "libts.h" +#include "ts/libts.h" #define MAX_INTERFACE 16 #define MAX_SUB_ID 8 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/ExpandingArray.cc ---------------------------------------------------------------------- diff --git a/mgmt/utils/ExpandingArray.cc b/mgmt/utils/ExpandingArray.cc index 43d64e1..d5e21b5 100644 --- a/mgmt/utils/ExpandingArray.cc +++ b/mgmt/utils/ExpandingArray.cc @@ -21,8 +21,8 @@ limitations under the License. */ -#include "ink_platform.h" -#include "ink_memory.h" +#include "ts/ink_platform.h" +#include "ts/ink_memory.h" #include "ExpandingArray.h" ExpandingArray::ExpandingArray(int initialSize, bool freeContents) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am index 4324349..31c8513 100644 --- a/mgmt/utils/Makefile.am +++ b/mgmt/utils/Makefile.am @@ -25,8 +25,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/tsconfig \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/lib/records \ - -I$(top_srcdir)/lib/ts \ - -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib \ @OPENSSL_INCLUDES@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtHashTable.h ---------------------------------------------------------------------- diff --git a/mgmt/utils/MgmtHashTable.h b/mgmt/utils/MgmtHashTable.h index 1dbc12b..f1b7219 100644 --- a/mgmt/utils/MgmtHashTable.h +++ b/mgmt/utils/MgmtHashTable.h @@ -33,9 +33,9 @@ #ifndef _MGMT_HASH_TABLE_H #define _MGMT_HASH_TABLE_H -#include "ink_memory.h" -#include "ink_hash_table.h" -#include "ink_mutex.h" +#include "ts/ink_memory.h" +#include "ts/ink_hash_table.h" +#include "ts/ink_mutex.h" class MgmtHashTable {
