You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/28 18:32:35 UTC
svn commit: r1002247 [2/2] - in /trafficserver/traffic/trunk: ./ build/
example/add-header/ example/append-transform/ example/basic-auth/
example/blacklist-0/ example/blacklist-1/ example/bnull-transform/
example/cache_plugin/ example/cache_scan/ examp...
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Tue Sep 28 16:32:32 2010
@@ -1,6 +1,7 @@
/** @file
- Some small general interest definitions
+ Some small general interest definitions. The general standard is to
+ prefix these defines with TS_.
@section license License
@@ -24,6 +25,9 @@
#ifndef _ink_config_h
#define _ink_config_h
+// Note: All "defines" should be prefixed with TS_ when appropriate, please
+// don't use ATS_ any more.
+
/* GENERATED FILE WARNING! DO NOT EDIT ink_config.h
*
* You must modify ink_config.h.in instead.
@@ -36,103 +40,103 @@
/* Version info
*/
-#define ATS_VERSION_STRING "@ATS_VERSION_STRING@"
-#define ATS_VERSION_NUMBER @ATS_VERSION_NUMBER@
-#define ATS_VERSION_MAJOR @ATS_VERSION_MAJOR@
-#define ATS_VERSION_MINOR @ATS_VERSION_MINOR@
-#define ATS_VERSION_MICRO @ATS_VERSION_MICRO@
+#define TS_VERSION_STRING "@TS_VERSION_STRING@"
+#define TS_VERSION_NUMBER @TS_VERSION_NUMBER@
+#define TS_VERSION_MAJOR @TS_VERSION_MAJOR@
+#define TS_VERSION_MINOR @TS_VERSION_MINOR@
+#define TS_VERSION_MICRO @TS_VERSION_MICRO@
#define BUILD_MACHINE "@build_machine@"
#define BUILD_PERSON "@build_person@"
#define BUILD_GROUP "@build_group@"
/* Includes */
-#define ATS_HAVE_SYS_EPOLL_H @sys_epollh@
-#define ATS_HAVE_SYS_EVENT_H @sys_eventh@
-#define ATS_HAVE_MACHINE_ENDIAN_H @machine_endianh@
-#define ATS_HAVE_ENDIAN_H @endianh@
-#define ATS_HAVE_NETINET_IN_H @netinet_inh@
-#define ATS_HAVE_NETINET_IN_SYSTM_H @netinet_in_systmh@
-#define ATS_HAVE_NETINET_TCP_H @netinet_tcph@
-#define ATS_HAVE_SYS_IOCTL_H @sys_ioctlh@
-#define ATS_HAVE_SYS_BYTEORDER_H @sys_byteorderh@
-#define ATS_HAVE_SYS_SOCKIO_H @sys_sockioh@
-#define ATS_HAVE_SYS_SYSCTL_H @sys_sysctlh@
-#define ATS_HAVE_SYS_SYSINFO_H @sys_sysinfoh@
-#define ATS_HAVE_SYS_SYSTEMINFO_H @sys_systeminfoh@
-#define ATS_HAVE_ARPA_INET_H @arpa_ineth@
-#define ATS_HAVE_ARPA_NAMESER_H @arpa_nameserh@
-#define ATS_HAVE_ARPA_NAMESER_COMPAT_H @arpa_nameser_compath@
-#define ATS_HAVE_EXECINFO_H @execinfoh@
-#define ATS_HAVE_NETDB_H @netdbh@
-#define ATS_HAVE_CTYPE_H @ctypeh@
-#define ATS_HAVE_SIGINFO_H @siginfoh@
-#define ATS_HAVE_MALLOC_H @malloch@
-#define ATS_HAVE_WAIT_H @waith@
-#define ATS_HAVE_FLOAT_H @floath@
-#define ATS_HAVE_LIBGEN_H @libgenh@
-#define ATS_HAVE_VALUES_H @valuesh@
-#define ATS_HAVE_ALLOCA_H @allocah@
-#define ATS_HAVE_CPIO_H @cpioh@
-#define ATS_HAVE_STROPTS_H @stroptsh@
-#define ATS_HAVE_SYS_MOUNT_H @sys_mounth@
-#define ATS_HAVE_SYS_PARAM_H @sys_paramh@
-#define ATS_HAVE_SYS_SYSMACROS_H @sys_sysmacrosh@
-#define ATS_HAVE_MATH_H @mathh@
-#define ATS_HAVE_NET_PPP_DEFS_H @net_ppp_defsh@
-#define ATS_HAVE_NETINET_IP_H @netinet_iph@
-#define ATS_HAVE_NETINET_IP_ICMP_H @netinet_ip_icmph@
-#define ATS_HAVE_EXECINFO_H @execinfoh@
+#define TS_HAVE_SYS_EPOLL_H @sys_epollh@
+#define TS_HAVE_SYS_EVENT_H @sys_eventh@
+#define TS_HAVE_MACHINE_ENDIAN_H @machine_endianh@
+#define TS_HAVE_ENDIAN_H @endianh@
+#define TS_HAVE_NETINET_IN_H @netinet_inh@
+#define TS_HAVE_NETINET_IN_SYSTM_H @netinet_in_systmh@
+#define TS_HAVE_NETINET_TCP_H @netinet_tcph@
+#define TS_HAVE_SYS_IOCTL_H @sys_ioctlh@
+#define TS_HAVE_SYS_BYTEORDER_H @sys_byteorderh@
+#define TS_HAVE_SYS_SOCKIO_H @sys_sockioh@
+#define TS_HAVE_SYS_SYSCTL_H @sys_sysctlh@
+#define TS_HAVE_SYS_SYSINFO_H @sys_sysinfoh@
+#define TS_HAVE_SYS_SYSTEMINFO_H @sys_systeminfoh@
+#define TS_HAVE_ARPA_INET_H @arpa_ineth@
+#define TS_HAVE_ARPA_NAMESER_H @arpa_nameserh@
+#define TS_HAVE_ARPA_NAMESER_COMPAT_H @arpa_nameser_compath@
+#define TS_HAVE_EXECINFO_H @execinfoh@
+#define TS_HAVE_NETDB_H @netdbh@
+#define TS_HAVE_CTYPE_H @ctypeh@
+#define TS_HAVE_SIGINFO_H @siginfoh@
+#define TS_HAVE_MALLOC_H @malloch@
+#define TS_HAVE_WAIT_H @waith@
+#define TS_HAVE_FLOAT_H @floath@
+#define TS_HAVE_LIBGEN_H @libgenh@
+#define TS_HAVE_VALUES_H @valuesh@
+#define TS_HAVE_ALLOCA_H @allocah@
+#define TS_HAVE_CPIO_H @cpioh@
+#define TS_HAVE_STROPTS_H @stroptsh@
+#define TS_HAVE_SYS_MOUNT_H @sys_mounth@
+#define TS_HAVE_SYS_PARAM_H @sys_paramh@
+#define TS_HAVE_SYS_SYSMACROS_H @sys_sysmacrosh@
+#define TS_HAVE_MATH_H @mathh@
+#define TS_HAVE_NET_PPP_DEFS_H @net_ppp_defsh@
+#define TS_HAVE_NETINET_IP_H @netinet_iph@
+#define TS_HAVE_NETINET_IP_ICMP_H @netinet_ip_icmph@
+#define TS_HAVE_EXECINFO_H @execinfoh@
/* Libraries */
-#define ATS_HAS_LIBZ @zlibh@
-#define ATS_HAS_LZMA @lzmah@
-#define ATS_HAS_EXPAT @expath@
+#define TS_HAS_LIBZ @zlibh@
+#define TS_HAS_LZMA @lzmah@
+#define TS_HAS_EXPAT @expath@
/* Features */
-#define ATS_HAS_EVENTFD @has_eventfd@
-#define ATS_HAS_CLOCK_GETTIME @has_clock_gettime@
-#define ATS_HAS_POSIX_MEMALIGN @has_posix_memalign@
-#define ATS_HAS_POSIX_FADVISE @has_posix_fadvise@
-#define ATS_HAS_LRAND48_R @has_lrand48_r@
-#define ATS_HAS_SRAND48_R @has_srand48_r@
-#define ATS_HAS_STRNDUP @has_strndup@
-#define ATS_HAS_STRLCPY @has_strlcpy@
-#define ATS_HAS_STRLCAT @has_strlcat@
-
-#define ATS_USE_SQLITE3 @use_sqlite3@
-#define ATS_USE_LIBDB @use_libdb@
-#define ATS_HAS_BACKTRACE @has_backtrace@
-#define ATS_HAS_PROFILER @has_profiler@
-#define ATS_USE_DIAGS @use_diags@
-#define ATS_USE_LIBEV @use_libev@
-#define ATS_USE_EPOLL @use_epoll@
-#define ATS_USE_KQUEUE @use_kqueue@
-#define ATS_USE_PORT @use_port@
-#define ATS_USE_POSIX_CAP @use_posix_cap@
-#define ATS_USE_DETAILED_LOG @has_detailed_log@
-#define ATS_USE_TPROXY @use_tproxy@
+#define TS_HAS_EVENTFD @has_eventfd@
+#define TS_HAS_CLOCK_GETTIME @has_clock_gettime@
+#define TS_HAS_POSIX_MEMALIGN @has_posix_memalign@
+#define TS_HAS_POSIX_FADVISE @has_posix_fadvise@
+#define TS_HAS_LRAND48_R @has_lrand48_r@
+#define TS_HAS_SRAND48_R @has_srand48_r@
+#define TS_HAS_STRNDUP @has_strndup@
+#define TS_HAS_STRLCPY @has_strlcpy@
+#define TS_HAS_STRLCAT @has_strlcat@
+
+#define TS_USE_SQLITE3 @use_sqlite3@
+#define TS_USE_LIBDB @use_libdb@
+#define TS_HAS_BACKTRACE @has_backtrace@
+#define TS_HAS_PROFILER @has_profiler@
+#define TS_USE_DIAGS @use_diags@
+#define TS_USE_LIBEV @use_libev@
+#define TS_USE_EPOLL @use_epoll@
+#define TS_USE_KQUEUE @use_kqueue@
+#define TS_USE_PORT @use_port@
+#define TS_USE_POSIX_CAP @use_posix_cap@
+#define TS_USE_DETAILED_LOG @has_detailed_log@
+#define TS_USE_TPROXY @use_tproxy@
/* OS API definitions */
#define GETHOSTBYNAME_R_HOSTENT_DATA @gethostbyname_r_hostent_data@
#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
#define NEED_UNION_SEMUN @need_union_semun@
#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
-#define ATS_IP_TRANSPARENT @ip_transparent@
+#define TS_IP_TRANSPARENT @ip_transparent@
/* API */
-#define ATS_IS_MICRO_BUILD @is_micro_build@
-#define ATS_HAS_STANDALONE_IOCORE @has_standalone_iocore@
-#define ATS_HAS_INKAPI @has_inkapi@
-#define ATS_HAS_CLI2 @has_cli2@
-#define ATS_HAS_WEBUI @has_webui@
-#define ATS_HAS_V2STATS @has_v2stats@
-#define ATS_HAS_PURIFY @has_purify@
-#define ATS_HAS_DEMANGLE @has_demangle@
+#define TS_IS_MICRO_BUILD @is_micro_build@
+#define TS_HAS_STANDALONE_IOCORE @has_standalone_iocore@
+#define TS_HAS_INKAPI @has_inkapi@
+#define TS_HAS_CLI2 @has_cli2@
+#define TS_HAS_WEBUI @has_webui@
+#define TS_HAS_V2STATS @has_v2stats@
+#define TS_HAS_PURIFY @has_purify@
+#define TS_HAS_DEMANGLE @has_demangle@
/* XXX: Should make those individually selectable ? */
/* TODO: Use ATS prefix instead no prefix or INK */
-#if ATS_IS_MICRO_BUILD
+#if TS_IS_MICRO_BUILD
# define TS_MICRO 1
# define INK_NO_ACL 1
# define INK_NO_CLUSTER 1
@@ -151,7 +155,7 @@
# define _NO_FREELIST 1
#endif
-#if ATS_HAS_INKAPI
+#if TS_HAS_INKAPI
#define TS_MAX_API_STATS @max_api_stats@
/* XXX: Should make those individually selectable ? */
#else
@@ -160,7 +164,7 @@
# define INK_SINGLE_THREADED 1
#endif
-#if ATS_HAS_STANDALONE_IOCORE
+#if TS_HAS_STANDALONE_IOCORE
# define STANDALONE_IOCORE 1
#else
# define FIXME_NONMODULAR 1
@@ -169,11 +173,11 @@
# define HTTP_CACHE 1
#endif
-#if !ATS_HAS_WEBUI
+#if !TS_HAS_WEBUI
# define NO_WEBUI 1
#endif
-#if ATS_HAS_PURIFY
+#if TS_HAS_PURIFY
# define PURIFY 1
#endif
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.cc Tue Sep 28 16:32:32 2010
@@ -201,7 +201,7 @@ init_hrtime_basis()
#endif
do {
t1 = ink_get_hrtime_internal();
-#if ATS_HAS_CLOCK_GETTIME
+#if TS_HAS_CLOCK_GETTIME
ink_assert(!clock_gettime(CLOCK_REALTIME, ×pec_basis));
#else
{
Modified: trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_hrtime.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_hrtime.h Tue Sep 28 16:32:32 2010
@@ -265,7 +265,7 @@ ink_get_based_hrtime_internal()
{
#if defined(USE_TIME_STAMP_COUNTER_HRTIME)
return hrtime_offset + ink_get_hrtime_internal();
-#elif !ATS_HAS_CLOCK_GETTIME
+#elif !TS_HAS_CLOCK_GETTIME
timeval tv;
gettimeofday(&tv, NULL);
return (tv.tv_sec * HRTIME_SECOND + tv.tv_usec * HRTIME_USECOND);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_memory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_memory.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_memory.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_memory.cc Tue Sep 28 16:32:32 2010
@@ -264,7 +264,7 @@ ink_memalign(size_t alignment, size_t si
void *ptr;
-#if ATS_HAS_POSIX_MEMALIGN
+#if TS_HAS_POSIX_MEMALIGN
if (alignment <= 8)
return ink_malloc(size);
Modified: trafficserver/traffic/trunk/libinktomi++/ink_platform.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_platform.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_platform.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_platform.h Tue Sep 28 16:32:32 2010
@@ -110,13 +110,13 @@
#include <pwd.h>
#include <poll.h>
-#if ATS_USE_EPOLL
+#if TS_USE_EPOLL
#include <sys/epoll.h>
#endif
-#if ATS_USE_KQUEUE
+#if TS_USE_KQUEUE
#include <sys/event.h>
#endif
-#if ATS_USE_PORT
+#if TS_USE_PORT
#include <port.h>
#endif
Modified: trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_stack_trace.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_stack_trace.cc Tue Sep 28 16:32:32 2010
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <unistd.h>
-#if ATS_HAS_BACKTRACE
+#if TS_HAS_BACKTRACE
#include <execinfo.h> /* for backtrace_symbols, etc. */
#include <signal.h>
@@ -114,7 +114,7 @@ ink_stack_trace_dump(int sighandler_fram
backtrace_symbols_fd(stack, btl, 2);
}
-#else /* !ATS_HAS_BACKTRACE */
+#else /* !TS_HAS_BACKTRACE */
void
ink_stack_trace_dump(int sighandler_frame)
@@ -124,4 +124,4 @@ ink_stack_trace_dump(int sighandler_fram
return;
}
-#endif /* ATS_HAS_BACKTRACE */
+#endif /* TS_HAS_BACKTRACE */
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string.cc Tue Sep 28 16:32:32 2010
@@ -391,7 +391,7 @@ ink_string_mjoin(int nstrings, ...)
return ns;
}
-#if !ATS_HAS_STRNDUP
+#if !TS_HAS_STRNDUP
char *
ink_strndup(const char *str, size_t n)
{
@@ -409,7 +409,7 @@ ink_strndup(const char *str, size_t n)
}
#endif
-#if !ATS_HAS_STRLCPY
+#if !TS_HAS_STRLCPY
size_t
ink_strlcpy(char *dst, const char *src, size_t siz)
{
@@ -437,7 +437,7 @@ ink_strlcpy(char *dst, const char *src,
}
#endif
-#if !ATS_HAS_STRLCAT
+#if !TS_HAS_STRLCAT
size_t
ink_strlcat(char *dst, const char *src, size_t siz)
{
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string.h Tue Sep 28 16:32:32 2010
@@ -76,7 +76,7 @@ char *ink_string_mcopy(char *source);
char *ink_string_mjoin(int nstrings, ...);
/* Missing fcns */
-#if ATS_HAS_STRNDUP
+#if TS_HAS_STRNDUP
#define ink_strndup strndup
#else
char *ink_strndup(const char *str, size_t n);
@@ -86,7 +86,7 @@ char *ink_strndup(const char *str, size_
* will be copied. Always NUL terminates (unless siz == 0).
* Returns strlen(src); if retval >= siz, truncation occurred.
*/
-#if ATS_HAS_STRLCPY
+#if TS_HAS_STRLCPY
#define ink_strlcpy strlcpy
#else
size_t ink_strlcpy(char *dst, const char *str, size_t siz);
@@ -98,7 +98,7 @@ size_t ink_strlcpy(char *dst, const char
* Returns strlen(src) + MIN(siz, strlen(initial dst)).
* If retval >= siz, truncation occurred.
*/
-#if ATS_HAS_STRLCAT
+#if TS_HAS_STRLCAT
#define ink_strlcat strlcat
#else
size_t ink_strlcat(char *dst, const char *str, size_t siz);
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.h Tue Sep 28 16:32:32 2010
@@ -62,7 +62,7 @@ struct core_stack_state
#include <assert.h>
#include <asm/ptrace.h> // for structure pt_regs
#include <elf.h>
-#if ATS_USE_LIBEV
+#if TS_USE_LIBEV
#undef EV_NONE
#endif
#include "DynArray.h"
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Sep 28 16:32:32 2010
@@ -58,7 +58,7 @@
#include "HttpAccept.h"
#include "PluginVC.h"
#include "FetchSM.h"
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include <string> // TODO: Do we really need STL strings?
#include "StatSystemV2.h"
#endif
@@ -1076,7 +1076,7 @@ INKContInternal::handle_event_count(int
}
}
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
void INKContInternal::setName(const char *name) {
cont_name = name;
@@ -7370,7 +7370,7 @@ INKStatIncrement(INKStat the_stat)
return INK_SUCCESS;
}
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
INKReturnCode
INKStatCreateV2(
const char *the_name,
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Tue Sep 28 16:32:32 2010
@@ -47,7 +47,7 @@ extern "C" int plock(int);
#include <mcheck.h>
#endif
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
#include <sys/capability.h>
#endif
@@ -103,11 +103,11 @@ extern "C" int plock(int);
#include "XmlUtils.h"
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include "StatSystemV2.h"
#endif
-#if ATS_HAS_PROFILER
+#if TS_HAS_PROFILER
#include <google/profiler.h>
#endif
@@ -258,7 +258,7 @@ ArgumentDescription argument_description
"T",
&run_test_hook, "PROXY_RUN_TEST_HOOK", NULL},
#endif //INK_NO_TESTS
-#if ATS_USE_DIAGS
+#if TS_USE_DIAGS
{"debug_tags", 'T', "Vertical-bar-separated Debug Tags", "S1023", error_tags,
"PROXY_DEBUG_TAGS", NULL},
{"action_tags", 'B', "Vertical-bar-separated Behavior Tags", "S1023", action_tags,
@@ -1106,7 +1106,7 @@ init_ink_memalign_heap(void)
}
}
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
// Restore the effective capabilities that we need.
int
restoreCapabilities() {
@@ -1155,7 +1155,7 @@ adjust_sys_settings(void)
#endif
#endif // linux check
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
restoreCapabilities();
#endif
}
@@ -1636,7 +1636,7 @@ change_uid_gid(const char *user)
#endif
}
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
void init_stat_collector()
{
static int stat_collection_interval;
@@ -1682,7 +1682,7 @@ void init_stat_collector()
int
main(int argc, char **argv)
{
-#if ATS_HAS_PROFILER
+#if TS_HAS_PROFILER
ProfilerStart("/tmp/ts.prof");
#endif
int mem_throttling;
@@ -1882,7 +1882,7 @@ main(int argc, char **argv)
ink_split_dns_init(makeModuleVersion(1, 0, PRIVATE_MODULE_HEADER));
eventProcessor.start(num_of_net_threads);
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
// Must be called after starting event processor
init_stat_collector();
#endif
Modified: trafficserver/traffic/trunk/proxy/StatAPITypes.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatAPITypes.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatAPITypes.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatAPITypes.cc Tue Sep 28 16:32:32 2010
@@ -28,7 +28,7 @@
// TODO: This needs to be supported with non-V2 APIs as well.
#include "ink_config.h"
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include "api/ts/ts.h"
#include "StatAPITypes.h"
Modified: trafficserver/traffic/trunk/proxy/StatAPITypes.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatAPITypes.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatAPITypes.h (original)
+++ trafficserver/traffic/trunk/proxy/StatAPITypes.h Tue Sep 28 16:32:32 2010
@@ -30,7 +30,7 @@
#define STAT_API_TYPES_H
// TODO: This needs to be supported with non-V2 APIs as well.
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include <string> // TODO: Get rid of string here, why do we need it ?
#include <vector> // TODO: Is the vector really necessary ?
#include "inktomi++.h"
Modified: trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h Tue Sep 28 16:32:32 2010
@@ -34,7 +34,7 @@
#include "P_Net.h"
#endif
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include <string> // TODO: Do we need STL strings really?
#include <vector> // TODO: Do we need STL vectors really?
#include "StatAPITypes.h"
@@ -58,7 +58,7 @@ public:
void handle_event_count(int event);
int handle_event(int event, void *edata);
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
// TODO: These have confusing names, what exactly does it mean? Something with "cont" stats I think?
// We should give these appropriate names, like contName and isContStatsEnabled() or some such.
void setName(const char *name);
@@ -77,7 +77,7 @@ public:
//INKqa07670: Nokia memory leak bug fix
INKContInternalMagic_t m_free_magic;
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
// TODO: Fix names as describe above.
// TODO: Eliminate STL strings and containers?
std::string cont_name;
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Tue Sep 28 16:32:32 2010
@@ -38,7 +38,7 @@
#include "ReverseProxy.h"
#include "RemapProcessor.h"
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include "StatSystemV2.h"
#endif
@@ -344,7 +344,7 @@ client_response_hdr_bytes(0), client_res
pushed_response_hdr_bytes(0), pushed_response_body_bytes(0),
hooks_set(0), cur_hook_id(INK_HTTP_LAST_HOOK), cur_hook(NULL),
// TODO: This needs to be supported with non-V2 APIs as well.
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
prev_hook_start_time(0),
prev_hook_stats_enabled(false),
#endif
@@ -1431,7 +1431,7 @@ HttpSM::state_api_callout(int event, voi
APIHook *hook = cur_hook;
cur_hook = cur_hook->next();
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
// Do per plugin stats
// Increment calls made to plugin
hook->m_cont->statCallsMade(cur_hook_id);
@@ -1533,7 +1533,7 @@ HttpSM::state_api_callout(int event, voi
// Do per plugin stats
// Handle last plugin on current state
// TODO: This needs to be supported with non-V2 APIs as well.
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
if(prev_hook_stats_enabled && prev_hook_start_time) {
int64 time_in_plugin_ms = (INKhrtime() - prev_hook_start_time)/1000000;
Debug("http", "[%lld] Last plugin : Time spent : %s %lld",
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.h Tue Sep 28 16:32:32 2010
@@ -40,7 +40,7 @@
#include "HttpTunnel.h"
#include "InkAPIInternal.h"
#include "StatSystem.h"
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
#include "StatAPITypes.h"
#endif
#include "HttpClientSession.h"
@@ -504,7 +504,7 @@ protected:
int64 prev_hook_start_time;
// TODO: This needs to be supported with non-V2 APIs as well.
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
bool prev_hook_stats_enabled;
HistogramStats prev_hook_stats;
#endif
Modified: trafficserver/traffic/trunk/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logcat.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logcat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logcat.cc Tue Sep 28 16:32:32 2010
@@ -305,7 +305,7 @@ main(int argc, char *argv[])
perror(0);
error = DATA_PROCESSING_ERROR;
} else {
-#if ATS_HAS_POSIX_FADVISE
+#if TS_HAS_POSIX_FADVISE
posix_fadvise(in_fd, 0, 0, POSIX_FADV_DONTNEED);
#endif
if (auto_filenames) {
Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Tue Sep 28 16:32:32 2010
@@ -1741,7 +1741,7 @@ open_main_log(char *ymon_notice, const s
strncat(ymon_notice, " squid.blog not enabled", ymon_notice_size - strlen(ymon_notice) - 1);
return -1;
}
-#if ATS_HAS_POSIX_FADVISE
+#if TS_HAS_POSIX_FADVISE
posix_fadvise(main_fd, 0, 0, POSIX_FADV_DONTNEED);
#endif
return main_fd;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Tue Sep 28 16:32:32 2010
@@ -40,7 +40,7 @@
#include "WebReconfig.h"
#include "MgmtSocket.h"
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
#include <sys/capability.h>
#endif
@@ -1264,7 +1264,7 @@ LocalManager::listenForProxy()
return;
} /* End LocalManager::listenForProxy */
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
/** Control file access privileges to bypass DAC.
@parm state Use @c true to enable elevated privileges,
@c false to disable.
@@ -1343,7 +1343,7 @@ bindProxyPort(int proxy_port, in_addr_t
struct sockaddr_in proxy_addr;
int proxy_port_fd = -1;
-#if !ATS_USE_POSIX_CAP
+#if !TS_USE_POSIX_CAP
bool privBoost = false;
uid_t euid = geteuid();
uid_t saved_euid = 0;
@@ -1370,10 +1370,10 @@ bindProxyPort(int proxy_port, in_addr_t
}
if (transparent) {
-#if ATS_USE_TPROXY
+#if TS_USE_TPROXY
int transparent_value = 1;
Debug("http_tproxy", "Listen port %d inbound transparency enabled.\n", proxy_port);
- if (setsockopt(proxy_port_fd, SOL_IP, ATS_IP_TRANSPARENT, &transparent_value, sizeof(transparent_value)) == -1) {
+ if (setsockopt(proxy_port_fd, SOL_IP, TS_IP_TRANSPARENT, &transparent_value, sizeof(transparent_value)) == -1) {
mgmt_elog(stderr, "[bindProxyPort] Unable to set transparent socket option [%d] %s\n", errno, strerror(errno));
_exit(1);
}
@@ -1394,7 +1394,7 @@ bindProxyPort(int proxy_port, in_addr_t
Debug("lm", "[bindProxyPort] Successfully bound proxy port %d\n", proxy_port);
-#if !ATS_USE_POSIX_CAP
+#if !TS_USE_POSIX_CAP
if (proxy_port < 1024 && euid != 0) {
if (privBoost == true) {
if (removeRootPriv(saved_euid) == false) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.h Tue Sep 28 16:32:32 2010
@@ -191,7 +191,7 @@ private:
}; /* End class LocalManager */
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
bool elevateFileAccess(bool);
#else
bool restoreRootPriv(uid_t *old_euid = NULL);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Tue Sep 28 16:32:32 2010
@@ -73,7 +73,7 @@
#include "P_RecLocal.h"
#include "P_RecCore.h"
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
#include <sys/capability.h>
#endif
@@ -537,7 +537,7 @@ main(int argc, char **argv)
} else if (strcmp(argv[i], "-clusterRSPort") == 0) {
++i;
cluster_server_port = atoi(argv[i]);
-#if ATS_USE_DIAGS
+#if TS_USE_DIAGS
} else if (strcmp(argv[i], "-debug") == 0) {
++i;
strncpy(debug_tags, argv[i], 1023);
@@ -1354,7 +1354,7 @@ fileUpdated(char *fname)
return;
} /* End fileUpdate */
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
/** Restore capabilities after user id change.
This manipulates LINUX capabilities so that this process
can perform certain privileged operations even if it is
@@ -1460,7 +1460,7 @@ runAsUser(char *userName)
_exit(1);
}
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
if (restoreCapabilities()) {
mgmt_elog(stderr, "[runAsUser] Error: Failed to restore capabilities after switch to user %s.\n", userName);
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Tue Sep 28 16:32:32 2010
@@ -3237,7 +3237,7 @@ RecordElement RecordsConfig[] = {
//# Librecords based stats system (new as of v2.1.3)
{CONFIG, "proxy.config.stat_api.max_stats_allowed", "", INK_INT, "256", RU_RESTART_TS, RR_NULL, RC_INT, "[256-1000]", RA_NULL}
,
-#if ATS_HAS_V2STATS
+#if TS_HAS_V2STATS
// StatSystemV2 config
{CONFIG, "proxy.config.stat_collector.interval", "", INK_INT, "600", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc Tue Sep 28 16:32:32 2010
@@ -287,7 +287,7 @@ Rollback::statFile(version_t version, st
{
char *filePath;
int statResult;
-#if !ATS_USE_POSIX_CAP
+#if !TS_USE_POSIX_CAP
uid_t saved_euid = 0;
#endif
@@ -298,7 +298,7 @@ Rollback::statFile(version_t version, st
if (root_access_needed) {
if (
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
elevateFileAccess(true)
#else
restoreRootPriv(&saved_euid)
@@ -312,7 +312,7 @@ Rollback::statFile(version_t version, st
if (root_access_needed) {
if (
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
elevateFileAccess(false)
#else
removeRootPriv(saved_euid)
@@ -336,7 +336,7 @@ Rollback::openFile(version_t version, in
{
char *filePath;
int fd;
-#if !ATS_USE_POSIX_CAP
+#if !TS_USE_POSIX_CAP
uid_t saved_euid = 0;
#endif
@@ -344,7 +344,7 @@ Rollback::openFile(version_t version, in
if (root_access_needed) {
if (
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
elevateFileAccess(true)
#else
restoreRootPriv(&saved_euid)
@@ -360,7 +360,7 @@ Rollback::openFile(version_t version, in
fd = mgmt_open_mode(filePath, oflags, 0644);
if (root_access_needed) {
if (
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
elevateFileAccess(false)
#else
removeRootPriv(saved_euid)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc Tue Sep 28 16:32:32 2010
@@ -1267,7 +1267,7 @@ processSpawn(const char *args[],
long total;
bool cutoff;
const char *too_large_msg = "\nfile too large, truncated here...";
-#if !ATS_USE_POSIX_CAP
+#if !TS_USE_POSIX_CAP
uid_t saved_euid = 0;
#endif
@@ -1289,7 +1289,7 @@ processSpawn(const char *args[],
for (int i = 0; i < MAX_PROXY_SERVER_PORTS && lmgmt->proxy_server_fd[i] >= 0; i++) {
close_socket(lmgmt->proxy_server_fd[i]);
}
-#if ATS_USE_POSIX_CAP
+#if TS_USE_POSIX_CAP
/* There is no point in saving the current euid in order to
restore it because at this point the process will either exec
or exit. The thread of execution will neither linger nor return
@@ -1403,7 +1403,7 @@ processSpawn(const char *args[],
}
}
-#if !ATS_USE_POSIX_CAP
+#if !TS_USE_POSIX_CAP
if (run_as_root) {
removeRootPriv(saved_euid);
}
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=1002247&r1=1002246&r2=1002247&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Tue Sep 28 16:32:32 2010
@@ -48,7 +48,7 @@
struct obj_list *ObjList;
#endif
-#if ATS_HAS_PROFILER
+#if TS_HAS_PROFILER
#include <google/profiler.h>
#endif
@@ -331,7 +331,7 @@ signal_handler(int sig, siginfo_t * t, v
//syslog(LOG_ERR, sig_msg);
#endif
-#if ATS_HAS_PROFILER
+#if TS_HAS_PROFILER
ProfilerStop();
#endif
shutdown_system();