You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/02/10 05:23:08 UTC
svn commit: r908346 - in /incubator/trafficserver/traffic/branches/dev: ./
libinktomi++/ proxy/ proxy/congest/ proxy/http2/ proxy/http2/remap/
proxy/mgmt2/ proxy/mgmt2/tools/ proxy/mgmt2/utils/ proxy/stats/
Author: georgep
Date: Wed Feb 10 04:23:06 2010
New Revision: 908346
URL: http://svn.apache.org/viewvc?rev=908346&view=rev
Log:
TS-2: Fix latest merge of trunk for OSX. Had to rename 'proxy/Config.{h,cc}' to 'proxy/ProxyConfig.{h,cc}' due to generated 'config.h' from TS-130.
Added:
incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.h
Removed:
incubator/trafficserver/traffic/branches/dev/proxy/Config.cc
incubator/trafficserver/traffic/branches/dev/proxy/Config.h
Modified:
incubator/trafficserver/traffic/branches/dev/configure.ac
incubator/trafficserver/traffic/branches/dev/libinktomi++/Compatability.h
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_platform.h
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc
incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc
incubator/trafficserver/traffic/branches/dev/proxy/CacheControl.cc
incubator/trafficserver/traffic/branches/dev/proxy/CacheInspectorAllow.cc
incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc
incubator/trafficserver/traffic/branches/dev/proxy/DiagsConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/IPAllow.cc
incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc
incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc
incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h
incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.cc
incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.h
incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc
incubator/trafficserver/traffic/branches/dev/proxy/SimpleHttp.cc
incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc
incubator/trafficserver/traffic/branches/dev/proxy/StatSystem.cc
incubator/trafficserver/traffic/branches/dev/proxy/Transform.cc
incubator/trafficserver/traffic/branches/dev/proxy/Update.cc
incubator/trafficserver/traffic/branches/dev/proxy/congest/Congestion.cc
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpCacheSM.h
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc
incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h
incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ShmemClean.cc
incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtPing.cc
incubator/trafficserver/traffic/branches/dev/proxy/signals.cc
incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.h
Modified: incubator/trafficserver/traffic/branches/dev/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/configure.ac?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/configure.ac (original)
+++ incubator/trafficserver/traffic/branches/dev/configure.ac Wed Feb 10 04:23:06 2010
@@ -373,6 +373,8 @@
debug_opt="-ggdb3 $common_opt"
release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
+ CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+ LDFLAGS="${LDFLAGS} -L/opt/local/lib"
;;
freebsd*)
common_opt="-pipe -Wall -Werror -Wno-char-subscripts -Wno-write-strings"
@@ -515,6 +517,7 @@
AC_CHECK_LIB([rt],[clock_gettime],[AC_SUBST([LIBRT],["-lrt"])])
AC_CHECK_LIB([posix4],[clock_gettime],[AC_SUBST([LIBRT],["-lposix4"])])
AC_CHECK_LIB([iconv],[iconv_open],[AC_SUBST([LIBICONV],["-liconv"])])
+AC_CHECK_LIB([iconv],[libiconv_open],[AC_SUBST([LIBICONV],["-liconv"])])
AC_CHECK_LIB([ev],[ev_sleep],[AC_SUBST([LIBEV],["-lev"])])
AC_CHECK_LIB([ssl],[SSL_CTX_new],
@@ -699,6 +702,8 @@
sys/sysctl.h \
sys/sysinfo.h \
sys/systeminfo.h \
+ arpa/inet.h \
+ arpa/nameser.h \
arpa/nameser_compat.h \
execinfo.h \
netdb.h \
@@ -715,8 +720,15 @@
stropts.h \
sys/mount.h \
sys/param.h \
+ math.h \
], [], [])
+AC_CHECK_HEADERS([netinet/ip_icmp.h], [], [],
+ [[#ifdef HAVE_NETINET_IP_H
+ #include <netinet/ip.h>
+ #endif
+ ]])
+
if test "x${with_libdb}" == "xyes"; then
AC_CHECK_HEADERS([db_185.h \
db.h \
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/Compatability.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/Compatability.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/Compatability.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/Compatability.h Wed Feb 10 04:23:06 2010
@@ -77,12 +77,10 @@
}
#endif
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if ((HOST_OS == freebsd) || (HOST_OS == darwin))
typedef long paddr_t;
typedef unsigned int in_addr_t;
-#endif
-
-#if (HOST_OS == solaris)
+#elif (HOST_OS == solaris)
#include <sys/types.h> /* paddr_t should be defined here*/
typedef uint64_t paddr_t;
#endif
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_platform.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_platform.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_platform.h (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_platform.h Wed Feb 10 04:23:06 2010
@@ -140,7 +140,13 @@
# include <sys/sockio.h>
#endif
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+
+#ifdef HAVE_NETINET_IP_ICMP_H
#include <netinet/ip_icmp.h>
+#endif
#include <resolv.h>
@@ -165,10 +171,20 @@
#include <dlfcn.h>
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+# include <arpa/nameser.h>
+#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+
#ifndef MAXINT
#define MAXINT INT_MAX
#endif
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_res_init.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_init.cc Wed Feb 10 04:23:06 2010
@@ -96,6 +96,8 @@
#endif /* LIBC_SCCS and not lint */
+#include "ink_config.h"
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -103,14 +105,17 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#include <resolv.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include "ink_string.h"
+#include "ink_string.h"
#include "ink_resolver.h"
#if (HOST_OS != linux)
Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/ink_res_mkquery.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/ink_res_mkquery.cc Wed Feb 10 04:23:06 2010
@@ -97,11 +97,15 @@
static const char rcsid[] = "$Id: res_mkquery.c,v 1.6.672.1 2008/04/03 02:12:21 marka Exp $";
#endif /* LIBC_SCCS and not lint */
+#include "ink_config.h"
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
#include <netdb.h>
#include <resolv.h>
#include <stdio.h>
Modified: incubator/trafficserver/traffic/branches/dev/proxy/CacheControl.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/CacheControl.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/CacheControl.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/CacheControl.cc Wed Feb 10 04:23:06 2010
@@ -45,7 +45,7 @@
#include "Main.h"
#include "Error.h"
#include "P_EventSystem.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "HTTP.h"
#include "HttpConfig.h"
#include "StatSystem.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/CacheInspectorAllow.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/CacheInspectorAllow.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/CacheInspectorAllow.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/CacheInspectorAllow.cc Wed Feb 10 04:23:06 2010
@@ -31,7 +31,7 @@
#include <stdio.h>
#include "Main.h"
#include "CacheInspectorAllow.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "StatSystem.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc Wed Feb 10 04:23:06 2010
@@ -31,7 +31,7 @@
#include "ink_unused.h"
#include <sys/types.h>
#include "Main.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ControlMatcher.h"
#include "CacheControl.h"
#include "ParentSelection.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/DiagsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/DiagsConfig.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/DiagsConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/DiagsConfig.cc Wed Feb 10 04:23:06 2010
@@ -30,7 +30,7 @@
#else
#include "Main.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#define MGMT_PTR pmgmt
#define DIAGS_LOG_FILE "diags.log"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/IPAllow.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/IPAllow.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/IPAllow.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/IPAllow.cc Wed Feb 10 04:23:06 2010
@@ -31,7 +31,7 @@
#include "inktomi++.h"
#include "Main.h"
#include "IPAllow.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "StatSystem.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc Wed Feb 10 04:23:06 2010
@@ -38,7 +38,7 @@
#include "EThread.h"
#include "EventProcessor.h"
#include "Net.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ProcessManager.h"
#include "I_Version.h"
#include "ink_syslog.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPI.cc Wed Feb 10 04:23:06 2010
@@ -41,7 +41,7 @@
#include "P_Cache.h"
#include "I_RecCore.h"
#include "I_RecSignals.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "stats/CoupledStats.h"
#include "stats/Stats.h"
#include "InkAPIInternal.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPIInternal.h Wed Feb 10 04:23:06 2010
@@ -32,7 +32,7 @@
//#include "MixtAPIInternal.h"
#include "HTTP.h"
#include "List.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "P_Cache.h"
class CacheAPIHooks;
extern CacheAPIHooks *cache_global_hooks;
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Main.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Main.cc Wed Feb 10 04:23:06 2010
@@ -62,7 +62,7 @@
#include "RecordsConfig.h"
#include "Transform.h"
#include "ProcessManager.h"
-#include "Config.h"
+#include "ProxyConfig.h"
//#include "Ftp.h"
//#include "FtpProxy.h"
#include "HttpProxyServerMain.h"
@@ -321,9 +321,10 @@
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != rl.rlim_max) {
#if (HOST_OS == darwin)
- struct rlimit rlt;
- rlt.rlim_max = OPEN_MAX;
- rl.rlim_cur = min(rlt.rlim_max, rl.rlim_max);
+ if (which == RLIMIT_NOFILE)
+ rl.rlim_cur = fmin(OPEN_MAX, rl.rlim_max);
+ else
+ rl.rlim_cur = rl.rlim_max;
#else
rl.rlim_cur = rl.rlim_max;
#endif
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am Wed Feb 10 04:23:06 2010
@@ -80,8 +80,8 @@
CacheControl.h \
CacheInspectorAllow.cc \
CacheInspectorAllow.h \
- Config.cc \
- Config.h \
+ ProxyConfig.cc \
+ ProxyConfig.h \
ControlBase.cc \
ControlBase.h \
ControlMatcher.cc \
@@ -192,7 +192,7 @@
StatSystem.o \
CacheInspectorAllow.o \
ReverseProxy.o \
- Config.o \
+ ProxyConfig.o \
signals.o \
Error.o \
EventName.o \
@@ -251,7 +251,7 @@
StatSystem.o \
CacheInspectorAllow.o \
ReverseProxy.o \
- Config.o \
+ ProxyConfig.o \
signals.o \
Error.o \
EventName.o \
@@ -316,7 +316,7 @@
StatSystem.o \
CacheInspectorAllow.o \
ReverseProxy.o \
- Config.o \
+ ProxyConfig.o \
signals.o \
Error.o \
EventName.o \
@@ -372,7 +372,7 @@
libTrafficServerStandalone_a_SOURCES = \
signals.cc \
Error.cc \
- Config.cc \
+ ProxyConfig.cc \
EventName.cc \
DiagsConfig.cc \
StatPages.cc \
Modified: incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.cc Wed Feb 10 04:23:06 2010
@@ -36,7 +36,7 @@
#include "ControlMatcher.h"
#include "Main.h"
#include "Error.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "HTTP.h"
#include "HttpTransact.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ParentSelection.h Wed Feb 10 04:23:06 2010
@@ -32,7 +32,7 @@
#define _PARENT_SELECTION_H_
#include "Main.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ControlBase.h"
#include "ControlMatcher.h"
Added: incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.cc?rev=908346&view=auto
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.cc (added)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.cc Wed Feb 10 04:23:06 2010
@@ -0,0 +1,202 @@
+/** @file
+
+ A brief file description
+
+ @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.
+ */
+
+#include "inktomi++.h"
+#include "ProxyConfig.h"
+#include "P_EventSystem.h"
+
+ConfigProcessor configProcessor;
+
+
+void *
+config_int_cb(void *data, void *value)
+{
+ *(int *) data = *(ink64 *) value;
+ return NULL;
+}
+
+void *
+config_float_cb(void *data, void *value)
+{
+ *(float *) data = *(float *) value;
+ return NULL;
+}
+
+void *
+config_long_long_cb(void *data, void *value)
+{
+ *(ink64 *) data = *(ink64 *) value;
+ return NULL;
+}
+
+/////////////////////////////////////////////////////////////
+//
+// config_string_alloc_cb()
+//
+// configuration callback function. The function is called
+// by the manager when a string configuration variable
+// changed. It allocates new memory for the new data.
+// the old variable is scheduled to be freed using
+// ConfigFreerContinuation which will free the memory
+// used for this variable after long time, assuming that
+// during all this time all the users of this memory will
+// disappear.
+/////////////////////////////////////////////////////////////
+void *
+config_string_alloc_cb(void *data, void *value)
+{
+ char *_ss = (char *) value;
+ char *_new_value = 0;
+
+//#define DEBUG_CONFIG_STRING_UPDATE
+#if defined (DEBUG_CONFIG_STRING_UPDATE)
+ printf("config callback [new, old] = [%s : %s]\n",
+ (_ss) ? (_ss) : (""), (*(char **) data) ? (*(char **) data) : (""));
+#endif
+ int len = -1;
+ if (_ss) {
+ len = strlen(_ss);
+ _new_value = (char *) xmalloc(len + 1);
+ memcpy(_new_value, _ss, len + 1);
+ }
+
+ char *_temp2 = *(char **) data;
+ *(char **) data = _new_value;
+
+ // free old data
+ if (_temp2 != 0)
+ new_Freer(_temp2, HRTIME_DAY);
+
+ return NULL;
+}
+
+
+class ConfigInfoReleaser:public Continuation
+{
+public:
+ ConfigInfoReleaser(unsigned int id, ConfigInfo * info)
+ :Continuation(new_ProxyMutex()), m_id(id), m_info(info)
+ {
+ SET_HANDLER(&ConfigInfoReleaser::handle_event);
+ }
+
+ int handle_event(int event, void *edata)
+ {
+ configProcessor.release(m_id, m_info);
+ delete this;
+ return 0;
+ }
+
+public:
+ unsigned int m_id;
+ ConfigInfo *m_info;
+};
+
+
+ConfigProcessor::ConfigProcessor()
+:ninfos(0)
+{
+ int i;
+
+ for (i = 0; i < MAX_CONFIGS; i++) {
+ infos[i] = NULL;
+ }
+}
+
+unsigned int
+ConfigProcessor::set(unsigned int id, ConfigInfo * info)
+{
+ ConfigInfo *old_info;
+ int idx;
+
+ if (id == 0) {
+ id = ink_atomic_increment((int *) &ninfos, 1) + 1;
+ ink_assert(id != 0);
+ ink_assert(id <= MAX_CONFIGS);
+ }
+
+ info->m_refcount = 1;
+
+ if (id > MAX_CONFIGS) {
+ // invalid index
+ Error("[ConfigProcessor::set] invalid index");
+ return 0;
+ }
+
+ idx = id - 1;
+
+ do {
+ old_info = (ConfigInfo *) infos[idx];
+ } while (!ink_atomic_cas_ptr((pvvoidp) & infos[idx], old_info, info));
+
+ if (old_info) {
+ eventProcessor.schedule_in(NEW(new ConfigInfoReleaser(id, old_info)), HRTIME_SECONDS(60));
+ }
+
+ return id;
+}
+
+ConfigInfo *
+ConfigProcessor::get(unsigned int id)
+{
+ ConfigInfo *info;
+ int idx;
+
+ ink_assert(id != 0);
+ ink_assert(id <= MAX_CONFIGS);
+
+ if (id == 0 || id > MAX_CONFIGS) {
+ // return NULL, because we of an invalid index
+ return NULL;
+ }
+
+ idx = id - 1;
+ info = (ConfigInfo *) infos[idx];
+ if (ink_atomic_increment((int *) &info->m_refcount, 1) < 0) {
+ ink_assert(!"not reached");
+ }
+
+ return info;
+}
+
+void
+ConfigProcessor::release(unsigned int id, ConfigInfo * info)
+{
+ int val;
+ int idx;
+
+ ink_assert(id != 0);
+ ink_assert(id <= MAX_CONFIGS);
+
+ if (id == 0 || id > MAX_CONFIGS) {
+ // nothing to delete since we have an invalid index
+ return;
+ }
+
+ idx = id - 1;
+ val = ink_atomic_increment((int *) &info->m_refcount, -1);
+
+ if ((infos[idx] != info) && (val == 1)) {
+ delete info;
+ }
+}
Added: incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.h?rev=908346&view=auto
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.h (added)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ProxyConfig.h Wed Feb 10 04:23:06 2010
@@ -0,0 +1,337 @@
+/** @file
+
+ A brief file description
+
+ @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.
+ */
+
+/****************************************************************************
+
+ ProxyConfig.h
+
+
+ ****************************************************************************/
+
+#ifndef _Proxy_Config_h
+#define _Proxy_Config_h
+
+#include "inktomi++.h"
+#include "ProcessManager.h"
+#include "Error.h"
+
+void *config_int_cb(void *data, void *value);
+void *config_long_long_cb(void *data, void *value);
+void *config_float_cb(void *data, void *value);
+void *config_string511_cb(void *data, void *value);
+void *config_string_alloc_cb(void *data, void *value);
+
+//
+// Syntactic sugar for management record access
+//
+#define LIBRECORDS_WARN \
+Warning("** MUST MIGRATE TO LIBRECORDS ** file:%s line:%d\n", __FILE__, __LINE__)
+
+#define ConfigReadCounter(_s) pmgmt->record_data->readConfigCounter(_s); LIBRECORDS_WARN
+#define ConfigReadInteger(_s) pmgmt->record_data->readConfigInteger(_s); LIBRECORDS_WARN
+#define ConfigReadFloat(_s) pmgmt->record_data->readConfigFloat(_s); LIBRECORDS_WARN
+#define ConfigReadString(_s) pmgmt->record_data->readConfigString(_s); LIBRECORDS_WARN
+#define LocalReadInteger(_s) pmgmt->record_data->readLocalInteger(_s); LIBRECORDS_WARN
+
+//
+// Macros that spin waiting for the data to be bound
+//
+
+#define ReadConfigStringAlloc(_s,_sc) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; int _len = -1; \
+ char * _ss = pmgmt->record_data->readConfigString(_sc, &_found); \
+ if (_found) { \
+ if (_ss) { _len = strlen(_ss); \
+ _s = (char *)xmalloc(_len+1); \
+ memcpy(_s, _ss, _len+1); xfree(_ss); } \
+ } else { Warning("Cannot read config %s",_sc); } \
+} while(0)
+
+#define ReadConfigString(_s,_sc,_len) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; \
+ char * _ss = pmgmt->record_data->readConfigString(_sc, &_found); \
+ if (_found && _ss) { strncpy(_s,_ss,_len); xfree(_ss); } \
+ else Warning("Cannot read config %s",_sc); \
+} while(0)
+
+#define ReadConfigInteger(_i,_s) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; \
+ ink64 _ii = pmgmt->record_data->readConfigInteger(_s, &_found); \
+ if (_found) _i = _ii; else Warning("Cannot read config %s",_s); \
+} while(0)
+
+#define ReadConfigInt32(_i,_s) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; \
+ ink64 _ii = pmgmt->record_data->readConfigInteger(_s, &_found); \
+ if (_found) _i = (ink32)_ii; else Warning("Cannot read config %s",_s); \
+} while(0)
+
+#define ReadConfigInt32U(_i,_s) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; \
+ ink64 _ii = pmgmt->record_data->readConfigInteger(_s, &_found); \
+ if (_found) _i = (inku32)_ii; else Warning("Cannot read config %s",_s); \
+} while(0)
+
+#define ReadConfigFloat(_f,_s) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; \
+ float _ff = pmgmt->record_data->readConfigFloat(_s, &_found); \
+ if (_found) _f = _ff; else Warning("Cannot read config %s",_s); \
+} while(0)
+
+#define ReadLocalInteger(_i,_s) do { \
+ LIBRECORDS_WARN; \
+ bool _found = 0; \
+ ink64 _ii = pmgmt->record_data->readLocalInteger(_s, &_found); \
+ if (_found) _i = _ii; else Warning("Cannot read config %s",_s); \
+} while(0)
+
+//
+// Syntactic sugar for management record access
+//
+#ifdef DEBUG
+#define RegisterStatUpdateFunc(_n,_cb,_odata) \
+do { \
+ LIBRECORDS_WARN; \
+ ink_assert(pmgmt->record_data->registerStatUpdateFunc(_n,_cb,_odata)); \
+} while(0)
+
+#define RegisterConfigUpdateFunc(_n,_cb,_odata) \
+do { \
+ LIBRECORDS_WARN; \
+ ink_assert(pmgmt->record_data->registerConfigUpdateFunc(_n,_cb,_odata)); \
+} while(0)
+
+#define RegisterConfigUpdateFuncInteger(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ int* tmp_ptr = &_i; \
+ ink_assert(pmgmt->record_data->registerConfigUpdateFunc(_n,config_int_cb, (void*)tmp_ptr)); \
+} while(0)
+
+#define RegisterConfigUpdateFuncIntegerU(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ unsigned* tmp_ptr = &_i; \
+ ink_assert(pmgmt->record_data->registerConfigUpdateFunc(_n,config_int_cb, (void*)tmp_ptr)); \
+} while(0)
+
+#define RegisterConfigUpdateFuncFloat(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ ink_assert(pmgmt->record_data->registerConfigUpdateFunc(_n,config_float_cb, (void*)&_i));\
+} while(0)
+
+#define RegisterConfigUpdateFuncLongLong(_ll,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ ink64* tmp_ptr = &_ll; \
+ ink_assert(pmgmt->record_data->registerConfigUpdateFunc(_n,config_long_long_cb, (void*)tmp_ptr));\
+} while(0)
+
+#define RegisterConfigUpdateFuncInt64(_ll,_n) \
+RegisterConfigUpdateFuncLongLong(_ll,_n)
+
+#define RegisterConfigUpdateFuncStringAlloc(_ll,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ ink_assert(pmgmt->record_data->registerConfigUpdateFunc(_n,config_string_alloc_cb, (void*)&_ll)); \
+} while(0)
+
+#define RegisterLocalUpdateFunc(_n,_cb,_odata) \
+do { \
+ LIBRECORDS_WARN; \
+ ink_assert(pmgmt->record_data->registerLocalUpdateFunc(_n,_cb,_odata)); \
+} while (0)
+
+#define RegisterLocalUpdateFuncInteger(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ int* tmp_ptr = &_i; \
+ ink_assert(pmgmt->record_data->registerLocalUpdateFunc(_n,config_int_cb, (void*)tmp_ptr)); \
+} while(0)
+
+#else
+
+#define RegisterStatUpdateFunc(_n,_cb,_odata) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerStatUpdateFunc(_n,_cb,_odata); \
+} while(0)
+
+#define RegisterConfigUpdateFunc(_n,_cb,_odata) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerConfigUpdateFunc(_n,_cb,_odata); \
+} while(0)
+
+#define RegisterConfigUpdateFuncInteger(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerConfigUpdateFunc(_n,config_int_cb, (void*)&_i); \
+} while(0)
+
+#define RegisterConfigUpdateFuncIntegerU(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerConfigUpdateFunc(_n,config_int_cb, (void*)&_i); \
+} while(0)
+
+#define RegisterConfigUpdateFuncFloat(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerConfigUpdateFunc(_n,config_float_cb, (void*)&_i); \
+} while(0)
+
+#define RegisterConfigUpdateFuncLongLong(_ll,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerConfigUpdateFunc(_n,config_long_long_cb, (void*)&_ll); \
+} while(0)
+
+#define RegisterConfigUpdateFuncInt64(_ll,_n) \
+RegisterConfigUpdateFuncLongLong(_ll,_n)
+
+#define RegisterConfigUpdateFuncStringAlloc(_ll,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerConfigUpdateFunc(_n,config_string_alloc_cb, (void*)&_ll); \
+} while(0)
+
+#define RegisterLocalUpdateFunc(_n,_cb,_odata) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerLocalUpdateFunc(_n,_cb,_odata); \
+} while(0)
+
+#define RegisterLocalUpdateFuncInteger(_i,_n) \
+do { \
+ LIBRECORDS_WARN; \
+ pmgmt->record_data->registerLocalUpdateFunc(_n,config_int_cb, (void*)&_i); \
+} while(0)
+
+#endif
+
+#define EstablishStaticConfigInteger(_ix,_n) \
+ReadConfigInteger(_ix,_n); \
+RegisterConfigUpdateFuncInteger(_ix,_n)
+
+#define EstablishStaticConfigInt32(_ix,_n) \
+ReadConfigInt32(_ix,_n); \
+RegisterConfigUpdateFuncInteger(_ix,_n)
+
+#define EstablishStaticConfigIntegerU(_ix,_n) \
+ReadConfigInteger(_ix,_n); \
+RegisterConfigUpdateFuncIntegerU(_ix,_n)
+
+#define EstablishStaticConfigInt32U(_ix,_n) \
+ReadConfigInt32U(_ix,_n); \
+RegisterConfigUpdateFuncIntegerU(_ix,_n)
+
+#define EstablishStaticConfigFloat(_ix,_n) \
+ReadConfigFloat(_ix,_n); \
+RegisterConfigUpdateFuncFloat(_ix,_n)
+
+#define EstablishStaticConfigLongLong(_ix,_n) \
+ReadConfigInteger(_ix,_n); \
+RegisterConfigUpdateFuncLongLong(_ix,_n)
+
+#define EstablishStaticConfigInt64(_ix,_n) \
+ReadConfigInteger(_ix,_n); \
+RegisterConfigUpdateFuncInt64(_ix,_n)
+
+#define EstablishStaticConfigStringAlloc(_ix,_n) \
+ReadConfigStringAlloc(_ix,_n); \
+RegisterConfigUpdateFuncStringAlloc(_ix,_n)
+
+#define EstablishStaticLocalInteger(_ix,_n) \
+ReadLocalInteger(_ix,_n); \
+RegisterLocalUpdateFuncInteger(_ix,_n)
+
+#define RegisterStatCountSum(_n) \
+ RegisterStatUpdateFunc( "proxy.process." #_n ".sum", stats_sum_cb, \
+ (void*)_n##_Stat); \
+ RegisterStatUpdateFunc( "proxy.process." #_n ".count", stats_count_cb, \
+ (void*)_n##_Stat)
+
+#define RegisterStatCountFSum(_n) \
+ RegisterStatUpdateFunc( "proxy.process." #_n ".sum", stats_fsum_cb, \
+ (void*)_n##_Stat); \
+ RegisterStatUpdateFunc( "proxy.process." #_n ".count", stats_count_cb, \
+ (void*)_n##_Stat)
+
+#define RegisterStatSum(_n) \
+ RegisterStatUpdateFunc( "proxy.process." #_n, stats_sum_cb, \
+ (void*)_n##_Stat)
+
+#define RegisterStatCount(_n) \
+ RegisterStatUpdateFunc( "proxy.process." #_n, stats_count_cb, \
+ (void*)_n##_Stat)
+
+#define RegisterStatAvg(_n) \
+ RegisterStatUpdateFunc( "proxy.process." #_n, stats_avg_cb, \
+ (void*)_n##_Stat)
+
+#define SignalManager(_n,_d) pmgmt->signalManager(_n,(char*)_d)
+#define SignalWarning(_n,_s) { Warning(_s); SignalManager(_n,_s); }
+
+#define RegisterMgmtCallback(_signal,_fn,_data) \
+pmgmt->registerMgmtCallback(_signal,_fn,_data)
+
+
+#define MAX_CONFIGS 100
+
+
+struct ConfigInfo
+{
+ volatile int m_refcount;
+
+ virtual ~ ConfigInfo()
+ {
+ }
+};
+
+
+class ConfigProcessor
+{
+public:
+ ConfigProcessor();
+
+ unsigned int set(unsigned int id, ConfigInfo * info);
+ ConfigInfo *get(unsigned int id);
+ void release(unsigned int id, ConfigInfo * data);
+
+public:
+ volatile ConfigInfo *infos[MAX_CONFIGS];
+ volatile int ninfos;
+};
+
+
+extern ConfigProcessor configProcessor;
+
+#endif
Modified: incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc Wed Feb 10 04:23:06 2010
@@ -34,7 +34,7 @@
#include "P_EventSystem.h"
#include "StatSystem.h"
#include "P_Cache.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ReverseProxy.h"
#include "MatcherUtils.h"
#include "Tokenizer.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/SimpleHttp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/SimpleHttp.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/SimpleHttp.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/SimpleHttp.cc Wed Feb 10 04:23:06 2010
@@ -27,7 +27,7 @@
#include "P_Cache.h"
#include "P_Net.h"
#include "P_HostDB.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "Diags.h"
#include "HTTP.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=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/StatPages.cc Wed Feb 10 04:23:06 2010
@@ -29,7 +29,7 @@
****************************************************************************/
#include "ink_config.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "StatPages.h"
#include "HdrUtils.h"
#include "CacheInspectorAllow.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/StatSystem.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/StatSystem.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/StatSystem.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/StatSystem.cc Wed Feb 10 04:23:06 2010
@@ -32,7 +32,7 @@
#include "Error.h"
#include "BaseRecords.h"
#include "ProcessManager.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "StatPages.h"
#include "HTTP.h"
#include "RecordsConfig.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/Transform.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Transform.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Transform.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Transform.cc Wed Feb 10 04:23:06 2010
@@ -61,7 +61,7 @@
#ifndef INK_NO_TRANSFORM
-#include "Config.h"
+#include "ProxyConfig.h"
#include "P_Net.h"
#include "MimeTable.h"
#include "TransformInternal.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=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Update.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Update.cc Wed Feb 10 04:23:06 2010
@@ -25,7 +25,7 @@
#include "Main.h"
#include "Update.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "StatSystem.h"
#include "HttpUpdateSM.h"
#include "HttpDebugNames.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/congest/Congestion.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/congest/Congestion.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/congest/Congestion.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/congest/Congestion.cc Wed Feb 10 04:23:06 2010
@@ -29,7 +29,7 @@
****************************************************************************/
#include "Main.h"
#include "Error.h"
-#include "Config.h"
+#include "ProxyConfig.h"
//#include "Lock.h"
#include "P_Net.h"
//#include "Freer.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpCacheSM.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpCacheSM.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpCacheSM.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpCacheSM.h Wed Feb 10 04:23:06 2010
@@ -35,7 +35,7 @@
#include "P_Cache.h"
#include "StatSystem.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "URL.h"
#include "HTTP.h"
#include "HttpConfig.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc Wed Feb 10 04:23:06 2010
@@ -26,7 +26,7 @@
#include "HttpConfig.h"
#include "HTTP.h"
#include "ProcessManager.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ICPProcessor.h"
#include "P_Net.h"
#include "P_RecUtils.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h Wed Feb 10 04:23:06 2010
@@ -50,7 +50,7 @@
#endif
#include "inktomi++.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#undef MgmtInt
#undef MgmtFloat
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc Wed Feb 10 04:23:06 2010
@@ -23,7 +23,7 @@
*/
#include "HttpSM.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "HttpClientSession.h"
#include "HttpServerSession.h"
#include "HttpDebugNames.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h Wed Feb 10 04:23:06 2010
@@ -36,7 +36,7 @@
#include "CacheControl.h"
#include "ParentSelection.h"
#include "BaseRecords.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "Transform.h"
//#include "HttpAuthParams.h"
#include "RemapAPI.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc Wed Feb 10 04:23:06 2010
@@ -27,7 +27,7 @@
#include "P_EventSystem.h"
#include "StatSystem.h"
#include "P_Cache.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "ReverseProxy.h"
#include "MatcherUtils.h"
#include "Tokenizer.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc Wed Feb 10 04:23:06 2010
@@ -30,6 +30,9 @@
*
*/
+#include "ink_config.h"
+#include "ink_platform.h"
+
#include "Main.h"
#include "MgmtUtils.h"
#include "MgmtSchema.h"
@@ -426,11 +429,19 @@
if (max_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != rl.rlim_max) {
+#if (HOST_OS == darwin)
+ if (which == RLIMIT_NOFILE)
+ rl.rlim_cur = fmin(OPEN_MAX, rl.rlim_max);
+ else
+ rl.rlim_cur = rl.rlim_max;
+#else
rl.rlim_cur = rl.rlim_max;
+#endif
ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
}
}
+#if (HOST_OS != darwin)
if (unlim_it) {
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
if (rl.rlim_cur != RLIM_INFINITY) {
@@ -438,6 +449,7 @@
ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
}
}
+#endif
ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
#ifdef MGMT_USE_SYSLOG
//syslog(LOG_NOTICE, "NOTE: %s(%d):cur(%d),max(%d)", name, which, (int)rl.rlim_cur, (int)rl.rlim_max);
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ShmemClean.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ShmemClean.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ShmemClean.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ShmemClean.cc Wed Feb 10 04:23:06 2010
@@ -31,6 +31,7 @@
*
*/
+#include "ink_config.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include <stdlib.h>
Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtPing.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtPing.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtPing.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/MgmtPing.cc Wed Feb 10 04:23:06 2010
@@ -29,6 +29,8 @@
*
*/
+#include "ink_config.h"
+#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "MgmtPing.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/signals.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/signals.cc?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/signals.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/signals.cc Wed Feb 10 04:23:06 2010
@@ -30,7 +30,7 @@
#include <unistd.h>
#include "inktomi++.h"
#include "signals.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "P_EventSystem.h"
#include "StatSystem.h"
#include "P_Cache.h"
Modified: incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.h?rev=908346&r1=908345&r2=908346&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/stats/CoupledStats.h Wed Feb 10 04:23:06 2010
@@ -37,7 +37,7 @@
#include "ink_resource.h"
#include "ink_assert.h"
#include "BaseRecords.h"
-#include "Config.h"
+#include "ProxyConfig.h"
#include "Stats.h"
#ifdef _c_impl