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/03 20:34:50 UTC

svn commit: r906199 - in /incubator/trafficserver/traffic/branches/dev: ./ ci/ iocore/fastio/inkudp/ iocore/utils/ libinktomi++/ proxy/ proxy/api/include/ proxy/config/ proxy/config/body_factory/default/ proxy/http2/ proxy/logging/ proxy/mgmt2/ test/pl...

Author: georgep
Date: Wed Feb  3 19:34:48 2010
New Revision: 906199

URL: http://svn.apache.org/viewvc?rev=906199&view=rev
Log:
Resync dev branch with trunk changes.
Tested: ubuntu904

Removed:
    incubator/trafficserver/traffic/branches/dev/iocore/fastio/inkudp/inkudp_sendto.c.vestigal
    incubator/trafficserver/traffic/branches/dev/iocore/fastio/inkudp/inkudp_swap.c.vestigal
    incubator/trafficserver/traffic/branches/dev/iocore/utils/Disk.cc
    incubator/trafficserver/traffic/branches/dev/iocore/utils/I_Disk.h
    incubator/trafficserver/traffic/branches/dev/proxy/IDCControlMatcher.h
    incubator/trafficserver/traffic/branches/dev/test/plugin/fpmcp/
Modified:
    incubator/trafficserver/traffic/branches/dev/   (props changed)
    incubator/trafficserver/traffic/branches/dev/.gitignore
    incubator/trafficserver/traffic/branches/dev/ci/rat-excludes.txt
    incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc
    incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivate.h
    incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateFrozen.h
    incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/README
    incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpClientSession.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc
    incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessHttp.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h

Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  3 19:34:48 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:891822-905847
+/incubator/trafficserver/traffic/trunk:891822-906162

Modified: incubator/trafficserver/traffic/branches/dev/.gitignore
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/.gitignore?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/.gitignore (original)
+++ incubator/trafficserver/traffic/branches/dev/.gitignore Wed Feb  3 19:34:48 2010
@@ -47,3 +47,4 @@
 m4/ltversion.m4
 m4/lt~obsolete.m4
 
+install/trafficserver

Modified: incubator/trafficserver/traffic/branches/dev/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/ci/rat-excludes.txt?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/ci/rat-excludes.txt (original)
+++ incubator/trafficserver/traffic/branches/dev/ci/rat-excludes.txt Wed Feb  3 19:34:48 2010
@@ -1,4 +1,5 @@
 ci/
+proxy/config
 example/README.internal
 example/blacklist-1/blacklist.txt
 example/thread-pool/TESTPLAN.txt
@@ -6,15 +7,23 @@
 example/thread-pool/test/SynTest/system.cfg
 example/thread-pool/test/SynTest/tests_psi.cfg
 example/thread-pool/test/SynTest/Tests/PsiPlugin/
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-m4/tcl.m4
+iocore/fastio/inkfio/inkfio.conf
 **/*.a
 **/*.so
 **/*.o
 **/*.Po
 **/*.in
 **/Makefile
+.gitignore
+.indent.pro
+aclocal.m4
+m4/
+autom4te.cache/
+build-aux/
+configure
+tags
+libtool
+config.log
+config.status
+configure
+configure.ac

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=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/Diags.cc Wed Feb  3 19:34:48 2010
@@ -328,6 +328,10 @@
     }
   }
 
+#if (HOST_OS != freebsd)
+  unlock();
+#endif
+
   if (config.outputs[diags_level].to_syslog) {
     int priority;
     char syslog_buffer[2048];
@@ -366,7 +370,9 @@
     ink_vsnprintf(syslog_buffer, sizeof(syslog_buffer) - 1, format_buf, ap);
     syslog(priority, "%s", syslog_buffer);
   }
+#if (HOST_OS == freebsd)
   unlock();
+#endif
 }
 
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ControlMatcher.cc Wed Feb  3 19:34:48 2010
@@ -591,25 +591,15 @@
   config_file_var = xstrdup(file_var);
   config_file_path[0] = '\0';
 
-#ifdef IDC
-  // With IDC enabled, for the [idc_control] ControlMatcher,
-  // file_var is a file name instead of a config variable.
-  if (!strncmp(name, "[idc_control]", 13)) {
-    strncat(config_file_path, file_var, sizeof(config_file_path) - strlen(config_file_path) - 1);
-  } else {
-#endif
-    REC_ReadConfigStringAlloc(config_file, config_file_var);
+  REC_ReadConfigStringAlloc(config_file, config_file_var);
 
-    if (!(flags & DONT_BUILD_TABLE)) {
-      ink_release_assert(config_file != NULL);
-      ink_strncpy(config_file_path, system_config_directory, sizeof(config_file_path));
-      strncat(config_file_path, DIR_SEP, sizeof(config_file_path) - strlen(config_file_path) - 1);
-      strncat(config_file_path, config_file, sizeof(config_file_path) - strlen(config_file_path) - 1);
-      xfree(config_file);
-    }
-#ifdef IDC
+  if (!(flags & DONT_BUILD_TABLE)) {
+    ink_release_assert(config_file != NULL);
+    ink_strncpy(config_file_path, system_config_directory, sizeof(config_file_path));
+    strncat(config_file_path, DIR_SEP, sizeof(config_file_path) - strlen(config_file_path) - 1);
+    strncat(config_file_path, config_file, sizeof(config_file_path) - strlen(config_file_path) - 1);
+    xfree(config_file);
   }
-#endif
 
   reMatch = NULL;
   hostMatch = NULL;
@@ -920,12 +910,3 @@
 template class HostRegexMatcher<CongestionControlRecord, CongestionControlRule>;
 template class RegexMatcher<CongestionControlRecord, CongestionControlRule>;
 template class IpMatcher<CongestionControlRecord, CongestionControlRule>;
-
-#ifdef IDC
-#include "IDCControlMatcher.h"
-template class ControlMatcher<IDCControlRecord, IDCControlResult>;
-template class HostMatcher<IDCControlRecord, IDCControlResult>;
-template class HostRegexMatcher<IDCControlRecord, IDCControlResult>;
-template class RegexMatcher<IDCControlRecord, IDCControlResult>;
-template class IpMatcher<IDCControlRecord, IDCControlResult>;
-#endif

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Main.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Main.cc Wed Feb  3 19:34:48 2010
@@ -307,8 +307,9 @@
 int n_argument_descriptions = SIZE(argument_descriptions);
 
 
+#define set_rlimit(name,max_it,ulim_it) max_out_limit(#name, name, max_it, ulim_it)
 static rlim_t
-max_out_limit(int which, bool max_it = true, bool unlim_it = true)
+max_out_limit(char *name, int which, bool max_it = true, bool unlim_it = true)
 {
   struct rlimit rl;
 
@@ -340,7 +341,7 @@
     }
   }
   ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
-
+  //syslog(LOG_NOTICE, "NOTE: %s(%d):cur(%d),max(%d)", name, which, (int)rl.rlim_cur, (int)rl.rlim_max);
   return rl.rlim_cur;
 }
 
@@ -362,7 +363,7 @@
   //
   // Delimit file Descriptors
   //
-  fds_limit = max_out_limit(RLIMIT_NOFILE, true, false);
+  fds_limit = set_rlimit(RLIMIT_NOFILE, true, false);
 }
 
 static void
@@ -1201,14 +1202,15 @@
       lim.rlim_cur = (lim.rlim_max = (rlim_t) fds_throttle);
       if (!setrlimit(RLIMIT_NOFILE, &lim) && !getrlimit(RLIMIT_NOFILE, &lim)) {
         fds_limit = (int) lim.rlim_cur;
+	syslog(LOG_NOTICE, "NOTE: RLIMIT_NOFILE(%d):cur(%d),max(%d)",RLIMIT_NOFILE, (int)lim.rlim_cur, (int)lim.rlim_max);
       }
     }
   }
 
-  max_out_limit(RLIMIT_STACK);
-  max_out_limit(RLIMIT_DATA);
-  max_out_limit(RLIMIT_FSIZE, true, false);
-  max_out_limit(RLIMIT_RSS);
+  set_rlimit(RLIMIT_STACK,true,true);
+  set_rlimit(RLIMIT_DATA,true,true);
+  set_rlimit(RLIMIT_FSIZE, true, false);
+  set_rlimit(RLIMIT_RSS,true,true);
 
 #endif  // linux check
 }

Modified: incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivate.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivate.h?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivate.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivate.h Wed Feb  3 19:34:48 2010
@@ -90,11 +90,7 @@
   inkapi int INKHttpTxnCntl(INKHttpTxn txnp, INKHttpCntlType cntl, void *data);
 
 /* Protocols APIs */
-#ifndef IDC
   inkapi void INKVConnCacheHttpInfoSet(INKVConn connp, INKCacheHttpInfo infop);
-#else
-  inkapi INKReturnCode INKVConnCacheHttpInfoSet(INKVConn connp, INKCacheHttpInfo infop);
-#endif
 
 /* NetVC API. Experimental, developed for RAFT. No longer used. */
   inkapi void INKVConnInactivityTimeoutSet(INKVConn connp, int timeout);
@@ -107,75 +103,6 @@
   inkapi int INKICPCachedReqGet(INKCont contp, INKMBuffer * bufp, INKMLoc * obj);
   inkapi int INKICPCachedRespGet(INKCont contp, INKMBuffer * bufp, INKMLoc * obj);
 
-#ifdef IDC
-// for the base_select_flag in HttpAltInfo
-// Corresponding to enum BaseSelectFlags_t in HttpTransactCache.h
-  enum ApiBaseSelectFlags
-  {
-    INK_API_BASE_SELECT_DONE = 0x0001,
-    INK_API_BASE_SELECT_REPLACE = 0x0002
-  };
-
-  inkapi INKReturnCode INKHttpAltInfoBaseSelectFlagSet(INKHttpAltInfo infop, int flag);
-  inkapi INKReturnCode INKCacheKeyBaseTxnSet(INKCacheKey key, INKHttpTxn txnp);
-  inkapi int INKAtomicCAS(INK32 * ptr, INK32 old_value, INK32 new_value);
-  inkapi int INKAtomicCAS64(INK64 * ptr, INK64 old_value, INK64 new_value);
-  inkapi time_t INKHRTimeToSecond(INK64 hrtime);
-  inkapi int INKHttpTxnIdGet(INKHttpTxn txnp, INKU64 * id);
-
-/****************************************************************************
- * Api for writing HTTP objects directly into the cache.
- ***************************************************************************/
-  inkapi INKReturnCode INKCacheHttpInfoCreate(INKCacheHttpInfo * new_info);
-  inkapi INKReturnCode INKCacheHttpInfoClear(INKCacheHttpInfo infop);
-  inkapi INKReturnCode INKCacheHttpInfoReqSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
-  inkapi INKReturnCode INKCacheHttpInfoRespSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
-  inkapi INKReturnCode INKCacheHttpInfoReqSentTimeSet(INKCacheHttpInfo infop, time_t t);
-  inkapi INKReturnCode INKCacheHttpInfoRespRecvTimeSet(INKCacheHttpInfo infop, time_t t);
-  inkapi INKReturnCode INKCacheHttpInfoReqSentTimeGet(INKCacheHttpInfo infop, time_t * t);
-  inkapi INKReturnCode INKCacheHttpInfoRespRecvTimeGet(INKCacheHttpInfo infop, time_t * t);
-
-  inkapi INKReturnCode INKVConnCacheHttpInfoGet(INKVConn connp, INKCacheHttpInfo * infop_dest);
-
-  inkapi INKReturnCode INKCacheKeyURLSet(INKCacheKey key, INKMBuffer bufp, INKMLoc obj);
-  inkapi INKReturnCode INKCacheKeyReqSet(INKCacheKey key, INKMBuffer bufp, INKMLoc obj);
-  inkapi INKReturnCode INKCacheKeyInfoSet(INKCacheKey key, INKCacheHttpInfo old_infop);
-
-// added for BPMgmt plugin
-  typedef void *INKIDCControlMatcher;
-  typedef void *INKIDCControlResult;
-  typedef void *INKIDCRequestData;
-  typedef void *INKMD5;
-  inkapi INKIDCControlMatcher INKIDCControlMatcherCreate(const char *file_var, const char *name, void *tags);
-  inkapi INKIDCControlResult INKIDCControlResultCreate();
-  inkapi INKIDCRequestData INKIDCRequestDataCreate(INKMBuffer url_bufp, INKMLoc url_offset);
-  inkapi void INKIDCControlResultDestroy(INKIDCControlResult result);
-  inkapi void INKIDCRequestDataDestroy(INKIDCRequestData rdata);
-  inkapi void INKIDCControlGet(INKIDCControlMatcher matcher, INKIDCRequestData rdata, INKIDCControlResult result);
-  inkapi int INKIsIDCEligible(INKIDCControlResult result);
-  inkapi void INKMD5Create(char *buffer, int length, INKU64 * md5);
-
-  typedef enum
-  {
-    INK_CONSUMER_CACHE,
-    INK_CONSUMER_CLIENT
-  } INKConsumerType;
-  inkapi void INKConsumersOfTransformSetup(INKHttpTxn txnp, INKConsumerType type, int skip, int write);
-
-
-/* Alarm */
-  typedef enum
-  {
-    INK_SIGNAL_IDC_BPG_CONFIG_NOT_FOUND = 300,
-    INK_SIGNAL_IDC_BPG_WENT_DOWN = 301
-  } INKIDCAlarmType;
-
-  inkapi int INKIDCSignalWarning(INKIDCAlarmType code, char *msg);
-
-//inkapi int INKMD5Compare(INKMD5 md51, INKMD5 md52);
-// added for BPMgmt Plugin ends
-#endif
-
 #ifdef __cplusplus
 }
 #endif                          /* __cplusplus */

Modified: incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateFrozen.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateFrozen.h?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateFrozen.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateFrozen.h Wed Feb  3 19:34:48 2010
@@ -183,29 +183,11 @@
 
 /* =====  CacheHttpInfo =====  */
 
-#ifdef IDC
-  inkapi INKReturnCode INKCacheHttpInfoCopy(INKCacheHttpInfo infop_src, INKCacheHttpInfo * infop_dest);
-#else
   inkapi INKCacheHttpInfo INKCacheHttpInfoCopy(INKCacheHttpInfo * infop);
-#endif
-
-#ifdef IDC
-  inkapi INKReturnCode INKCacheHttpInfoReqGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
-#else
   inkapi void INKCacheHttpInfoReqGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * offset);
-#endif
-
-#ifdef IDC
-  inkapi INKReturnCode INKCacheHttpInfoRespGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
-#else
   inkapi void INKCacheHttpInfoRespGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * offset);
-#endif
-
-#ifdef IDC
   inkapi INKReturnCode INKCacheHttpInfoDestroy(INKCacheHttpInfo infop);
-#else
-  inkapi void INKCacheHttpInfoDestroy(INKCacheHttpInfo * infop);
-#endif
+
 
 /* =====  ICP =====  */
   inkapi void INKHttpIcpDynamicSet(int value);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/README
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/README?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/README (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/README Wed Feb  3 19:34:48 2010
@@ -1,8 +1,8 @@
 This directory contains customizable error page templates for the
-Inktomi Traffic Server.
+Apache Traffic Server.
 
 You can edit the files in this directory to customized HTML error
-response pages.  The HTML bodies can include Inktomi logging format
+response pages.  The HTML bodies can include ATS logging format
 fields, which will be replaced by the current values before the pages
 are served to the user.
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config Wed Feb  3 19:34:48 2010
@@ -16,8 +16,8 @@
 #
 # Example: 128MB cache file(/usr/local/trafficserver/cache/cache.db)
 #
-/usr/local/trafficserver/cache 134217728
-#. 536870912
+# /usr/local/trafficserver/cache 134217728
+./var/trafficserver 134217728
 #. 536870912
 #
 #

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpClientSession.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpClientSession.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpClientSession.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpClientSession.cc Wed Feb  3 19:34:48 2010
@@ -163,9 +163,6 @@
 
   transact_count++;
   Debug("http_cs", "[%lld] Starting transaction %d using sm [%lld]", con_id, transact_count, current_reader->sm_id);
-#ifdef IDC
-  Debug("pe_ms", "[%lld] sm starting", current_reader->sm_id);
-#endif
 
   current_reader->attach_client_session(this, sm_reader);
 }
@@ -219,9 +216,6 @@
 #endif
 
   Debug("http_cs", "[%lld] session born, netvc %p", con_id, new_vc);
-#ifdef IDC
-  Debug("pe_ms", "[%lld] session born, netvc %p", con_id, new_vc);
-#endif
 
   read_buffer = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
   sm_reader = read_buffer->alloc_reader();

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.cc Wed Feb  3 19:34:48 2010
@@ -406,13 +406,6 @@
     return ("PROXY_DRAIN_REQUEST_BODY");
 #endif /* PROXY_DRAIN */
 
-#ifdef IDC
-  case HttpTransact::HTTP_API_BEFORE_SERVE_FROM_CACHE:
-    return ("API_BEFORE_SERVE_FROM_CACHE");
-
-  case HttpTransact::HTTP_API_BEFORE_SERVE_FROM_SERVER:
-    return ("API_BEFORE_SERVE_FROM_SERVER");
-#endif
   //case HttpTransact::AUTH_LOOKUP:
   //  return ("AUTH_LOOKUP");
   case HttpTransact::SEND_QUERY_TO_INCOMING_ROUTER:
@@ -522,18 +515,6 @@
     return "INK_HTTP_READ_REQUEST_PRE_REMAP_HOOK";
   case INK_HTTP_LAST_HOOK:
     return "INK_HTTP_LAST_HOOK";
-#ifdef IDC
-  case INK_HTTP_BASE_LOOKUP_COMPLETE_HOOK:
-    return "INK_HTTP_BASE_LOOKUP_COMPLETE_HOOK";
-  case INK_HTTP_BASE_SELECT_ALT_0_HOOK:
-    return "INK_HTTP_BASE_SELECT_ALT_0_HOOK";
-  case INK_HTTP_BASE_SELECT_ALT_1_HOOK:
-    return "INK_HTTP_BASE_SELECT_ALT_1_HOOK";
-  case INK_HTTP_BEFORE_SERVE_FROM_CACHE_HOOK:
-    return "INK_HTTP_BEFORE_SERVE_FROM_CACHE_HOOK";
-  case INK_HTTP_BEFORE_SERVE_FROM_SERVER_HOOK:
-    return "INK_HTTP_BEFORE_SERVE_FROM_SERVER_HOOK";
-#endif
   }
 
   return "unknown hook";

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc Wed Feb  3 19:34:48 2010
@@ -3908,13 +3908,6 @@
     Debug("http_seq", "[HttpTransact::HandleResponse] Response not valid");
   } else {
     Debug("http_seq", "[HttpTransact::HandleResponse] Response valid");
-#ifdef IDC
-    if (diags->on("pe_ms")) {
-      Debug("pe_ms", "[%lld] Inc. resp. code: %d content-len: %d",
-            s->state_machine_id, s->hdr_info.server_response.status_get(),
-            s->hdr_info.server_response.get_content_length());
-    }
-#endif
     initialize_state_variables_from_response(s, &s->hdr_info.server_response);
   }
 
@@ -5305,29 +5298,6 @@
   }
   // all other responses (not 304, 412, 416) are handled here
   else {
-#ifdef IDC
-    // If the next_action is SERVE_FROM_CACHE or SERVER_READ,
-    // then TS will go to another state HTTP_API_BEFORE_SERVE_FROM_...
-    // to invoke plugins that hook at the corresponding hooks.
-    // After plugins finish their works, TS will continue the
-    // regular control flow and processing by going to
-    // AfterApiCalloutBeforeServe_hcoofsr() which essentially
-    // duplicates the processing of the rest of this function.
-    switch (s->next_action) {
-    case SERVE_FROM_CACHE:
-      s->saved_ptr_value1 = (void *) base_response;
-      s->saved_int_value1 = (int) client_response_code;
-      TRANSACT_RETURN(HTTP_API_BEFORE_SERVE_FROM_CACHE, HttpTransact::AfterApiCalloutBeforeServe_hcoofsr);
-      return;
-    case SERVER_READ:
-      s->saved_ptr_value1 = (void *) base_response;
-      s->saved_int_value1 = (int) client_response_code;
-      TRANSACT_RETURN(HTTP_API_BEFORE_SERVE_FROM_SERVER, HttpTransact::AfterApiCalloutBeforeServe_hcoofsr);
-      return;
-    default:
-      break;
-    }
-#endif
     if (((s->next_action == SERVE_FROM_CACHE) ||
          (s->next_action == SERVER_READ)) && s->state_machine->do_transform_open()) {
       set_header_for_transform(s, base_response);
@@ -5339,34 +5309,6 @@
   return;
 }
 
-#ifdef IDC
-void
-HttpTransact::AfterApiCalloutBeforeServe_hcoofsr(State * s)
-{
-  HTTPHdr *base_response = (HTTPHdr *) s->saved_ptr_value1;
-  HTTPStatus client_response_code = (HTTPStatus) s->saved_int_value1;
-
-  switch (s->next_action) {
-  case HTTP_API_BEFORE_SERVE_FROM_CACHE:
-    s->next_action = SERVE_FROM_CACHE;
-    break;
-  case HTTP_API_BEFORE_SERVE_FROM_SERVER:
-    s->next_action = SERVER_READ;
-    break;
-  default:
-    ink_assert(!"should be BEFORE_SERVE_FROM_...");
-    break;
-  }
-  if (((s->next_action == SERVE_FROM_CACHE) ||
-       (s->next_action == SERVER_READ)) && s->state_machine->do_transform_open()) {
-    set_header_for_transform(s, base_response);
-  } else {
-    build_response(s, base_response, &s->hdr_info.client_response, s->client_info.http_version, client_response_code);
-  }
-  return;
-}
-#endif
-
 
 ///////////////////////////////////////////////////////////////////////////////
 // Name       : handle_no_cache_operation_on_forward_server_response
@@ -5448,28 +5390,6 @@
     break;
   }
 
-#ifdef IDC
-  // If the next_action is SERVE_FROM_CACHE or SERVER_READ,
-  // then TS will go to another state HTTP_API_BEFORE_SERVE_FROM_...
-  // to invoke plugins that hook at the corresponding hooks.
-  // After plugins finish their works, TS will continue the
-  // regular control flow and processing by going to
-  // AfterApiCalloutBeforeServe_hcoofsr() which essentially
-  // duplicates the processing of the rest of this function.
-  switch (s->next_action) {
-  case SERVE_FROM_CACHE:
-    s->saved_ptr_value1 = (void *) warn_text;
-    TRANSACT_RETURN(HTTP_API_BEFORE_SERVE_FROM_CACHE, HttpTransact::AfterApiCalloutBeforeServe_hncoofsr);
-    return;
-  case SERVER_READ:
-    s->saved_ptr_value1 = (void *) warn_text;
-    TRANSACT_RETURN(HTTP_API_BEFORE_SERVE_FROM_SERVER, HttpTransact::AfterApiCalloutBeforeServe_hncoofsr);
-    return;
-  default:
-    break;
-  }
-#endif
-
   HTTPHdr *to_warn;
   if (s->next_action == SERVER_READ && s->state_machine->do_transform_open()) {
     set_header_for_transform(s, &s->hdr_info.server_response);
@@ -5487,39 +5407,6 @@
   return;
 }
 
-#ifdef IDC
-void
-HttpTransact::AfterApiCalloutBeforeServe_hncoofsr(State * s)
-{
-  char *warn_text = (char *) s->saved_ptr_value1;
-  HTTPHdr *to_warn;
-  switch (s->next_action) {
-  case HTTP_API_BEFORE_SERVE_FROM_CACHE:
-    s->next_action = SERVE_FROM_CACHE;
-    break;
-  case HTTP_API_BEFORE_SERVE_FROM_SERVER:
-    s->next_action = SERVER_READ;
-    break;
-  default:
-    ink_assert(!"should be BEFORE_SERVE_FROM_...");
-    break;
-  }
-  if (s->next_action == SERVER_READ && s->state_machine->do_transform_open()) {
-    set_header_for_transform(s, &s->hdr_info.server_response);
-    to_warn = &s->hdr_info.transform_response;
-  } else {
-    build_response(s, &s->hdr_info.server_response, &s->hdr_info.client_response, s->client_info.http_version);
-    to_warn = &s->hdr_info.server_response;
-  }
-
-  if (warn_text) {
-    HttpTransactHeaders::insert_warning_header(s->http_config_param,
-                                               to_warn, HTTP_WARNING_CODE_MISC_WARNING, warn_text, strlen(warn_text));
-  }
-
-  return;
-}
-#endif
 
 void
 HttpTransact::merge_and_update_headers_for_cache_update(State * s)

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=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransactCache.cc Wed Feb  3 19:34:48 2010
@@ -23,9 +23,6 @@
 
 #include "ink_platform.h"
 
-#ifdef IDC
-#include "HttpSM.h"
-#endif
 #include "HttpTransact.h"
 #include "HttpTransactHeaders.h"
 #include "HttpTransactCache.h"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessHttp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessHttp.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessHttp.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogAccessHttp.cc Wed Feb  3 19:34:48 2010
@@ -111,9 +111,6 @@
       LogUtils::remove_content_type_attributes(m_proxy_resp_content_type_str, &m_proxy_resp_content_type_len);
     } else {
       // If Content-Type field is missing, check for @Content-Type
-      // IDC Header Compression will remove the Content-Type field after
-      // header compression is successful. In its place it adds @Content-Type
-      // for loggging purposes.
       MIMEField *field = m_proxy_response->field_find(HIDDEN_CONTENT_TYPE, HIDDEN_CONTENT_TYPE_LEN);
       if (field) {
         m_proxy_resp_content_type_str = (char *) field->value_get(&m_proxy_resp_content_type_len);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.h?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Alarms.h Wed Feb  3 19:34:48 2010
@@ -82,11 +82,6 @@
 #define MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA    101
 #define MGMT_ALARM_WDA_XF_ENGINE_DOWN            102
 #define MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS  103
-// IDC alarms
-#define MGMT_ALARM_IDC_START				     300
-#define MGMT_ALARM_IDC_END						 399
-#define MGMT_ALARM_IDC_BPG_CONFIG_NOT_FOUND	     (MGMT_ALARM_IDC_START + 0)
-#define MGMT_ALARM_IDC_BPG_WENT_DOWN		     (MGMT_ALARM_IDC_START + 1)
 
 #define MGMT_ALARM_SAC_SERVER_DOWN		400
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.h?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/BaseManager.h Wed Feb  3 19:34:48 2010
@@ -104,11 +104,6 @@
 
 #define INK_MGMT_SIGNAL_ACC_ALARMS_START  200
 #define INK_MGMT_SIGNAL_ACC_ALARMS_END    299
-// IDC plugin signal
-#define INK_MGMT_SIGNAL_IDC_START					300
-#define INK_MGMT_SIGNAL_IDC_END						399
-#define INK_MGMT_SIGNAL_IDC_BPG_CONFIG_NOT_FOUND	(INK_MGMT_SIGNAL_IDC_START + 0)
-#define INK_MGMT_SIGNAL_IDC_BPG_WENT_DOWN			(INK_MGMT_SIGNAL_IDC_START + 1)
 
 #define INK_MGMT_SIGNAL_SAC_SERVER_DOWN			400
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc Wed Feb  3 19:34:48 2010
@@ -828,17 +828,9 @@
     alarm_keeper->signalAlarm(MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS, data_raw);
     break;
     // Wireless plugin signal - end
-    // IDC plugin signal - begin
-  case INK_MGMT_SIGNAL_IDC_BPG_CONFIG_NOT_FOUND:
-    alarm_keeper->signalAlarm(MGMT_ALARM_IDC_BPG_CONFIG_NOT_FOUND, data_raw);
-    break;
-  case INK_MGMT_SIGNAL_IDC_BPG_WENT_DOWN:
-    alarm_keeper->signalAlarm(MGMT_ALARM_IDC_BPG_WENT_DOWN, data_raw);
-    break;
   case INK_MGMT_SIGNAL_SAC_SERVER_DOWN:
     alarm_keeper->signalAlarm(MGMT_ALARM_SAC_SERVER_DOWN, data_raw);
     break;
-    // IDC plugin signal - end
 
   default:
     break;

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=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc Wed Feb  3 19:34:48 2010
@@ -75,6 +75,7 @@
 #include "tools/SysAPI.h"
 #endif
 
+#define FD_THROTTLE_HEADROOM (128 + 64) // TODO: consolidate with THROTTLE_FD_HEADROOM
 
 #if (HOST_OS != linux) && (HOST_OS != darwin) && (HOST_OS != freebsd) && (HOST_OS != solaris)
 extern "C"
@@ -124,6 +125,8 @@
 char *ts_base_dir = ".";
 char *recs_conf = "records.config";
 
+int fds_limit;
+
 typedef void (*PFV) (int);
 #if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
 void SignalHandler(int sig, siginfo_t * t, void *f);
@@ -408,6 +411,66 @@
   }
 }
 
+#define set_rlimit(name,max_it,ulim_it) max_out_limit(#name, name, max_it, ulim_it)
+static rlim_t
+max_out_limit(char *name, int which, bool max_it = true, bool unlim_it = true)
+{
+  struct rlimit rl;
+
+#if (HOST_OS == linux)
+#  define MAGIC_CAST(x) (enum __rlimit_resource)(x)
+#else
+#  define MAGIC_CAST(x) x
+#endif
+
+  if (max_it) {
+    ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
+    if (rl.rlim_cur != rl.rlim_max) {
+      rl.rlim_cur = rl.rlim_max;
+      ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
+    }
+  }
+
+  if (unlim_it) {
+    ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
+    if (rl.rlim_cur != RLIM_INFINITY) {
+      rl.rlim_cur = (rl.rlim_max = RLIM_INFINITY);
+      ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
+    }
+  }
+  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);
+#endif
+  return rl.rlim_cur;
+}
+
+
+static void
+set_process_limits(int fds_throttle)
+{
+  struct rlimit lim;
+
+  // Set needed rlimits (root)
+  set_rlimit(RLIMIT_NOFILE, true, false);
+  set_rlimit(RLIMIT_STACK, true, true);
+  set_rlimit(RLIMIT_DATA, true, true);
+  set_rlimit(RLIMIT_FSIZE, true, false);
+  set_rlimit(RLIMIT_RSS, true, true);
+
+  if (!getrlimit(RLIMIT_NOFILE, &lim)) {
+    if (fds_throttle > (int) (lim.rlim_cur + FD_THROTTLE_HEADROOM)) {
+      lim.rlim_cur = (lim.rlim_max = (rlim_t) fds_throttle);
+      if (!setrlimit(RLIMIT_NOFILE, &lim) && !getrlimit(RLIMIT_NOFILE, &lim)) {
+        fds_limit = (int) lim.rlim_cur;
+#ifdef MGMT_USE_SYSLOG
+	syslog(LOG_NOTICE, "NOTE: RLIMIT_NOFILE(%d):cur(%d),max(%d)",RLIMIT_NOFILE, (int)lim.rlim_cur, (int)lim.rlim_max);
+#endif
+      }
+    }
+  }
+
+}
 
 int
 main(int argc, char **argv)
@@ -433,7 +496,7 @@
   bool log_to_syslog = true;
   char userToRunAs[80];
   char config_internal_dir[PATH_MAX];
-
+  int  fds_throttle = -1;
   time_t ticker;
   ink_thread webThrId;
 
@@ -612,7 +675,9 @@
   init_dirs(false);// setup directories
 
   // Get the config info we need while we are still root
-  extractConfigInfo(mgmt_path, recs_conf, userToRunAs);
+  extractConfigInfo(mgmt_path, recs_conf, userToRunAs, &fds_throttle);
+
+  set_process_limits(fds_throttle); // as root
 
   runAsUser(userToRunAs);
 
@@ -1461,37 +1526,38 @@
 //
 //
 void
-extractConfigInfo(char *mgmt_path, char *recs_conf, char *userName)
+extractConfigInfo(char *mgmt_path, char *recs_conf, char *userName, int *fds_throttle)
 {
   char file[1024];
   bool useridFound = false;
+  bool throttleFound = false;
 
   /* Figure out what user we should run as */
   if (mgmt_path && recs_conf) {
     FILE *fin;
-
     ink_snprintf(file, sizeof(file), "%s%s%s.shadow", mgmt_path, DIR_SEP, recs_conf);
     if (!(fin = fopen(file, "r"))) {
-
       ink_snprintf(file, sizeof(file), "%s%s%s", mgmt_path, DIR_SEP, recs_conf);
       if (!(fin = fopen(file, "r"))) {
         mgmt_elog(stderr, "[extractConfigInfo] Unable to open config file(%s)\n", file);
         _exit(1);
       }
     }
-
-    while ((!useridFound) && fgets(file, 1024, fin)) {
-
+    // Get 'user id' and 'network connections throttle limit'
+    while (((!useridFound) || (!throttleFound)) && fgets(file, 1024, fin)) {
       if (strstr(file, "CONFIG proxy.config.admin.user_id STRING")) {
         //coverity[secure_coding]
         if ((sscanf(file, "CONFIG proxy.config.admin.user_id STRING %1023s\n", userName) == 1) &&
             strcmp(userName, "NULL") != 0) {
           useridFound = true;
         }
+      } else if (strstr(file, "CONFIG proxy.config.net.connections_throttle INT")) {
+        if ((sscanf(file, "CONFIG proxy.config.net.connections_throttle INT %d\n", fds_throttle) == 1)) {
+          throttleFound = true;
+        }
       }
 
     }
-
     fclose(fin);
   } else {
     mgmt_elog(stderr, "[extractConfigInfo] Fatal Error: unable to access records file\n");

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h?rev=906199&r1=906198&r2=906199&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h Wed Feb  3 19:34:48 2010
@@ -43,7 +43,7 @@
 void MgmtShutdown(int status);
 void fileUpdated(char *fname);
 void runAsUser(char *userName);
-void extractConfigInfo(char *mgmt_path, char *recs_conf, char *userName);
+void extractConfigInfo(char *mgmt_path, char *recs_conf, char *userName, int *fds_throttle);
 void printUsage(void);
 
 extern MgmtPing *icmp_ping;