You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/07/16 23:51:16 UTC
[7/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts,
checkpoint 4
TS-3759 Eliminate -Ilib/ts, checkpoint 4
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bcec70dc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bcec70dc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bcec70dc
Branch: refs/heads/master
Commit: bcec70dc84a9a3eefc9a037c5a43e3422d4fc29a
Parents: 3fe162d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 16 14:22:01 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 16 14:49:52 2015 -0600
----------------------------------------------------------------------
cmd/traffic_layout/traffic_layout.cc | 1 -
iocore/cache/CacheHosting.cc | 2 ++
iocore/cache/P_CacheInternal.h | 1 +
iocore/cache/RamCacheCLFUS.cc | 1 +
iocore/cache/Store.cc | 3 +++
iocore/cluster/ClusterMachine.cc | 3 ++-
iocore/dns/SplitDNS.cc | 1 +
iocore/eventsystem/I_Lock.h | 1 +
iocore/eventsystem/P_UnixSocketManager.h | 3 ++-
iocore/eventsystem/Thread.cc | 1 +
iocore/hostdb/HostDB.cc | 1 +
iocore/net/P_SSLConfig.h | 1 +
iocore/net/SSLClientUtils.cc | 2 +-
iocore/net/SSLNetVConnection.cc | 1 +
iocore/net/SSLUtils.cc | 4 ++--
iocore/net/Socks.cc | 2 ++
iocore/net/UnixNetProcessor.cc | 2 ++
iocore/net/UnixNetVConnection.cc | 1 +
iocore/utils/I_Machine.h | 2 ++
lib/records/RecProcess.cc | 1 +
lib/ts/Makefile.am | 1 -
lib/ts/Regression.cc | 3 ++-
lib/ts/TestBox.h | 3 ++-
lib/ts/TextBuffer.cc | 1 +
lib/ts/X509HostnameValidator.h | 2 ++
lib/ts/ink_file.cc | 5 ++++-
lib/ts/ink_platform.h | 2 --
lib/ts/ink_rand.cc | 3 ++-
lib/ts/ink_stack_trace.cc | 3 ++-
lib/ts/ink_syslog.cc | 2 +-
lib/ts/ink_thread.cc | 1 +
mgmt/BaseManager.h | 1 +
mgmt/FileManager.cc | 3 ++-
mgmt/ProxyConfig.cc | 2 +-
mgmt/WebMgmtUtils.cc | 6 +++++-
mgmt/api/EventControlMain.cc | 3 ++-
mgmt/api/INKMgmtAPI.cc | 4 +++-
mgmt/cluster/ClusterCom.cc | 4 +++-
proxy/CacheControl.h | 1 +
proxy/ControlMatcher.cc | 1 +
proxy/ControlMatcher.h | 1 +
proxy/ICPConfig.cc | 1 +
proxy/InkAPI.cc | 1 +
proxy/InkAPITest.cc | 2 ++
proxy/Main.cc | 9 ++++++---
proxy/ParentSelection.cc | 2 ++
proxy/ParentSelection.h | 3 +--
proxy/RegressionSM.h | 2 ++
proxy/http/HttpBodyFactory.cc | 2 ++
proxy/http/HttpClientSession.h | 1 +
proxy/http/HttpConfig.h | 1 +
proxy/http/HttpPages.h | 2 +-
proxy/http/remap/RemapConfig.cc | 1 +
proxy/http2/Http2ClientSession.cc | 1 +
proxy/logcat.cc | 3 ++-
proxy/logging/Log.h | 3 +++
proxy/logging/LogFile.cc | 2 ++
proxy/logging/LogObject.cc | 4 ++--
proxy/logging/LogSock.cc | 2 ++
proxy/logging/LogStandalone.cc | 1 +
proxy/logging/LogUtils.cc | 1 +
proxy/logstats.cc | 4 +++-
proxy/sac.cc | 1 +
63 files changed, 104 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/cmd/traffic_layout/traffic_layout.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index efa166c..cd426f4 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -23,7 +23,6 @@
#include "ts/ink_platform.h"
#include "ts/ink_args.h"
-#include "ts/ink_config.h"
#include "ts/I_Version.h"
#include "ts/I_Layout.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/CacheHosting.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index 3281f79..4d8cb87 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -23,6 +23,8 @@
#include "P_Cache.h"
#include "ts/I_Layout.h"
+#include "ts/HostLookup.h"
+#include "ts/Tokenizer.h"
extern int gndisks;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index e576c5f..74efade 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -26,6 +26,7 @@
#define _P_CACHE_INTERNAL_H__
#include "ts/ink_platform.h"
+#include "ts/InkErrno.h"
#ifdef HTTP_CACHE
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/RamCacheCLFUS.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index 5681b1f..0e051b2 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -26,6 +26,7 @@
#include "P_Cache.h"
#include "I_Tasks.h"
+#include "ts/fastlz.h"
#if TS_HAS_LIBZ
#include <zlib.h>
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cache/Store.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 379eb04..6d41e15 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -24,6 +24,9 @@
#include "ts/ink_platform.h"
#include "P_Cache.h"
#include "ts/I_Layout.h"
+#include "ts/ink_file.h"
+#include "ts/Tokenizer.h"
+#include "ts/SimpleTokenizer.h"
#if HAVE_LINUX_MAJOR_H
#include <linux/major.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/cluster/ClusterMachine.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc
index 7173b11..3453320 100644
--- a/iocore/cluster/ClusterMachine.cc
+++ b/iocore/cluster/ClusterMachine.cc
@@ -26,7 +26,8 @@
Machine.cc
****************************************************************************/
-#include "ts/ink_config.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include <unistd.h>
#include "P_Cluster.h"
#include "ts/I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index ca88de6..346e4a9 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -29,6 +29,7 @@
****************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/Tokenizer.h"
#ifdef SPLIT_DNS
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/eventsystem/I_Lock.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h
index f8dc670..e90d1bf 100644
--- a/iocore/eventsystem/I_Lock.h
+++ b/iocore/eventsystem/I_Lock.h
@@ -25,6 +25,7 @@
#define _I_Lock_h_
#include "ts/ink_platform.h"
+#include "ts/Diags.h"
#include "I_Thread.h"
#define MAX_LOCK_TIME HRTIME_MSECONDS(200)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/eventsystem/P_UnixSocketManager.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_UnixSocketManager.h b/iocore/eventsystem/P_UnixSocketManager.h
index 210b5e4..2582c5a 100644
--- a/iocore/eventsystem/P_UnixSocketManager.h
+++ b/iocore/eventsystem/P_UnixSocketManager.h
@@ -32,7 +32,8 @@
#ifndef _P_UnixSocketManager_h_
#define _P_UnixSocketManager_h_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "I_SocketManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/eventsystem/Thread.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Thread.cc b/iocore/eventsystem/Thread.cc
index bc94737..41b17ca 100644
--- a/iocore/eventsystem/Thread.cc
+++ b/iocore/eventsystem/Thread.cc
@@ -29,6 +29,7 @@
**************************************************************************/
#include "P_EventSystem.h"
+#include "ts/ink_string.h"
///////////////////////////////////////////////
// Common Interface impl //
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 6ed6937..53d13d2 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -26,6 +26,7 @@
#include "P_HostDB.h"
#include "ts/I_Layout.h"
#include "Show.h"
+#include "ts/Tokenizer.h"
#include <vector>
#include <algorithm>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/P_SSLConfig.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLConfig.h b/iocore/net/P_SSLConfig.h
index 3d942f6..a8d5eb7 100644
--- a/iocore/net/P_SSLConfig.h
+++ b/iocore/net/P_SSLConfig.h
@@ -33,6 +33,7 @@
#include "ProxyConfig.h"
#include "SSLSessionCache.h"
+#include "ts/ink_inet.h"
struct SSLCertLookup;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/SSLClientUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc
index c37b11f..be78389 100644
--- a/iocore/net/SSLClientUtils.cc
+++ b/iocore/net/SSLClientUtils.cc
@@ -22,12 +22,12 @@
#include "ts/ink_config.h"
#include "records/I_RecHttp.h"
#include "ts/ink_platform.h"
+#include "ts/X509HostnameValidator.h"
#include "P_Net.h"
#include "P_SSLClientUtils.h"
#include <openssl/err.h>
#include <openssl/pem.h>
-#include <openssl/x509.h>
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) // openssl returns a const SSL_METHOD
typedef const SSL_METHOD *ink_ssl_method_t;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index d6fc98b..e06f749 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -21,6 +21,7 @@
limitations under the License.
*/
#include "ts/ink_config.h"
+#include "ts/EventNotify.h"
#include "records/I_RecHttp.h"
#include "P_Net.h"
#include "P_SSLNextProtocolSet.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 29312a7..e9f30a6 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -19,9 +19,9 @@
limitations under the License.
*/
-#include "ts/ink_config.h"
-#include "records/I_RecHttp.h"
#include "ts/ink_platform.h"
+#include "ts/SimpleTokenizer.h"
+#include "records/I_RecHttp.h"
#include "ts/I_Layout.h"
#include "P_Net.h"
#include "ts/ink_cap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/Socks.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index 08239e8..78ccd9a 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -32,6 +32,8 @@
#include "P_Net.h"
#include "ts/I_Layout.h"
+#include "ts/ink_sock.h"
+#include "ts/InkErrno.h"
#include <ts/IpMapConf.h>
socks_conf_struct *g_socks_conf_stuff = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/UnixNetProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetProcessor.cc b/iocore/net/UnixNetProcessor.cc
index e03f15c..89bb63a 100644
--- a/iocore/net/UnixNetProcessor.cc
+++ b/iocore/net/UnixNetProcessor.cc
@@ -22,6 +22,8 @@
*/
#include "P_Net.h"
+#include "ts/InkErrno.h"
+#include "ts/ink_sock.h"
// For Stat Pages
#include "StatPages.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 129cbab..f32a25f 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -23,6 +23,7 @@
#include "P_Net.h"
#include "ts/ink_platform.h"
+#include "ts/InkErrno.h"
#include "Log.h"
#define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/iocore/utils/I_Machine.h
----------------------------------------------------------------------
diff --git a/iocore/utils/I_Machine.h b/iocore/utils/I_Machine.h
index b438f62..8414f3d 100644
--- a/iocore/utils/I_Machine.h
+++ b/iocore/utils/I_Machine.h
@@ -31,6 +31,8 @@
#ifndef _I_Machine_h
#define _I_Machine_h
+#include "ts/ink_inet.h"
+
/**
The Machine is a simple place holder for the hostname and the ip
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/records/RecProcess.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index 8f31ceb..5cefe0f 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -22,6 +22,7 @@
*/
#include "ts/ink_platform.h"
+#include "ts/EventNotify.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 66273fd..dde1643 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -176,7 +176,6 @@ libtsutil_la_SOURCES = \
ink_thread.h \
ink_time.cc \
ink_time.h \
- libts.h \
llqueue.cc \
lockfile.cc \
signals.cc \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/Regression.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Regression.cc b/lib/ts/Regression.cc
index 7cd52c5..503917d 100644
--- a/lib/ts/Regression.cc
+++ b/lib/ts/Regression.cc
@@ -28,7 +28,8 @@
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_assert.h"
#include "ts/Regression.h"
static RegressionTest *test = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/TestBox.h
----------------------------------------------------------------------
diff --git a/lib/ts/TestBox.h b/lib/ts/TestBox.h
index cee6926..4020fc3 100644
--- a/lib/ts/TestBox.h
+++ b/lib/ts/TestBox.h
@@ -24,7 +24,8 @@
limitations under the License.
*/
-#include <ts/Regression.h>
+#include <stdarg.h>
+#include "ts/Regression.h"
namespace
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/TextBuffer.cc
----------------------------------------------------------------------
diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc
index 149baf3..fa80391 100644
--- a/lib/ts/TextBuffer.cc
+++ b/lib/ts/TextBuffer.cc
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include <stdarg.h>
#include "ts/ink_platform.h"
#include "ts/ink_memory.h"
#include "ts/TextBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/X509HostnameValidator.h
----------------------------------------------------------------------
diff --git a/lib/ts/X509HostnameValidator.h b/lib/ts/X509HostnameValidator.h
index 5d9542d..4618c8b 100644
--- a/lib/ts/X509HostnameValidator.h
+++ b/lib/ts/X509HostnameValidator.h
@@ -24,6 +24,8 @@
#ifndef LIB_TS_X509HOSTNAMEVALIDATOR_H_
#define LIB_TS_X509HOSTNAMEVALIDATOR_H_
+#include <openssl/x509.h>
+
/*
* Validate that the certificate is for the specified hostname/IP address
* @param cert The X509 certificate we match against
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_file.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_file.cc b/lib/ts/ink_file.cc
index e095b14..5e69d46 100644
--- a/lib/ts/ink_file.cc
+++ b/lib/ts/ink_file.cc
@@ -21,9 +21,12 @@
limitations under the License.
*/
-#include "ts/libts.h"
#include <unistd.h>
#include <limits.h>
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
+#include "ts/ink_string.h"
+#include "ts/ink_memory.h"
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_platform.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_platform.h b/lib/ts/ink_platform.h
index a67a9ba..75d129a 100644
--- a/lib/ts/ink_platform.h
+++ b/lib/ts/ink_platform.h
@@ -27,8 +27,6 @@
#include "ts/ink_config.h"
-#include <stdio.h>
-#include <stdarg.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_rand.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc
index 5251790..06bd5b4 100644
--- a/lib/ts/ink_rand.cc
+++ b/lib/ts/ink_rand.cc
@@ -55,7 +55,8 @@
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_rand.h"
#define NN 312
#define MM 156
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_stack_trace.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_stack_trace.cc b/lib/ts/ink_stack_trace.cc
index 1375eaf..e5d157a 100644
--- a/lib/ts/ink_stack_trace.cc
+++ b/lib/ts/ink_stack_trace.cc
@@ -21,8 +21,9 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ts/ink_stack_trace.h"
+#include "ts/ink_args.h"
#include <strings.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_syslog.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_syslog.cc b/lib/ts/ink_syslog.cc
index ad8b00c..ac3b896 100644
--- a/lib/ts/ink_syslog.cc
+++ b/lib/ts/ink_syslog.cc
@@ -28,7 +28,7 @@
*
*
****************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
struct syslog_fac {
char *long_str;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/lib/ts/ink_thread.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_thread.cc b/lib/ts/ink_thread.cc
index 953f2d7..33db2ab 100644
--- a/lib/ts/ink_thread.cc
+++ b/lib/ts/ink_thread.cc
@@ -30,6 +30,7 @@
#include "ts/ink_platform.h"
#include "ts/ink_thread.h"
+#include "ts/ink_atomic.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/bcec70dc/mgmt/BaseManager.h
----------------------------------------------------------------------
diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h
index dbaca14..c2ece05 100644
--- a/mgmt/BaseManager.h
+++ b/mgmt/BaseManager.h
@@ -37,6 +37,7 @@
#include "ts/ink_thread.h"
#include "ts/ink_mutex.h"
#include "ts/ink_llqueue.h"
+#include "ts/ink_hash_table.h"
#include "MgmtDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/FileManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc
index 963687e..e2d1c90 100644
--- a/mgmt/FileManager.cc
+++ b/mgmt/FileManager.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include "ts/I_Layout.h"
#include "FileManager.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/ProxyConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index 13af7f8..ca6273d 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "ProxyConfig.h"
#include "P_EventSystem.h"
#include "ts/TestBox.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/WebMgmtUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc
index 0d97307..e0c817b 100644
--- a/mgmt/WebMgmtUtils.cc
+++ b/mgmt/WebMgmtUtils.cc
@@ -21,7 +21,11 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_string.h"
+#include "ts/Tokenizer.h"
+#include "ts/ink_code.h"
+#include "ts/ink_file.h"
#include "LocalManager.h"
#include "MgmtUtils.h"
#include "WebMgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/api/EventControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/EventControlMain.cc b/mgmt/api/EventControlMain.cc
index c7a87bc..c26855f 100644
--- a/mgmt/api/EventControlMain.cc
+++ b/mgmt/api/EventControlMain.cc
@@ -29,7 +29,8 @@
*
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
#include "LocalManager.h"
#include "MgmtSocket.h"
#include "MgmtMarshall.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/api/INKMgmtAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc
index 4d56070..ad78811 100644
--- a/mgmt/api/INKMgmtAPI.cc
+++ b/mgmt/api/INKMgmtAPI.cc
@@ -29,7 +29,9 @@
*
*
***************************************************************************/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_code.h"
+#include "ts/ParseRules.h"
#include <limits.h>
#include "ts/I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/mgmt/cluster/ClusterCom.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 2c814a9..45055ff 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -31,7 +31,9 @@
*
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_file.h"
#include "ts/I_Version.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/CacheControl.h
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.h b/proxy/CacheControl.h
index de3820c..059c546 100644
--- a/proxy/CacheControl.h
+++ b/proxy/CacheControl.h
@@ -34,6 +34,7 @@
#include "Main.h"
#include "P_EventSystem.h"
#include "ControlBase.h"
+#include "ts/MatcherUtils.h"
struct RequestData;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 5d13a7d..75c101c 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -32,6 +32,7 @@
#include "ts/ink_config.h"
#include "ts/MatcherUtils.h"
+#include "ts/Tokenizer.h"
#include "Main.h"
#include "ProxyConfig.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 57562a8..5c1158d 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -90,6 +90,7 @@
#include "ts/DynArray.h"
#include "ts/ink_hash_table.h"
#include "ts/IpMap.h"
+#include "ts/MatcherUtils.h"
#include "ts/ink_apidefs.h"
#include "ts/ink_defs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ICPConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index e6ed78b..c642e0c 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -29,6 +29,7 @@
****************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
#include "P_Net.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 5e3c0f8..445e2ce 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -24,6 +24,7 @@
#include <stdio.h>
#include "ts/ink_platform.h"
+#include "ts/ink_base64.h"
#include "ts/I_Layout.h"
#include "ts.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index fcf2997..4a43fa6 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -28,6 +28,8 @@
#endif
#include "ts/ink_config.h"
+#include "ts/ink_sprintf.h"
+#include "ts/ink_file.h"
#include <sys/types.h>
#include <errno.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 0f402dd..c517af3 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -30,10 +30,14 @@
****************************************************************************/
-#include "ts/ink_config.h"
-
#include "ts/ink_platform.h"
#include "ts/ink_sys_control.h"
+#include "ts/ink_args.h"
+#include "ts/ink_lockfile.h"
+#include "ts/ink_stack_trace.h"
+#include "ts/ink_syslog.h"
+#include "ts/hugepages.h"
+
#include <syslog.h>
#if !defined(linux)
@@ -89,7 +93,6 @@ extern "C" int plock(int);
#include "I_Tasks.h"
#include "InkAPIInternal.h"
#include "HTTP2.h"
-#include "ts/ink_config.h"
#include <ts/ink_cap.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ParentSelection.cc
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index b8e432c..9000982 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -21,6 +21,8 @@
limitations under the License.
*/
#include "ts/ink_platform.h"
+#include "ts/HashSip.h"
+#include "ts/Tokenizer.h"
#include "P_EventSystem.h"
#include "ParentSelection.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/ParentSelection.h
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index e25b38e..a74b659 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -36,11 +36,10 @@
#include "ControlBase.h"
#include "ControlMatcher.h"
-#include "ts/ink_apidefs.h"
-
#include "P_RecProcess.h"
#include "ts/ink_platform.h"
+#include "ts/ConsistentHash.h"
#define MAX_PARENTS 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/RegressionSM.h
----------------------------------------------------------------------
diff --git a/proxy/RegressionSM.h b/proxy/RegressionSM.h
index 3295969..08399d2 100644
--- a/proxy/RegressionSM.h
+++ b/proxy/RegressionSM.h
@@ -25,6 +25,8 @@
#define _RegressionSM_h
#include "I_EventSystem.h"
+#include "ts/Regression.h"
+#include "ts/DynArray.h"
/*
Regression Test Composition State Machine
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpBodyFactory.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 0d01139..51a3e8f 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -29,6 +29,8 @@
****************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/ink_sprintf.h"
+#include "ts/ink_file.h"
#include "HttpBodyFactory.h"
#include <unistd.h>
#include <dirent.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.h b/proxy/http/HttpClientSession.h
index 6f4c885..5c5ae53 100644
--- a/proxy/http/HttpClientSession.h
+++ b/proxy/http/HttpClientSession.h
@@ -33,6 +33,7 @@
#define _HTTP_CLIENT_SESSION_H_
#include "ts/ink_platform.h"
+#include "ts/ink_resolver.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 085136c..cd2cb75 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -42,6 +42,7 @@
#endif
#include "ts/ink_platform.h"
+#include "ts/ink_inet.h"
#include "ts/Regex.h"
#include "HttpProxyAPIEnums.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/HttpPages.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index f009111..de43487 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -34,7 +34,7 @@
#ifndef _HTTP_PAGES_H_
#define _HTTP_PAGES_H_
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
#include "P_EventSystem.h"
#include "ts/DynArray.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 7152b6e..2013009 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -30,6 +30,7 @@
#include "ts/List.h"
#include "ts/ink_cap.h"
#include "ts/ink_file.h"
+#include "ts/Tokenizer.h"
#define modulePrefix "[ReverseProxy]"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/http2/Http2ClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc
index b0a130a..4e3b85e 100644
--- a/proxy/http2/Http2ClientSession.cc
+++ b/proxy/http2/Http2ClientSession.cc
@@ -23,6 +23,7 @@
#include "Http2ClientSession.h"
#include "HttpDebugNames.h"
+#include "ts/ink_base64.h"
#define STATE_ENTER(state_name, event) \
do { \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logcat.cc
----------------------------------------------------------------------
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 3113b5d..3fe50fe 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -21,7 +21,8 @@
limitations under the License.
*/
-#include "ts/libts.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_args.h"
#include "ts/I_Layout.h"
#define PROGRAM_NAME "traffic_logcat"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/Log.h
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 672ac2e..814b277 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -295,6 +295,9 @@
#include <stdarg.h>
#include "ts/ink_platform.h"
+#include "ts/EventNotify.h"
+#include "ts/ink_hash_table.h"
+#include "ts/Regression.h"
#include "P_RecProcess.h"
#include "LogFile.h"
#include "LogBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index 8253d16..bf8ef3e 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -28,6 +28,8 @@
***************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/SimpleTokenizer.h"
+#include "ts/ink_file.h"
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 7311773..640ba45 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -27,8 +27,8 @@
***************************************************************************/
#include "ts/ink_platform.h"
-
-
+#include "ts/CryptoHash.h"
+#include "ts/INK_MD5.h"
#include "Error.h"
#include "P_EventSystem.h"
#include "LogUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogSock.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogSock.cc b/proxy/logging/LogSock.cc
index 87ca857..ed431e4 100644
--- a/proxy/logging/LogSock.cc
+++ b/proxy/logging/LogSock.cc
@@ -21,6 +21,8 @@
limitations under the License.
*/
+#include "ts/ink_inet.h"
+#include "ts/ink_string.h"
#include "P_EventSystem.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogStandalone.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index de289a3..cfefdf4 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -28,6 +28,7 @@
***************************************************************************/
#include "ts/ink_platform.h"
+#include "ts/ink_lockfile.h"
#include "ts/ink_sys_control.h"
#include "ts/signals.h"
#include "DiagsConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logging/LogUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index 1aac724..fedae07 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -22,6 +22,7 @@
limitations under the License.
*/
#include "ts/ink_config.h"
+#include "ts/ink_string.h"
#include <assert.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 7143835..4922e15 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -22,10 +22,12 @@
*/
#include "ts/ink_platform.h"
-#include "ts/ink_config.h"
#include "ts/ink_file.h"
#include "ts/I_Layout.h"
#include "ts/I_Version.h"
+#include "ts/HashFNV.h"
+#include "ts/ink_args.h"
+#include "ts/MatcherUtils.h"
// Includes and namespaces etc.
#include "LogStandalone.cc"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bcec70dc/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index 3c20573..acfac2b 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -22,6 +22,7 @@
*/
#include "ts/ink_platform.h"
+#include "ts/ink_args.h"
#include "ts/I_Layout.h"
#include "P_Net.h"