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 2010/02/08 22:12:04 UTC
svn commit: r907798 - in /incubator/trafficserver/traffic/branches/dev: ./
iocore/cache/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/ iocore/net/
libinktomi++/ librecords/ proxy/ proxy/hdrs/ proxy/http2/ proxy/logging/
proxy/mgmt2/ proxy/mgmt2/api2/ ...
Author: jplevyak
Date: Mon Feb 8 21:11:58 2010
New Revision: 907798
URL: http://svn.apache.org/viewvc?rev=907798&view=rev
Log:
TS-130: use config.h for our configuration values
Added:
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_config.h
Modified:
incubator/trafficserver/traffic/branches/dev/configure.ac
incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePages.cc
incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePagesInternal.cc
incubator/trafficserver/traffic/branches/dev/iocore/dns/DNSConnection.cc
incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h
incubator/trafficserver/traffic/branches/dev/iocore/dns/SplitDNS.cc
incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h
incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h
incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/SocketManager.cc
incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
incubator/trafficserver/traffic/branches/dev/iocore/hostdb/MultiCache.cc
incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h
incubator/trafficserver/traffic/branches/dev/iocore/net/Connection.cc
incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLConfig.h
incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetAccept.h
incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetProcessor.h
incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetVConnection.h
incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h
incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixPollDescriptor.h
incubator/trafficserver/traffic/branches/dev/iocore/net/SSLCertLookup.cc
incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc
incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNet.cc
incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNetVConnection.cc
incubator/trafficserver/traffic/branches/dev/iocore/net/SSLUnixNet.cc
incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNetPages.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/Regex.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_file.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_hrtime.h
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_inet.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.h
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_pread_linux.c
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_sock.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/inktomi++.h
incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc
incubator/trafficserver/traffic/branches/dev/librecords/RecCore.cc
incubator/trafficserver/traffic/branches/dev/librecords/RecLocal.cc
incubator/trafficserver/traffic/branches/dev/librecords/RecMessage.cc
incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc
incubator/trafficserver/traffic/branches/dev/librecords/RecTree.cc
incubator/trafficserver/traffic/branches/dev/librecords/RecUtils.cc
incubator/trafficserver/traffic/branches/dev/proxy/Config.cc
incubator/trafficserver/traffic/branches/dev/proxy/Config.h
incubator/trafficserver/traffic/branches/dev/proxy/CoreUtils.cc
incubator/trafficserver/traffic/branches/dev/proxy/ICPConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/InkXml.cc
incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
incubator/trafficserver/traffic/branches/dev/proxy/Plugin.cc
incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc
incubator/trafficserver/traffic/branches/dev/proxy/SocksProxy.cc
incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc
incubator/trafficserver/traffic/branches/dev/proxy/Update.cc
incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc
incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrHeap.cc
incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTSOnly.cc
incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTest.cc
incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrUtils.cc
incubator/trafficserver/traffic/branches/dev/proxy/hdrs/SDKAllocator.h
incubator/trafficserver/traffic/branches/dev/proxy/http2/Hash_Table.cc
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactHeaders.cc
incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccess.cc
incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessICP.cc
incubator/trafficserver/traffic/branches/dev/proxy/logging/LogConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/logging/LogField.cc
incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFilter.cc
incubator/trafficserver/traffic/branches/dev/proxy/logging/LogHost.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseRecords.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/FileManager.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Rollback.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/WebPluginList.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/EventControlMain.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/TSControlMain.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/ClusterCom.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/VMap.h
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/StoreReadConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/VIPConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtConverter.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtSchema.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/WebMgmtUtils.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc
incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.cc
incubator/trafficserver/traffic/branches/dev/proxy/stats/Stats.cc
Modified: incubator/trafficserver/traffic/branches/dev/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/configure.ac?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/configure.ac (original)
+++ incubator/trafficserver/traffic/branches/dev/configure.ac Mon Feb 8 21:11:58 2010
@@ -7,6 +7,7 @@
# 4. CHECK FOR LIBRARIES
# 5. CHECK FOR HEADERS
# 6. OUTPUT FILES
+# 7. autoheader TEMPLATES
# -----------------------------------------------------------------------------
# 1. INITIALIZATION
@@ -17,6 +18,7 @@
AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])
AC_CONFIG_SRCDIR([proxy/Main.cc])
AC_CONFIG_MACRO_DIR([m4])
+AM_CONFIG_HEADER([config.h])
#
# Host detection
@@ -186,7 +188,10 @@
AC_SUBST([ink_with_modules_local],[""])
AC_SUBST([ink_with_modules_process],[""])
],
- [AC_SUBST([IOCORE_MODULARIZED_DEFS],["-DFIXME_NONMODULAR -DSPLIT_DNS -DNON_MODULAR -DHTTP_CACHE"])
+ [AC_DEFINE([FIXME_NONMODULAR])
+ AC_DEFINE([SPLIT_DNS])
+ AC_DEFINE([NON_MODULAR])
+ AC_DEFINE([HTTP_CACHE])
AC_SUBST([ink_with_modules_def],["-DREC_BUILD_MGMT2"])
AC_SUBST([ink_with_modules_local],["-DLOCAL_MANAGER"])
AC_SUBST([ink_with_modules_process],["-DPROCESS_MANAGER"])
@@ -785,5 +790,51 @@
AC_CONFIG_FILES([proxy/mgmt2/web2/Makefile])
AC_CONFIG_FILES([proxy/stats/Makefile])
+# -----------------------------------------------------------------------------
+# 7. autoheader TEMPLATES
+
+AH_TEMPLATE([BUILD_MACHINE],[BUILD_MACHINE])
+AH_TEMPLATE([BUILD_PERSON],[BUILD_PERSON])
+AH_TEMPLATE([DEBUG],[DEBUG])
+AH_TEMPLATE([HAVE_DEMANGLE],[HAVE_DEMANGLE])
+AH_TEMPLATE([HOST_OS],[HOST_OS])
+AH_TEMPLATE([HTTP_CACHE],[HTTP_CACHE])
+AH_TEMPLATE([INKDISKAIO],[INKDISKAIO])
+AH_TEMPLATE([INK_NO_ACL],[INK_NO_ACL])
+AH_TEMPLATE([INK_NO_API],[INK_NO_API])
+AH_TEMPLATE([INK_NO_CLUSTER],[INK_NO_CLUSTER])
+AH_TEMPLATE([INK_NO_DIAGS],[INK_NO_DIAGS])
+AH_TEMPLATE([INK_NO_FTP],[INK_NO_FTP])
+AH_TEMPLATE([INK_NO_HOSTDB],[INK_NO_HOSTDB])
+AH_TEMPLATE([INK_NO_ICP],[INK_NO_ICP])
+AH_TEMPLATE([INK_NO_LOG],[INK_NO_LOG])
+AH_TEMPLATE([INK_NO_REMAP],[INK_NO_REMAP])
+AH_TEMPLATE([INK_NO_REVERSE],[INK_NO_REVERSE])
+AH_TEMPLATE([INK_NO_SOCKS],[INK_NO_SOCKS])
+AH_TEMPLATE([INK_NO_STAT_PAGES],[INK_NO_STAT_PAGES])
+AH_TEMPLATE([INK_NO_TESTS],[INK_NO_TESTS])
+AH_TEMPLATE([INK_NO_TRANSFORM],[INK_NO_TRANSFORM])
+AH_TEMPLATE([INK_SINGLE_THREADED],[INK_SINGLE_THREADED])
+AH_TEMPLATE([INK_USE_MUTEX_FOR_ATOMICLISTS],[INK_USE_MUTEX_FOR_ATOMICLISTS])
+AH_TEMPLATE([INK_USE_MUTEX_FOR_FREELISTS],[INK_USE_MUTEX_FOR_FREELISTS])
+AH_TEMPLATE([MODULARIZED],[MODULARIZED])
+AH_TEMPLATE([NEED_UNION_SEMUN],[NEED_UNION_SEMUN])
+AH_TEMPLATE([PURIFY],[PURIFY])
+AH_TEMPLATE([TS_MICRO],[TS_MICRO])
+AH_TEMPLATE([USE_DIAGS],[USE_DIAGS])
+AH_TEMPLATE([USE_EPOLL],[USE_EPOLL])
+AH_TEMPLATE([USE_KQUEUE],[USE_KQUEUE])
+AH_TEMPLATE([USE_LIBEV],[USE_LIBEV])
+AH_TEMPLATE([USE_MD5_FOR_MMH],[USE_MD5_FOR_MMH])
+AH_TEMPLATE([USE_PORT],[USE_PORT])
+AH_TEMPLATE([_NO_FREELIST],[_NO_FREELIST])
+AH_TEMPLATE([darwin],[darwin])
+AH_TEMPLATE([freebsd],[freebsd])
+AH_TEMPLATE([linux],[linux])
+AH_TEMPLATE([solaris],[solaris])
+AH_TEMPLATE([FIXME_NONMODULAR],[FIXME_NONMODULAR])
+AH_TEMPLATE([SPLIT_DNS],[SPLIT_DNS])
+AH_TEMPLATE([NON_MODULAR],[NON_MODULAR])
+
AC_OUTPUT
Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePages.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePages.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePages.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePages.cc Mon Feb 8 21:11:58 2010
@@ -21,10 +21,11 @@
limitations under the License.
*/
-#ifdef NON_MODULAR
#include "P_Cache.h"
#include "Show.h"
+#ifdef NON_MODULAR
+
struct ShowCache:ShowCont
{
int part_index;
Modified: incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePagesInternal.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePagesInternal.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePagesInternal.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/cache/CachePagesInternal.cc Mon Feb 8 21:11:58 2010
@@ -21,10 +21,11 @@
limitations under the License.
*/
-#ifdef NON_MODULAR
#include "P_Cache.h"
#include "Show.h"
+#ifdef NON_MODULAR
+
struct ShowCacheInternal:ShowCont
{
int part_index;
Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/DNSConnection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/DNSConnection.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/DNSConnection.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/DNSConnection.cc Mon Feb 8 21:11:58 2010
@@ -29,8 +29,6 @@
**************************************************************************/
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "ink_platform.h"
-
#include "P_DNS.h"
#include "P_DNSConnection.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/P_DNS.h Mon Feb 8 21:11:58 2010
@@ -30,8 +30,8 @@
#if !defined (_P_DNS_h_)
#define _P_DNS_h_
-#include "I_DNS.h"
#include "inktomi++.h"
+#include "I_DNS.h"
#include "P_EventSystem.h"
#include "I_Cache.h"
#include "P_Net.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/dns/SplitDNS.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/dns/SplitDNS.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/dns/SplitDNS.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/dns/SplitDNS.cc Mon Feb 8 21:11:58 2010
@@ -27,9 +27,11 @@
*
*
****************************************************************************/
+
+#include "inktomi++.h"
+
#ifdef SPLIT_DNS
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "P_SplitDNS.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_EventSystem.h Mon Feb 8 21:11:58 2010
@@ -31,6 +31,8 @@
#ifndef _P_EventSystem_h
#define _P_EventSystem_h
+#include "inktomi++.h"
+
#include "I_EventSystem.h"
#include "P_Thread.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/P_UnixSocketManager.h Mon Feb 8 21:11:58 2010
@@ -31,6 +31,8 @@
****************************************************************************/
#ifndef _P_UnixSocketManager_h_
#define _P_UnixSocketManager_h_
+
+#include "inktomi++.h"
#include "I_SocketManager.h"
extern int monitor_read_activity;
Modified: incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/SocketManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/SocketManager.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/SocketManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/eventsystem/SocketManager.cc Mon Feb 8 21:11:58 2010
@@ -25,7 +25,7 @@
SocketManager.cc
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
#if (HOST_OS != linux)
#include <sys/filio.h>
Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc Mon Feb 8 21:11:58 2010
@@ -44,43 +44,25 @@
#include "ink_apidefs.h"
HostDBProcessor hostDBProcessor;
-int
- HostDBProcessor::hostdb_strict_round_robin = 0;
-int
- hostdb_enable = true;
-int
- hostdb_migrate_on_demand = true;
-int
- hostdb_cluster = false;
-int
- hostdb_cluster_round_robin = false;
-int
- hostdb_lookup_timeout = 120;
-int
- hostdb_insert_timeout = 160;
-int
- hostdb_re_dns_on_reload = false;
-int
- hostdb_ttl_mode = TTL_OBEY;
-unsigned int
- hostdb_current_interval = 0;
-unsigned int
- hostdb_ip_stale_interval = HOST_DB_IP_STALE;
-unsigned int
- hostdb_ip_timeout_interval = HOST_DB_IP_TIMEOUT;
-unsigned int
- hostdb_ip_fail_timeout_interval = HOST_DB_IP_FAIL_TIMEOUT;
-unsigned int
- hostdb_serve_stale_but_revalidate = 0;
-char
- hostdb_filename[PATH_NAME_MAX + 1] = DEFAULT_HOST_DB_FILENAME;
-int
- hostdb_size = DEFAULT_HOST_DB_SIZE;
+int HostDBProcessor::hostdb_strict_round_robin = 0;
+int hostdb_enable = true;
+int hostdb_migrate_on_demand = true;
+int hostdb_cluster = false;
+int hostdb_cluster_round_robin = false;
+int hostdb_lookup_timeout = 120;
+int hostdb_insert_timeout = 160;
+int hostdb_re_dns_on_reload = false;
+int hostdb_ttl_mode = TTL_OBEY;
+unsigned int hostdb_current_interval = 0;
+unsigned int hostdb_ip_stale_interval = HOST_DB_IP_STALE;
+unsigned int hostdb_ip_timeout_interval = HOST_DB_IP_TIMEOUT;
+unsigned int hostdb_ip_fail_timeout_interval = HOST_DB_IP_FAIL_TIMEOUT;
+unsigned int hostdb_serve_stale_but_revalidate = 0;
+char hostdb_filename[PATH_NAME_MAX + 1] = DEFAULT_HOST_DB_FILENAME;
+int hostdb_size = DEFAULT_HOST_DB_SIZE;
//int hostdb_timestamp = 0;
-int
- hostdb_sync_frequency = 60;
-int
- hostdb_disable_reverse_lookup = 0;
+int hostdb_sync_frequency = 60;
+int hostdb_disable_reverse_lookup = 0;
ClassAllocator<HostDBContinuation> hostDBContAllocator("hostDBContAllocator");
Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/MultiCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/MultiCache.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/MultiCache.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/MultiCache.cc Mon Feb 8 21:11:58 2010
@@ -28,8 +28,7 @@
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include <string.h>
+#include "inktomi++.h"
#ifdef NON_MODULAR
#include "P_HostDB.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/P_HostDB.h Mon Feb 8 21:11:58 2010
@@ -31,12 +31,13 @@
#ifndef _P_HostDB_h_
#define _P_HostDB_h_
+#include "inktomi++.h"
+
#ifdef SPLIT_DNS
#include "P_SplitDNS.h"
#include "P_Cluster.h"
#endif
-#include "inktomi++.h"
#include "P_EventSystem.h"
// HostDB files
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/Connection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/Connection.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/Connection.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/Connection.cc Mon Feb 8 21:11:58 2010
@@ -29,7 +29,7 @@
**************************************************************************/
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "P_Net.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLConfig.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLConfig.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLConfig.h Mon Feb 8 21:11:58 2010
@@ -31,9 +31,7 @@
#ifndef __P_SSLCONFIG_H__
#define __P_SSLCONFIG_H__
-
-#include <stdio.h>
-#include "ink_platform.h"
+#include "inktomi++.h"
#define SSL_NO_ACCEL 0
#define SSL_NCIPHER_ACCEL 1
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetAccept.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetAccept.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetAccept.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetAccept.h Mon Feb 8 21:11:58 2010
@@ -39,6 +39,7 @@
#if !defined (_SSLNetAccept_h_)
#define _SSLNetAccept_h_
+#include "inktomi++.h"
#include "P_Connection.h"
#include "P_NetAccept.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetProcessor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetProcessor.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetProcessor.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetProcessor.h Mon Feb 8 21:11:58 2010
@@ -32,6 +32,7 @@
#ifndef __P_SSLNETPROCESSOR_H
#define __P_SSLNETPROCESSOR_H
+#include "inktomi++.h"
#include "P_Net.h"
#include <openssl/ssl.h>
#include <openssl/err.h>
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetVConnection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetVConnection.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetVConnection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_SSLNetVConnection.h Mon Feb 8 21:11:58 2010
@@ -32,6 +32,7 @@
#if !defined (_SSLNetVConnection_h_)
#define _SSLNetVConnection_h_
+#include "inktomi++.h"
#include "P_EventSystem.h"
#include "P_UnixNetVConnection.h"
#include "P_UnixNet.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixNet.h Mon Feb 8 21:11:58 2010
@@ -24,8 +24,7 @@
#ifndef __P_UNIXNET_H__
#define __P_UNIXNET_H__
-#include <stdarg.h>
-#include "List.h"
+#include "inktomi++.h"
#define USE_EDGE_TRIGGER_EPOLL 1
#define USE_EDGE_TRIGGER_KQUEUE 1
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixPollDescriptor.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixPollDescriptor.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixPollDescriptor.h (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/P_UnixPollDescriptor.h Mon Feb 8 21:11:58 2010
@@ -30,6 +30,8 @@
#ifndef __P_UNIXPOLLDESCRIPTOR_H__
#define __P_UNIXPOLLDESCRIPTOR_H__
+#include "inktomi++.h"
+
#ifdef USE_LIBEV
#include "ev.h"
#endif
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/SSLCertLookup.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/SSLCertLookup.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/SSLCertLookup.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/SSLCertLookup.cc Mon Feb 8 21:11:58 2010
@@ -21,6 +21,8 @@
limitations under the License.
*/
+#include "ink_config.h"
+
#ifdef HAVE_LIBSSL
#include "P_SSLCertLookup.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc Mon Feb 8 21:11:58 2010
@@ -28,6 +28,9 @@
Description:
SSL Configurations
****************************************************************************/
+
+#include "ink_config.h"
+
#ifdef HAVE_LIBSSL
#include <string.h>
#include "P_Net.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNet.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNet.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNet.cc Mon Feb 8 21:11:58 2010
@@ -28,7 +28,7 @@
Description: Common SSL initialization/cleanup fuctions from SSLNet.h
****************************************************************************/
-
+#include "ink_config.h"
#ifdef HAVE_LIBSSL
#include "P_Net.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNetVConnection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNetVConnection.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNetVConnection.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/SSLNetVConnection.cc Mon Feb 8 21:11:58 2010
@@ -20,6 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
+#include "ink_config.h"
#ifdef HAVE_LIBSSL
#include "P_Net.h"
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/SSLUnixNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/SSLUnixNet.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/SSLUnixNet.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/SSLUnixNet.cc Mon Feb 8 21:11:58 2010
@@ -30,9 +30,9 @@
****************************************************************************/
+#include "ink_config.h"
+
#ifdef HAVE_LIBSSL
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include <string.h>
#include "P_Net.h"
//
// Global Data
Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNetPages.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNetPages.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNetPages.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/UnixNetPages.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,10 @@
limitations under the License.
*/
+#include "inktomi++.h"
+
#ifdef NON_MODULAR
+
#include "P_Net.h"
#include "Show.h"
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/Diags.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc Mon Feb 8 21:11:58 2010
@@ -34,8 +34,8 @@
****************************************************************************/
+#include "ink_config.h"
#include "ink_unused.h"
-
#include "ink_error.h"
#include "ink_assert.h"
#include "ink_time.h"
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/Regex.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/Regex.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/Regex.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/Regex.cc Mon Feb 8 21:11:58 2010
@@ -21,20 +21,10 @@
limitations under the License.
*/
-#include <assert.h>
-#include <ctype.h>
+#include "inktomi++.h"
#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <unistd.h>
-
-#include "Compatability.h"
#include "Bitops.h"
-#include "INK_MD5.h"
#include "Regex.h"
-#include "Resource.h"
-#include "ink_assert.h"
enum RENodeType
{
Added: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_config.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_config.h?rev=907798&view=auto
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_config.h (added)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_config.h Mon Feb 8 21:11:58 2010
@@ -0,0 +1,31 @@
+/** @file
+
+ Some small general interest definitions
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#ifndef _ink_config_h
+#define _ink_config_h
+
+// This file is autogenerated without multiple include protection
+// which matters e.g. when the manager specifically undef's HTTP_CACHE
+#include "config.h"
+
+#endif
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_file.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_file.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_file.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_file.cc Mon Feb 8 21:11:58 2010
@@ -29,22 +29,7 @@
****************************************************************************/
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include "Compatability.h"
-#include "ink_time.h"
-
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "ink_error.h"
-#include "ink_file.h"
-#include "ink_port.h"
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
DIR *
ink_opendir(const char *path)
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_hrtime.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_hrtime.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_hrtime.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_hrtime.h Mon Feb 8 21:11:58 2010
@@ -31,6 +31,7 @@
#if !defined (_ink_hrtime_h_)
#define _ink_hrtime_h_
+#include "ink_config.h"
#include "ink_assert.h"
#include "Compatability.h"
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_inet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_inet.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_inet.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_inet.cc Mon Feb 8 21:11:58 2010
@@ -21,10 +21,7 @@
limitations under the License.
*/
-#include "ink_inet.h"
-#include "Compatability.h"
-
-#include "ParseRules.h"
+#include "inktomi++.h"
#if (HOST_OS == darwin)
extern "C"
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_killall.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.cc Mon Feb 8 21:11:58 2010
@@ -24,19 +24,9 @@
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-#if (HOST_OS == linux)
+#include "inktomi++.h"
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#if (HOST_OS == linux)
#include "ink_killall.h"
#include "ink_resource.h"
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_killall.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_killall.h Mon Feb 8 21:11:58 2010
@@ -24,11 +24,14 @@
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-#if (HOST_OS == linux)
#ifndef _INK_KILLALL_H_
#define _INK_KILLALL_H_
+#include "ink_config.h"
+
+#if (HOST_OS == linux)
+
/*-------------------------------------------------------------------------
ink_killall
- Sends signal 'sig' to all processes with the name 'pname'
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_pread_linux.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_pread_linux.c?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_pread_linux.c (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_pread_linux.c Mon Feb 8 21:11:58 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_sock.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_sock.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_sock.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_sock.cc Mon Feb 8 21:11:58 2010
@@ -27,7 +27,6 @@
***************************************************************************/
-#include "ink_platform.h"
#include "inktomi++.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/inktomi%2B%2B.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/inktomi++.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/inktomi++.h Mon Feb 8 21:11:58 2010
@@ -37,6 +37,8 @@
#if !defined (_inktomiplus_h_)
#define _inktomiplus_h_
+#include "ink_config.h"
+
#ifdef __cplusplus
extern "C"
{
@@ -65,6 +67,7 @@
#include <limits.h>
#include <fcntl.h>
#include <time.h>
+#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/stat.h>
@@ -74,7 +77,6 @@
}
#endif
-
#include "ink_aiocb.h"
#include "ink_align.h"
#include "ink_apidefs.h"
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecCompatibility.cc Mon Feb 8 21:11:58 2010
@@ -21,12 +21,10 @@
limitations under the License.
*/
-#include "ink_assert.h"
-
+#include "inktomi++.h"
#include "P_RecCompatibility.h"
#include "P_RecDefs.h"
#include "P_RecUtils.h"
-#include <inktomi++.h>
//-------------------------------------------------------------------------
// RecFileOpenR
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecCore.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecCore.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecCore.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecCore.cc Mon Feb 8 21:11:58 2010
@@ -21,11 +21,7 @@
limitations under the License.
*/
-#include "Compatability.h"
-#include "ink_atomic.h"
-#include "ink_bool.h"
-#include "ink_platform.h"
-#include "ink_snprintf.h"
+#include "inktomi++.h"
#include "P_RecCompatibility.h"
#include "P_RecCore.h"
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecLocal.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecLocal.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecLocal.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecLocal.cc Mon Feb 8 21:11:58 2010
@@ -21,10 +21,8 @@
limitations under the License.
*/
-#include "Compatability.h"
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "ParseRules.h"
-
#include "P_RecCore.h"
#include "P_RecLocal.h"
#include "P_RecMessage.h"
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecMessage.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecMessage.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecMessage.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecMessage.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_llqueue.h"
+#include "inktomi++.h"
#include "P_RecCompatibility.h"
#include "P_RecMessage.h"
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc Mon Feb 8 21:11:58 2010
@@ -21,12 +21,7 @@
limitations under the License.
*/
-#include "Compatability.h"
-#include "ink_atomic.h"
-#include "ink_bool.h"
-#include "ink_hrtime.h"
-#include "ink_platform.h"
-#include "ParseRules.h"
+#include "inktomi++.h"
#include "P_EventSystem.h"
#include "P_RecCore.h"
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecTree.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecTree.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecTree.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecTree.cc Mon Feb 8 21:11:58 2010
@@ -21,11 +21,8 @@
limitations under the License.
*/
+#include "inktomi++.h"
#include "P_RecTree.h"
-#include <string.h>
-#include <stdio.h>
-#include "Tokenizer.h"
-#include "ink_assert.h"
#define RecTreeDebug printf
bool rec_debug = false;
Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecUtils.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecUtils.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecUtils.cc Mon Feb 8 21:11:58 2010
@@ -21,14 +21,11 @@
limitations under the License.
*/
+#include "inktomi++.h"
#include "P_RecUtils.h"
#include "P_RecCore.h"
#include "P_RecTree.h"
-#include "ParseRules.h"
-#include "ink_atomic.h"
-#include "ink_snprintf.h"
-
// diags defined in RecCore.cc
extern Diags *g_diags;
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Config.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Config.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Config.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Config.cc Mon Feb 8 21:11:58 2010
@@ -21,14 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-/****************************************************************************
-
- Config.cc
-
-
- ****************************************************************************/
-
+#include "inktomi++.h"
#include "Config.h"
#include "P_EventSystem.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Config.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Config.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Config.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Config.h Mon Feb 8 21:11:58 2010
@@ -31,9 +31,9 @@
#ifndef _Config_h
#define _Config_h
+#include "inktomi++.h"
#include "ProcessManager.h"
#include "Error.h"
-#include "inktomi++.h"
void *config_int_cb(void *data, void *value);
void *config_long_long_cb(void *data, void *value);
Modified: incubator/trafficserver/traffic/branches/dev/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/CoreUtils.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/CoreUtils.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/CoreUtils.cc Mon Feb 8 21:11:58 2010
@@ -91,6 +91,8 @@
/* modify the "note" in process_core */
/* Document properly */
+#include "ink_config.h"
+
#if defined(sparc)
// We need procfs data strucutures and they
// don't support large files
Modified: incubator/trafficserver/traffic/branches/dev/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ICPConfig.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ICPConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ICPConfig.cc Mon Feb 8 21:11:58 2010
@@ -28,9 +28,6 @@
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-#include "ink_platform.h"
-
#include "inktomi++.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkXml.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkXml.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkXml.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkXml.cc Mon Feb 8 21:11:58 2010
@@ -26,12 +26,7 @@
***************************************************************************/
-#include "ink_unused.h"
-
-#include "ink_platform.h"
-#include "List.h"
-#include "Resource.h"
-#include "Error.h"
+#include "inktomi++.h"
#include "InkXml.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Main.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Main.cc Mon Feb 8 21:11:58 2010
@@ -30,9 +30,6 @@
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-void deinitSubAgent();
#include "inktomi++.h"
@@ -205,6 +202,7 @@
extern int run_TestHook();
//extern void run_SimpleHttp();
#endif
+void deinitSubAgent();
Version version = {
{CACHE_DB_MAJOR_VERSION, CACHE_DB_MINOR_VERSION}, // cacheDB
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Plugin.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Plugin.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Plugin.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Plugin.cc Mon Feb 8 21:11:58 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "ink_config.h"
#include <stdio.h>
#if (HOST_OS == hpux)
#include <dl.h>
Modified: incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc Mon Feb 8 21:11:58 2010
@@ -27,7 +27,7 @@
*/
-#include "ink_platform.h"
+#include "inktomi++.h"
#include <dlfcn.h>
#include "Main.h"
#include "Error.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/SocksProxy.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/SocksProxy.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/SocksProxy.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/SocksProxy.cc Mon Feb 8 21:11:58 2010
@@ -27,6 +27,7 @@
*/
+#include "inktomi++.h"
#include "StatSystem.h"
#include "P_Net.h"
#include "I_OneWayTunnel.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc Mon Feb 8 21:11:58 2010
@@ -28,6 +28,7 @@
****************************************************************************/
+#include "ink_config.h"
#include "Config.h"
#include "StatPages.h"
#include "HdrUtils.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Update.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Update.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Update.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Update.cc Mon Feb 8 21:11:58 2010
@@ -21,17 +21,8 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
-
-/****************************************************************************
-
- Update.cc
-
-
-****************************************************************************/
-
-#include "ink_platform.h"
#include "Main.h"
#include "Update.h"
#include "Config.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/cust_log_fmt_cnvrt.cc Mon Feb 8 21:11:58 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "ink_config.h"
#include <iostream>
#include <iomanip>
#include <fstream>
Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrHeap.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrHeap.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrHeap.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrHeap.cc Mon Feb 8 21:11:58 2010
@@ -30,12 +30,11 @@
****************************************************************************/
+#include "inktomi++.h"
#include "HdrHeap.h"
-#include "Allocator.h"
#include "URL.h"
#include "MIME.h"
#include "HTTP.h"
-#include "Diags.h"
#include "ptrdef.h"
#define HDR_MAX_ALLOC_SIZE (HDR_HEAP_DEFAULT_SIZE - sizeof(HdrHeap))
Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTSOnly.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTSOnly.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTSOnly.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTSOnly.cc Mon Feb 8 21:11:58 2010
@@ -37,7 +37,7 @@
****************************************************************************/
-#include "Compatability.h"
+#include "inktomi++.h"
#include "HTTP.h"
#include "P_EventSystem.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTest.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTest.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrTest.cc Mon Feb 8 21:11:58 2010
@@ -32,9 +32,7 @@
****************************************************************************/
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
+#include "inktomi++.h"
#include "Arena.h"
#include "HTTP.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrUtils.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrUtils.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HdrUtils.cc Mon Feb 8 21:11:58 2010
@@ -31,6 +31,7 @@
****************************************************************************/
+#include "inktomi++.h"
#include "HdrUtils.h"
#define GETNEXT() { \
Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/SDKAllocator.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/SDKAllocator.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/SDKAllocator.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/SDKAllocator.h Mon Feb 8 21:11:58 2010
@@ -33,6 +33,7 @@
#ifndef _SDK_ALLOCATOR_H_
#define _SDK_ALLOCATOR_H_
+#include "inktomi++.h"
#include "List.h"
/////////////////////////////////////
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/Hash_Table.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/Hash_Table.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/Hash_Table.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/Hash_Table.cc Mon Feb 8 21:11:58 2010
@@ -21,12 +21,8 @@
limitations under the License.
*/
-/****************************************************************************
-
- HashTable.cc --
- Created On : Mon Dec 02 2007
- ****************************************************************************/
+#include "inktomi++.h"
#include "Hash_Table.h"
#include "HttpSM.h"
#include "HttpTransactCache.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc Mon Feb 8 21:11:58 2010
@@ -21,21 +21,17 @@
limitations under the License.
*/
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
#include "HttpTransactCache.h"
#include "time.h"
-#include "ink_assert.h"
-#include "ink_defs.h"
-#include "ParseRules.h"
#include "HTTP.h"
#include "HttpCompat.h"
#include "HttpMessageBody.h"
#include "Error.h"
#include "InkErrno.h"
-#include "ink_base64.h"
ClassAllocator<CacheLookupHttpConfig> CacheLookupHttpConfigAllocator("CacheLookupHttpConfigAllocator");
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactHeaders.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactHeaders.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactHeaders.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactHeaders.cc Mon Feb 8 21:11:58 2010
@@ -28,22 +28,14 @@
****************************************************************************/
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
-#include "time.h"
-#include "ink_assert.h"
-#include "ink_defs.h"
-#include "ParseRules.h"
-#include "URL.h"
#include "HTTP.h"
#include "HdrUtils.h"
#include "HttpCompat.h"
#include "HttpMessageBody.h"
-#include "Error.h"
-#include "InkErrno.h"
-#include "ink_base64.h"
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccess.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccess.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccess.cc Mon Feb 8 21:11:58 2010
@@ -38,8 +38,7 @@
***************************************************************************/
#include "ink_unused.h"
-#include <assert.h>
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "Error.h"
#include "HTTP.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessICP.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessICP.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessICP.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessICP.cc Mon Feb 8 21:11:58 2010
@@ -32,11 +32,8 @@
***************************************************************************/
#ifndef TS_MICRO
-#include "ink_unused.h"
-
-#include "ink_platform.h"
+#include "inktomi++.h"
#include "Error.h"
-#include "ink_hrtime.h"
#include "HTTP.h"
#include "ICP.h"
#include "ICPlog.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogConfig.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogConfig.cc Mon Feb 8 21:11:58 2010
@@ -27,10 +27,7 @@
This file implements the LogConfig object.
***************************************************************************/
-#include "ink_unused.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "inktomi++.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogField.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogField.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogField.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogField.cc Mon Feb 8 21:11:58 2010
@@ -29,9 +29,8 @@
***************************************************************************/
-#include "ink_unused.h"
+#include "inktomi++.h"
-#include "ink_platform.h"
#include "Error.h"
#include "Resource.h"
#include "LogUtils.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFilter.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFilter.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFilter.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFilter.cc Mon Feb 8 21:11:58 2010
@@ -26,9 +26,8 @@
***************************************************************************/
-#include "ink_unused.h"
+#include "inktomi++.h"
-#include "ink_platform.h"
#include "Resource.h"
#include "Error.h"
#include "LogUtils.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogHost.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogHost.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogHost.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogHost.cc Mon Feb 8 21:11:58 2010
@@ -26,9 +26,8 @@
***************************************************************************/
-#include "ink_unused.h"
+#include "inktomi++.h"
-#include "ink_platform.h"
#include "Resource.h"
#include "Error.h"
@@ -55,57 +54,35 @@
-------------------------------------------------------------------------*/
LogHost::LogHost(char *object_filename, inku64 object_signature)
- :
-m_object_filename(xstrdup(object_filename))
- ,
-m_object_signature(object_signature)
- ,
-m_ip(0)
- ,
-m_ipstr(NULL)
- ,
-m_name(NULL)
- ,
-m_port(0)
- ,
-m_sock(NULL)
- ,
-m_sock_fd(-1)
- ,
-m_connected(false)
- ,
-m_orphan_file(NULL)
+ : m_object_filename(xstrdup(object_filename))
+ , m_object_signature(object_signature)
+ , m_ip(0)
+ , m_ipstr(NULL)
+ , m_name(NULL)
+ , m_port(0)
+ , m_sock(NULL)
+ , m_sock_fd(-1)
+ , m_connected(false)
+ , m_orphan_file(NULL)
#if defined (IOCORE_LOG_COLLATION)
-,
-m_log_collation_client_sm(NULL)
+ , m_log_collation_client_sm(NULL)
#endif
{
}
LogHost::LogHost(const LogHost & rhs)
- :
-m_object_filename(xstrdup(rhs.m_object_filename))
- ,
-m_object_signature(rhs.m_object_signature)
- ,
-m_ip(rhs.m_ip)
- ,
-m_ipstr(xstrdup(rhs.m_ipstr))
- ,
-m_name(xstrdup(rhs.m_name))
- ,
-m_port(rhs.m_port)
- ,
-m_sock(NULL)
- ,
-m_sock_fd(-1)
- ,
-m_connected(false)
- ,
-m_orphan_file(NULL)
+ : m_object_filename(xstrdup(rhs.m_object_filename))
+ , m_object_signature(rhs.m_object_signature)
+ , m_ip(rhs.m_ip)
+ , m_ipstr(xstrdup(rhs.m_ipstr))
+ , m_name(xstrdup(rhs.m_name))
+ , m_port(rhs.m_port)
+ , m_sock(NULL)
+ , m_sock_fd(-1)
+ , m_connected(false)
+ , m_orphan_file(NULL)
#if defined (IOCORE_LOG_COLLATION)
-,
-m_log_collation_client_sm(NULL)
+ , m_log_collation_client_sm(NULL)
#endif
{
create_orphan_LogFile_object();
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/*
*
* Alarms.cc
@@ -32,8 +31,7 @@
*
*/
-#include "ink_platform.h"
-#include "Compatability.h"
+#include "inktomi++.h"
#include "Main.h"
#include "Alarms.h"
#include "Diags.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/**************************************
*
* BaseManager.cc
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseRecords.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseRecords.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseRecords.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseRecords.cc Mon Feb 8 21:11:58 2010
@@ -26,15 +26,9 @@
* BaseRecords.cc
* Member function definitions for the BaseRecords class.
*
- *
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_string.h"
-#include "ink_atomic.h"
+#include "inktomi++.h"
#include "Main.h"
#include "BaseRecords.h"
#include "RecordsConfig.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/FileManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/FileManager.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/FileManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/FileManager.cc Mon Feb 8 21:11:58 2010
@@ -21,12 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_resource.h"
-#include "ink_error.h"
+#include "inktomi++.h"
#include "FileManager.h"
#include "Main.h"
#include "Rollback.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
/*
*
* ProcessManager.cc
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Rollback.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Rollback.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Rollback.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Rollback.cc Mon Feb 8 21:11:58 2010
@@ -22,19 +22,13 @@
*/
/****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_thread.h"
-#include "ink_error.h"
+#include "inktomi++.h"
#include "LocalManager.h"
#include "Rollback.h"
#include "WebMgmtUtils.h"
#include "WebGlobals.h"
#include "MgmtUtils.h"
#include "ExpandingArray.h"
-#include "Diags.h"
#include "MgmtSocket.h"
/****************************************************************************
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/WebPluginList.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/WebPluginList.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/WebPluginList.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/WebPluginList.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
#include "WebPluginList.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/EventControlMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/EventControlMain.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/EventControlMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/EventControlMain.cc Mon Feb 8 21:11:58 2010
@@ -29,14 +29,9 @@
*
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_mutex.h"
-#include "ink_hash_table.h"
-#include "ink_sock.h"
-#include "Tokenizer.h"
+#include "inktomi++.h"
#include "LocalManager.h"
#include "MgmtSocket.h"
-
#include "EventControlMain.h"
#include "CoreAPI.h"
#include "NetworkUtilsLocal.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/TSControlMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/TSControlMain.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/TSControlMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/TSControlMain.cc Mon Feb 8 21:11:58 2010
@@ -30,15 +30,10 @@
*
***************************************************************************/
-#include "ink_platform.h"
-#include "ink_mutex.h"
-#include "ink_hash_table.h"
-#include "ink_sock.h"
-#include "Tokenizer.h"
+#include "inktomi++.h"
#include "LocalManager.h"
#include "Main.h"
#include "MgmtSocket.h"
-
#include "TSControlMain.h"
#include "CoreAPI.h"
#include "CoreAPIShared.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CliMain.cc Mon Feb 8 21:11:58 2010
@@ -29,7 +29,7 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
#include "ink_args.h"
#include "Tokenizer.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc Mon Feb 8 21:11:58 2010
@@ -29,10 +29,7 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_args.h"
-#include "ink_sock.h"
+#include "inktomi++.h"
#include "Tokenizer.h"
#include "TextBuffer.h"
#include "CliUtils.h" /* cli_read_timeout(), cli_write_timeout(),GetTSDirectory() */
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/ClusterCom.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/ClusterCom.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/ClusterCom.cc Mon Feb 8 21:11:58 2010
@@ -31,19 +31,13 @@
*
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
-#include "ink_platform.h"
-#include "Compatability.h"
#include "I_Version.h"
-#include "ink_string.h"
-#include "ink_sock.h"
#include "TextBuffer.h"
#include "MgmtSocket.h"
-#include "Diags.h"
-
#include "Main.h"
#include "ClusterCom.h"
#include "WebMgmtUtils.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/VMap.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/VMap.h?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/VMap.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/VMap.h Mon Feb 8 21:11:58 2010
@@ -34,10 +34,7 @@
#ifndef _VMAP_H
#define _VMAP_H
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "ink_mutex.h"
+#include "inktomi++.h"
#ifdef _WIN32
/* Currently, iphlpapi.h is not present in VC98\include;
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/StoreReadConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/StoreReadConfig.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/StoreReadConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/StoreReadConfig.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
/****************************************************************************
StoreReadConfig.cc
@@ -29,10 +29,6 @@
****************************************************************************/
-#include "ink_platform.h"
-#include "Compatability.h"
-#include "ink_file.h"
-
char *
parseStorageFile(int fd)
{
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc Mon Feb 8 21:11:58 2010
@@ -30,6 +30,8 @@
*
*/
+#include "ink_config.h"
+
#if (HOST_OS == darwin) || (HOST_OS == freebsd)
/* This program has not been ported to these operating systems at all,
* and even the linux one is insanely distro specific.
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc Mon Feb 8 21:11:58 2010
@@ -21,20 +21,15 @@
limitations under the License.
*/
+
+#include "inktomi++.h"
#if (HOST_OS == linux) || (HOST_OS == freebsd) || (HOST_OS == darwin)
#include "SysAPI.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
#include <unistd.h>
#include <sys/wait.h>
-#include <sys/time.h>
-#include <stdarg.h>
-#include <string.h>
#include <ink_string.h>
#include <regex.h>
-#include <time.h>
#include <grp.h>
#include <ctype.h>
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/VIPConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/VIPConfig.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/VIPConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/VIPConfig.cc Mon Feb 8 21:11:58 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
+#include "inktomi++.h"
/*
*
* VIPConfig.cc
@@ -33,18 +33,6 @@
*
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
#include <sys/un.h>
struct ifafilt;
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtConverter.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtConverter.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtConverter.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtConverter.cc Mon Feb 8 21:11:58 2010
@@ -26,13 +26,10 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "Compatability.h"
+#include "inktomi++.h"
#include "MgmtConverter.h"
#include "RecordsConfig.h"
#include "Main.h"
-#include "ink_hash_table.h"
#include "WebMgmtUtils.h"
#include "CfgContextUtils.h"
#include "CoreAPI.h" // for testing
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtSchema.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtSchema.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtSchema.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtSchema.cc Mon Feb 8 21:11:58 2010
@@ -21,13 +21,10 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "Compatability.h"
+#include "inktomi++.h"
#include "MgmtSchema.h"
#include "RecordsConfig.h"
#include "Main.h"
-#include "ink_hash_table.h"
//********************************************************
// XML Schema Validation
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/WebMgmtUtils.cc Mon Feb 8 21:11:58 2010
@@ -21,17 +21,11 @@
limitations under the License.
*/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-/***************************************/
-
-#include "Compatability.h"
-#include "ink_bool.h"
+#include "inktomi++.h"
#include "Main.h"
#include "WebMgmtUtils.h"
#include "BaseRecords.h"
-#include "Tokenizer.h"
#include "RecordsConfig.h"
-#include "ink_regex-3.6.h"
/****************************************************************************
*
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc Mon Feb 8 21:11:58 2010
@@ -29,12 +29,7 @@
*
****************************************************************************/
-#include "ink_unused.h" /* MAGIC_EDITING_TAG */
-
-#include "ink_platform.h"
-#include "Compatability.h"
#include "inktomi++.h"
-#include "ink_atomic.h"
#include "Main.h"
#include "BaseRecords.h"
#include "WebHttp.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.cc Mon Feb 8 21:11:58 2010
@@ -26,6 +26,7 @@
***************************************************************************/
#define _c_impl
+#include "ink_config.h"
#include "CoupledStats.h"
#include "P_EventSystem.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/stats/Stats.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/stats/Stats.cc?rev=907798&r1=907797&r2=907798&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/stats/Stats.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/stats/Stats.cc Mon Feb 8 21:11:58 2010
@@ -24,6 +24,7 @@
#define _s_impl
+#include "ink_config.h"
#include "Stats.h"
#include "P_EventSystem.h"