You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/08/02 04:59:31 UTC
[5/9] git commit: TS-2977: minimize web2 and cluster in the headers
search path
TS-2977: minimize web2 and cluster in the headers search path
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ff716f21
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ff716f21
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ff716f21
Branch: refs/heads/master
Commit: ff716f219a86284fb980ba2ed05c41105ce274ef
Parents: 1bba62b
Author: James Peach <jp...@apache.org>
Authored: Thu Jul 31 13:48:17 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Aug 1 19:55:45 2014 -0700
----------------------------------------------------------------------
cmd/traffic_manager/Main.cc | 7 +++----
cmd/traffic_manager/StatProcessor.cc | 2 +-
lib/records/Makefile.am | 2 --
mgmt/Alarms.cc | 2 +-
mgmt/LocalManager.cc | 14 ++++++++++++++
mgmt/LocalManager.h | 17 +++--------------
mgmt/api/CoreAPI.cc | 3 ++-
mgmt/cluster/ClusterCom.cc | 1 +
mgmt/cluster/Makefile.am | 1 -
mgmt/cluster/VMap.cc | 1 +
mgmt/utils/Makefile.am | 2 --
mgmt/web2/WebOverview.cc | 2 +-
proxy/shared/Makefile.am | 2 --
13 files changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/cmd/traffic_manager/Main.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/Main.cc b/cmd/traffic_manager/Main.cc
index d54eb94..8d80a24 100644
--- a/cmd/traffic_manager/Main.cc
+++ b/cmd/traffic_manager/Main.cc
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "ink_platform.h"
+#include "libts.h"
#include "ink_sys_control.h"
#include "Main.h"
@@ -30,11 +29,11 @@
#include "WebMgmtUtils.h"
#include "WebIntrMain.h"
#include "WebOverview.h"
+#include "ClusterCom.h"
+#include "VMap.h"
#include "FileManager.h"
#include "I_Layout.h"
#include "I_Version.h"
-#include "ink_syslog.h"
-#include "ink_lockfile.h"
#include "Diags.h"
#include "DiagsConfig.h"
#include "URL.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/cmd/traffic_manager/StatProcessor.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/StatProcessor.cc b/cmd/traffic_manager/StatProcessor.cc
index 24cbaa9..3fd670e 100644
--- a/cmd/traffic_manager/StatProcessor.cc
+++ b/cmd/traffic_manager/StatProcessor.cc
@@ -30,7 +30,7 @@
*
****************************************************************************/
-#include "ink_config.h"
+#include "libts.h"
#include "StatProcessor.h"
#include "FileManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/lib/records/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index 744194c..e3b74cf 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/eventsystem \
-I$(top_srcdir)/iocore/utils \
-I$(top_srcdir)/mgmt \
- -I$(top_srcdir)/mgmt/cluster \
- -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/lib \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/Alarms.cc
----------------------------------------------------------------------
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index b44930f..aed1537 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -24,11 +24,11 @@
#include "libts.h"
#include "LocalManager.h"
+#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "Alarms.h"
#include "Diags.h"
-
#include "P_RecCore.h"
const char *alarmText[] = {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index d6930e1..885b054 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -31,6 +31,8 @@
#include "MgmtSocket.h"
#include "ink_cap.h"
#include "FileManager.h"
+#include "ClusterCom.h"
+#include "VMap.h"
#if TS_USE_POSIX_CAP
#include <sys/capability.h>
@@ -290,6 +292,18 @@ LocalManager::LocalManager(bool proxy_on)
return;
}
+LocalManager::~LocalManager()
+{
+ delete alarm_keeper;
+ delete virt_map;
+ delete ccom;
+ ats_free(absolute_proxy_binary);
+ ats_free(proxy_name);
+ ats_free(proxy_binary);
+ ats_free(proxy_options);
+ ats_free(env_prep);
+}
+
void
LocalManager::initAlarm()
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/LocalManager.h
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.h b/mgmt/LocalManager.h
index 785cbc0..a001646 100644
--- a/mgmt/LocalManager.h
+++ b/mgmt/LocalManager.h
@@ -36,31 +36,20 @@
#include "Alarms.h"
#include "BaseManager.h"
-#include "ClusterCom.h"
-#include "VMap.h"
#include <records/I_RecHttp.h>
#if TS_HAS_WCCP
#include <wccp/Wccp.h>
#endif
class FileManager;
+class ClusterCom;
+class VMap;
class LocalManager: public BaseManager
{
public:
explicit LocalManager(bool proxy_on);
-
- ~LocalManager()
- {
- delete alarm_keeper;
- delete virt_map;
- delete ccom;
- ats_free(absolute_proxy_binary);
- ats_free(proxy_name);
- ats_free(proxy_binary);
- ats_free(proxy_options);
- ats_free(env_prep);
- };
+ ~LocalManager();
void initAlarm();
void initCCom(const AppVersionInfo& version, FileManager * files, int mcport, char *addr, int rsport);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/api/CoreAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc
index 1ca1fc3..57ff3d2 100644
--- a/mgmt/api/CoreAPI.cc
+++ b/mgmt/api/CoreAPI.cc
@@ -29,9 +29,10 @@
*
***************************************************************************/
-#include "ink_platform.h"
+#include "libts.h"
#include "MgmtUtils.h"
#include "LocalManager.h"
+#include "ClusterCom.h"
#include "FileManager.h"
#include "Rollback.h"
#include "WebMgmtUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/cluster/ClusterCom.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index c538235..6293a37 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -40,6 +40,7 @@
#include "LocalManager.h"
#include "ClusterCom.h"
+#include "VMap.h"
#include "MgmtUtils.h"
#include "WebMgmtUtils.h"
#include "MgmtHashTable.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am
index 51d63a0..cae4ec7 100644
--- a/mgmt/cluster/Makefile.am
+++ b/mgmt/cluster/Makefile.am
@@ -23,7 +23,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
- -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/cluster/VMap.cc
----------------------------------------------------------------------
diff --git a/mgmt/cluster/VMap.cc b/mgmt/cluster/VMap.cc
index 2261f88..993f44b 100644
--- a/mgmt/cluster/VMap.cc
+++ b/mgmt/cluster/VMap.cc
@@ -32,6 +32,7 @@
#include "LocalManager.h"
#include "VMap.h"
+#include "ClusterCom.h"
#include "MgmtUtils.h"
#include "P_RecLocal.h"
#include "I_Layout.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 46b6673..8321221 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -22,8 +22,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api \
-I$(top_srcdir)/mgmt/api/include \
- -I$(top_srcdir)/mgmt/cluster \
- -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib/tsconfig \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib/records \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/mgmt/web2/WebOverview.cc
----------------------------------------------------------------------
diff --git a/mgmt/web2/WebOverview.cc b/mgmt/web2/WebOverview.cc
index 3084eb8..95e6330 100644
--- a/mgmt/web2/WebOverview.cc
+++ b/mgmt/web2/WebOverview.cc
@@ -28,7 +28,7 @@
*
****************************************************************************/
-#include "ink_platform.h"
+#include "libts.h"
#include "WebOverview.h"
#include "WebGlobals.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ff716f21/proxy/shared/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index 2db77e7..ca79f60 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -29,10 +29,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/mgmt \
- -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/mgmt/api \
-I$(top_srcdir)/mgmt/api/include \
- -I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir) \
-I$(top_srcdir)/proxy/api/ts \