trafficserver git commit: TS-3224: fix problem of ts_lua coredump

2014-12-10 Thread kichan 
Repository: trafficserver
Updated Branches:
  refs/heads/master 156b7be9c - 60c97c6f0


TS-3224: fix problem of ts_lua coredump


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/60c97c6f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/60c97c6f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/60c97c6f

Branch: refs/heads/master
Commit: 60c97c6f04538a1cd176f412dfc2622b9008936e
Parents: 156b7be
Author: Kit Chan kic...@apache.org
Authored: Wed Dec 10 06:17:50 2014 -0800
Committer: Kit Chan kic...@apache.org
Committed: Wed Dec 10 06:17:50 2014 -0800

--
 CHANGES  |  2 ++
 plugins/experimental/ts_lua/ts_lua_cached_response.c |  8 ++--
 plugins/experimental/ts_lua/ts_lua_client_request.c  | 14 +++---
 plugins/experimental/ts_lua/ts_lua_client_response.c |  8 ++--
 plugins/experimental/ts_lua/ts_lua_server_request.c  |  6 +-
 plugins/experimental/ts_lua/ts_lua_server_response.c |  9 +++--
 6 files changed, 37 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/CHANGES
--
diff --git a/CHANGES b/CHANGES
index c091270..51f119e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.3.0
 
+  *) [TS-3224] fix ts_lua core dump issue.
+
   *) [TS-3229] Filter unsupported epic metric names.
 
   *) [TS-3230] Remove unused ink_error APIs.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/plugins/experimental/ts_lua/ts_lua_cached_response.c
--
diff --git a/plugins/experimental/ts_lua/ts_lua_cached_response.c 
b/plugins/experimental/ts_lua/ts_lua_cached_response.c
index abc30b7..74935fb 100644
--- a/plugins/experimental/ts_lua/ts_lua_cached_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_cached_response.c
@@ -131,8 +131,12 @@ ts_lua_cached_response_get_version(lua_State * L)
 
   version = TSHttpHdrVersionGet(http_ctx-cached_response_bufp, 
http_ctx-cached_response_hdrp);
 
-  n = snprintf(buf, sizeof(buf) - 1, %d.%d, TS_HTTP_MAJOR(version), 
TS_HTTP_MINOR(version));
-  lua_pushlstring(L, buf, n);
+  n = snprintf(buf, sizeof(buf), %d.%d, TS_HTTP_MAJOR(version), 
TS_HTTP_MINOR(version));
+  if(n = sizeof(buf)) {
+lua_pushlstring(L, buf, sizeof(buf) - 1);
+  } else {
+lua_pushlstring(L, buf, n);
+  }
 
   return 1;
 }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/plugins/experimental/ts_lua/ts_lua_client_request.c
--
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c 
b/plugins/experimental/ts_lua/ts_lua_client_request.c
index 9d6cd26..14a5353 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
@@ -499,7 +499,11 @@ ts_lua_client_request_get_uri(lua_State * L)
 
   uri_len = snprintf(uri, TS_LUA_MAX_URL_LENGTH, /%.*s, path_len, path);
 
-  lua_pushlstring(L, uri, uri_len);
+  if(uri_len = TS_LUA_MAX_URL_LENGTH) {
+lua_pushlstring(L, uri, TS_LUA_MAX_URL_LENGTH - 1);
+  } else {
+lua_pushlstring(L, uri, uri_len);
+  }
 
   return 1;
 }
@@ -762,8 +766,12 @@ ts_lua_client_request_get_version(lua_State * L)
 
   version = TSHttpHdrVersionGet(http_ctx-client_request_bufp, 
http_ctx-client_request_hdrp);
 
-  n = snprintf(buf, sizeof(buf) - 1, %d.%d, TS_HTTP_MAJOR(version), 
TS_HTTP_MINOR(version));
-  lua_pushlstring(L, buf, n);
+  n = snprintf(buf, sizeof(buf), %d.%d, TS_HTTP_MAJOR(version), 
TS_HTTP_MINOR(version));
+  if (n = sizeof(buf)) {
+lua_pushlstring(L, buf, sizeof(buf) - 1);
+  } else {
+lua_pushlstring(L, buf, n);
+  }
 
   return 1;
 }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/plugins/experimental/ts_lua/ts_lua_client_response.c
--
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.c 
b/plugins/experimental/ts_lua/ts_lua_client_response.c
index ac98869..9c8030d 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.c
@@ -309,8 +309,12 @@ ts_lua_client_response_get_version(lua_State * L)
 
   version = TSHttpHdrVersionGet(http_ctx-client_response_bufp, 
http_ctx-client_response_hdrp);
 
-  n = snprintf(buf, sizeof(buf) - 1, %d.%d, TS_HTTP_MAJOR(version), 
TS_HTTP_MINOR(version));
-  lua_pushlstring(L, buf, n);
+  n = snprintf(buf, sizeof(buf), %d.%d, TS_HTTP_MAJOR(version), 
TS_HTTP_MINOR(version));
+  if (n = sizeof(buf))

Re: trafficserver git commit: TS-3224: fix problem of ts_lua coredump

2014-12-10 Thread James Peach 

 On Dec 10, 2014, at 6:18 AM, kic...@apache.org wrote:
 
 Repository: trafficserver
 Updated Branches:
  refs/heads/master 156b7be9c - 60c97c6f0
 
 
 TS-3224: fix problem of ts_lua coredump
 
 
 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
 Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/60c97c6f
 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/60c97c6f
 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/60c97c6f
 
 Branch: refs/heads/master
 Commit: 60c97c6f04538a1cd176f412dfc2622b9008936e
 Parents: 156b7be
 Author: Kit Chan kic...@apache.org
 Authored: Wed Dec 10 06:17:50 2014 -0800
 Committer: Kit Chan kic...@apache.org
 Committed: Wed Dec 10 06:17:50 2014 -0800
 
 --
 CHANGES  |  2 ++
 plugins/experimental/ts_lua/ts_lua_cached_response.c |  8 ++--
 plugins/experimental/ts_lua/ts_lua_client_request.c  | 14 +++---
 plugins/experimental/ts_lua/ts_lua_client_response.c |  8 ++--
 plugins/experimental/ts_lua/ts_lua_server_request.c  |  6 +-
 plugins/experimental/ts_lua/ts_lua_server_response.c |  9 +++--
 6 files changed, 37 insertions(+), 10 deletions(-)
 --
 
 
 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/CHANGES
 --
 diff --git a/CHANGES b/CHANGES
 index c091270..51f119e 100644
 --- a/CHANGES
 +++ b/CHANGES
 @@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.3.0
 
 +  *) [TS-3224] fix ts_lua core dump issue.
 +
   *) [TS-3229] Filter unsupported epic metric names.
 
   *) [TS-3230] Remove unused ink_error APIs.
 
 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/plugins/experimental/ts_lua/ts_lua_cached_response.c
 --
 diff --git a/plugins/experimental/ts_lua/ts_lua_cached_response.c 
 b/plugins/experimental/ts_lua/ts_lua_cached_response.c
 index abc30b7..74935fb 100644
 --- a/plugins/experimental/ts_lua/ts_lua_cached_response.c
 +++ b/plugins/experimental/ts_lua/ts_lua_cached_response.c
 @@ -131,8 +131,12 @@ ts_lua_cached_response_get_version(lua_State * L)
 
   version = TSHttpHdrVersionGet(http_ctx-cached_response_bufp, 
 http_ctx-cached_response_hdrp);
 
 -  n = snprintf(buf, sizeof(buf) - 1, %d.%d, TS_HTTP_MAJOR(version), 
 TS_HTTP_MINOR(version));
 -  lua_pushlstring(L, buf, n);
 +  n = snprintf(buf, sizeof(buf), %d.%d, TS_HTTP_MAJOR(version), 
 TS_HTTP_MINOR(version));
 +  if(n = sizeof(buf)) {
 +lua_pushlstring(L, buf, sizeof(buf) - 1);
 +  } else {
 +lua_pushlstring(L, buf, n);
 +  }

Maybe a common function, instead of 4 copies of this code?

 
   return 1;
 }
 
 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/plugins/experimental/ts_lua/ts_lua_client_request.c
 --
 diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c 
 b/plugins/experimental/ts_lua/ts_lua_client_request.c
 index 9d6cd26..14a5353 100644
 --- a/plugins/experimental/ts_lua/ts_lua_client_request.c
 +++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
 @@ -499,7 +499,11 @@ ts_lua_client_request_get_uri(lua_State * L)
 
   uri_len = snprintf(uri, TS_LUA_MAX_URL_LENGTH, /%.*s, path_len, path);
 
 -  lua_pushlstring(L, uri, uri_len);
 +  if(uri_len = TS_LUA_MAX_URL_LENGTH) {
 +lua_pushlstring(L, uri, TS_LUA_MAX_URL_LENGTH - 1);
 +  } else {
 +lua_pushlstring(L, uri, uri_len);
 +  }
 
   return 1;
 }
 @@ -762,8 +766,12 @@ ts_lua_client_request_get_version(lua_State * L)
 
   version = TSHttpHdrVersionGet(http_ctx-client_request_bufp, 
 http_ctx-client_request_hdrp);
 
 -  n = snprintf(buf, sizeof(buf) - 1, %d.%d, TS_HTTP_MAJOR(version), 
 TS_HTTP_MINOR(version));
 -  lua_pushlstring(L, buf, n);
 +  n = snprintf(buf, sizeof(buf), %d.%d, TS_HTTP_MAJOR(version), 
 TS_HTTP_MINOR(version));
 +  if (n = sizeof(buf)) {
 +lua_pushlstring(L, buf, sizeof(buf) - 1);
 +  } else {
 +lua_pushlstring(L, buf, n);
 +  }
 
   return 1;
 }
 
 http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60c97c6f/plugins/experimental/ts_lua/ts_lua_client_response.c
 --
 diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.c 
 b/plugins/experimental/ts_lua/ts_lua_client_response.c
 index ac98869..9c8030d 100644
 --- a/plugins/experimental/ts_lua/ts_lua_client_response.c
 +++ b/plugins/experimental/ts_lua/ts_lua_client_response.c
 @@ -309,8 +309,12 @@ ts_lua_client_response_get_version(lua_State * L)
 
   version = TSHttpHdrVersionGet(http_ctx-client_response_bufp, 
 http_ctx-client_response_hdrp);
 
 -  n = snprintf(buf,

trafficserver git commit: TS-1475: fix clang warning

2014-12-10 Thread sorber 
Repository: trafficserver
Updated Branches:
  refs/heads/master 60c97c6f0 - 1f1e2ae15


TS-1475: fix clang warning


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1f1e2ae1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1f1e2ae1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1f1e2ae1

Branch: refs/heads/master
Commit: 1f1e2ae1549ae4568d2e42774f24639d6cb3aadf
Parents: 60c97c6
Author: Phil Sorber sor...@apache.org
Authored: Wed Dec 10 09:23:12 2014 -0700
Committer: Phil Sorber sor...@apache.org
Committed: Wed Dec 10 09:23:12 2014 -0700

--
 proxy/http/HttpTunnel.cc | 3 +--
 proxy/http/HttpTunnel.h  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f1e2ae1/proxy/http/HttpTunnel.cc
--
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index ac89726..ac15a02 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -1222,7 +1222,7 @@ bool HttpTunnel::producer_handler(int event, 
HttpTunnelProducer * p)
   return sm_callback;
 }
 
-bool
+void
 HttpTunnel::consumer_reenable(HttpTunnelConsumer* c)
 {
   HttpTunnelProducer* p = c-producer;
@@ -1274,7 +1274,6 @@ HttpTunnel::consumer_reenable(HttpTunnelConsumer* c)
   p-read_vio-reenable();
 }
   }
-  return p-is_throttled();
 }
 
 //

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f1e2ae1/proxy/http/HttpTunnel.h
--
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index 6c1e21f..3f94d29 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -340,7 +340,7 @@ public:
   void tunnel_run(HttpTunnelProducer * p = NULL);
 
   int main_handler(int event, void *data);
-  bool consumer_reenable(HttpTunnelConsumer* c);
+  void consumer_reenable(HttpTunnelConsumer* c);
   bool consumer_handler(int event, HttpTunnelConsumer * c);
   bool producer_handler(int event, HttpTunnelProducer * p);
   int producer_handler_dechunked(int event, HttpTunnelProducer * p);

[3/3] trafficserver git commit: docs: update focused on architecture documentation

2014-12-10 Thread jpeach 
docs: update focused on architecture documentation


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/aa37d0ab
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/aa37d0ab
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/aa37d0ab

Branch: refs/heads/master
Commit: aa37d0ab553ef2f187c4742544248695701202af
Parents: 1f1e2ae
Author: Jon Sime js...@omniti.com
Authored: Tue Nov 18 12:34:08 2014 -0800
Committer: James Peach jpe...@apache.org
Committed: Wed Dec 10 13:35:40 2014 -0800

--
 doc/admin/cluster-howto.en.rst  |2 +-
 doc/admin/configuring-cache.en.rst  |   94 +-
 doc/arch/cache/cache-api.en.rst |   24 +-
 doc/arch/cache/cache-appendix.en.rst|  143 +-
 doc/arch/cache/cache-arch.en.rst| 1284 +++---
 doc/arch/cache/cache-data-structures.en.rst |  117 +-
 doc/arch/cache/cache.en.rst |   28 +-
 doc/arch/cache/ram-cache.en.rst |  165 ++-
 doc/arch/cache/tier-storage.en.rst  |  165 ++-
 doc/arch/hacking/config-var-impl.en.rst |  222 +--
 doc/arch/hacking/index.en.rst   |   27 +-
 doc/arch/hacking/release-process.en.rst |  132 +-
 doc/arch/index.en.rst   |   35 +-
 doc/glossary.en.rst |   22 +
 .../configuration/records.config.en.rst |6 +-
 15 files changed, 1560 insertions(+), 906 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aa37d0ab/doc/admin/cluster-howto.en.rst
--
diff --git a/doc/admin/cluster-howto.en.rst b/doc/admin/cluster-howto.en.rst
index 1c00616..a34ead0 100644
--- a/doc/admin/cluster-howto.en.rst
+++ b/doc/admin/cluster-howto.en.rst
@@ -140,7 +140,7 @@ cluster, for example::
 127.1.2.5:80
 
 After successfully joining a cluster, all changes of global configurations
-performed on any node in that cluster will take effect on **all** nodes, 
removing
+performed on any node in that cluster will take effect on all nodes, removing
 the need to manually duplicate configuration changes across each node 
individually.
 
 Deleting Nodes from a Cluster

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aa37d0ab/doc/admin/configuring-cache.en.rst
--
diff --git a/doc/admin/configuring-cache.en.rst 
b/doc/admin/configuring-cache.en.rst
index dc009d2..22a31e0 100644
--- a/doc/admin/configuring-cache.en.rst
+++ b/doc/admin/configuring-cache.en.rst
@@ -21,8 +21,8 @@ Configuring the Cache
under the License.
 
 The Traffic Server cache consists of a high-speed object database called
-the *object store* that indexes objects according to URLs and their
-associated headers.
+the :term:`object store` that indexes :term:`cache objects cache object`
+according to URLs and their associated headers.
 
 .. toctree::
:maxdepth: 2
@@ -31,16 +31,16 @@ The Traffic Server Cache
 
 
 The Traffic Server cache consists of a high-speed object database called
-the *object store*. The object store indexes objects according to URLs
-and associated headers. This enables Traffic Server to store, retrieve,
-and serve not only web pages, but also parts of web pages - which
-provides optimum bandwidth savings. Using sophisticated object
-management, the object store can cache alternate versions of the same
-object (versions may differ because of dissimilar language or encoding
-types). It can also efficiently store very small and very large
-documents, thereby minimizing wasted space. When the cache is full,
-Traffic Server removes stale data to ensure the most requested objects
-are kept readily available and fresh.
+the :term:`object store`. The object store indexes
+:term:`cache objects cache object` according to URLs and associated headers.
+This enables Traffic Server to store, retrieve, and serve not only web pages,
+but also parts of web pages - which provides optimum bandwidth savings. Using
+sophisticated object management, the object store can cache
+:term:`alternate` versions of the same object (versions may differ because of
+dissimilar language or encoding types). It can also efficiently store very
+small and very large documents, thereby minimizing wasted space. When the
+cache is full, Traffic Server removes :term:`stale` data to ensure the most
+requested objects are kept readily available and fresh.
 
 Traffic Server is designed to tolerate total disk failures on any of the
 cache disks. If the disk fails completely, then Traffic Server marks the
@@ -50,11 +50,15 @@ fail, then Traffic Server goes into proxy-only mode.
 
 You can perform the

[1/3] trafficserver git commit: docs: update focused on architecture documentation

2014-12-10 Thread jpeach 
Repository: trafficserver
Updated Branches:
  refs/heads/master 1f1e2ae15 - aa37d0ab5


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aa37d0ab/doc/arch/cache/cache-data-structures.en.rst
--
diff --git a/doc/arch/cache/cache-data-structures.en.rst 
b/doc/arch/cache/cache-data-structures.en.rst
index 508c4da..1158051 100644
--- a/doc/arch/cache/cache-data-structures.en.rst
+++ b/doc/arch/cache/cache-data-structures.en.rst
@@ -1,28 +1,31 @@
 .. 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
+   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.
+   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.
+
+.. _cache-data-structures:
 
 Cache Data Structures
-**
+*
 
 .. include:: common.defs
 
 .. cpp:class:: OpenDir
 
-   An open directory entry. It contains all the information of a 
:cpp:class:`Dir` plus additional information from the first :cpp:class:`Doc`.
+   An open directory entry. It contains all the information of a
+   :cpp:class:`Dir` plus additional information from the first 
:cpp:class:`Doc`.
 
 .. cpp:class:: CacheVC
 
@@ -30,15 +33,20 @@ Cache Data Structures
 
 .. cpp:function:: int CacheVC::openReadStartHead(int event, Event* e)
 
-   Do the initial read for a cached object.
+   Performs the initial read for a cached object.
 
 .. cpp:function:: int CacheVC::openReadStartEarliest(int event, Event* e)
 
-   Do the initial read for an alternate of an object.
+   Performs the initial read for an :term:`alternate` of an object.
 
 .. cpp:class:: HttpTunnel
 
-   Data transfer driver. This contains a set of *producers*. Each producer is 
connected to one or more *consumers*. The tunnel handles events and buffers so 
that data moves from producers to consumers. The data, as much as possible, is 
kept in reference counted buffers so that copies are done only when the data is 
modified or for sources (which acquire data from outside |TS|) and sinks (which 
move data to outside |TS|).
+   Data transfer driver. This contains a set of *producers*. Each producer is
+   connected to one or more *consumers*. The tunnel handles events and buffers
+   so that data moves from producers to consumers. The data, as much as
+   possible, is kept in reference counted buffers so that copies are done only
+   when the data is modified or for sources (which acquire data from outside
+   |TS|) and sinks (which move data to outside |TS|).
 
 .. cpp:class:: CacheControlResult
 
@@ -46,13 +54,17 @@ Cache Data Structures
 
 .. cpp:class:: CacheHTTPInfoVector
 
-   Defined in |P-CacheHttp.h|_. This is an array of :cpp:class:`HTTPInfo` 
objects and serves as the respository of information about alternates of an 
object. It is marshaled as part of the metadata for an object in the cache.
+   Defined in |P-CacheHttp.h|_. This is an array of :cpp:class:`HTTPInfo`
+   objects and serves as the respository of information about alternates of an
+   object. It is marshaled as part of the metadata for an object in the cache.
 
 .. cpp:class:: HTTPInfo
 
Defined in |HTTP.h|_.
 
-   This class is a wrapper for :cpp:class:`HTTPCacheAlt`. It provides the 
external API for accessing data in the wrapped class. It contains only a 
pointer (possibly ``NULL``) to an instance of the wrapped class.
+   This class is a wrapper for :cpp:class:`HTTPCacheAlt`. It provides the
+   external API for accessing data in the wrapped class. It contains only a
+   pointer (possibly ``NULL``) to an instance of the wrapped class.
 
 .. cpp:class:: CacheHTTPInfo
 
@@ -62,12 +74,16 @@ Cache Data Structures
 
Defined in |HTTP.h|_.
 
-   This is the metadata for a single alternate for a

[2/3] trafficserver git commit: docs: update focused on architecture documentation

2014-12-10 Thread jpeach 
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aa37d0ab/doc/arch/cache/cache-arch.en.rst
--
diff --git a/doc/arch/cache/cache-arch.en.rst b/doc/arch/cache/cache-arch.en.rst
index 78764d7..fecd0fb 100644
--- a/doc/arch/cache/cache-arch.en.rst
+++ b/doc/arch/cache/cache-arch.en.rst
@@ -23,81 +23,99 @@ Cache Architecture
 Introduction
 
 
-In addition to an HTTP proxy, |ATS| is also an HTTP cache. |TS| can cache any 
octet stream although it currently
-supports only those octet streams delivered by the HTTP protocol. When such a 
stream is cached (along with the HTTP
-protocol headers) it is termed an :term:`object cache object` in the cache. 
Each object is identified by a globally
-unique value called a :term:`cache key`.
-
-The purpose of this document is to describe the basic structure and 
implementation details of the |TS| cache.
-Configuration of the cache will be discussed only to the extent needed to 
understand the internal mechanisms. This
-document will be useful primarily to |TS| developers working on the |TS| 
codebase or plugins for |TS|. It is assumed the
-reader is already familiar with the :ref:`admin-guide` and specifically with 
:ref:`http-proxy-caching` and
-:ref:`configuring-the-cache` along with the associated configuration files and 
values.
-
-Unfortunately the internal terminology is not particularly consistent so this 
document will frequently use terms in
-different ways than they are used in the code in an attempt to create some 
consistency.
+In addition to being an HTTP proxy, |ATS| is also an HTTP cache. |TS| can cache
+any octet stream, although it currently supports only those octet streams
+delivered by the HTTP protocol. When such a stream is cached (along with the
+HTTP protocol headers) it is termed an :term:`object cache object` in the
+cache. Each object is identified by a globally unique value called a
+:term:`cache key`.
+
+The purpose of this document is to describe the basic structure and
+implementation details of the |TS| cache. Configuration of the cache will be
+discussed only to the extent needed to understand the internal mechanisms. This
+document will be useful primarily to |TS| developers working on the |TS|
+codebase or plugins for |TS|. It is assumed the reader is already familiar with
+the :ref:`admin-guide` and specifically with :ref:`http-proxy-caching` and
+:ref:`configuring-the-cache` along with the associated configuration files and
+values.
+
+Unfortunately, the internal terminology is not particularly consistent, so this
+document will frequently use terms in different ways than they are used in the
+code in an attempt to create some consistency.
 
 Cache Layout
 
 
-The following sections describe how persistent cache data is structured. |TS| 
treats its persisent storage an
-undifferentiated collection of bytes, assuming no other structure to it. In 
particular it does not use the file system
-of the host operating system. If a file is used it is used only to mark out 
the set of bytes to be used.
+The following sections describe how persistent cache data is structured. |TS|
+treats its persisent storage as an undifferentiated collection of bytes,
+assuming no other structure to it. In particular, it does not use the file
+system of the host operating system. If a file is used it is used only to mark
+out the set of bytes to be used.
 
 Cache storage
 =
 
-The raw storage for the |TS| cache is configured in :file:`storage.config`. 
Each line in the file defines a :term:`cache
-span` which is treated as a uniform persistent store.
+The raw storage for the |TS| cache is configured in :file:`storage.config`. 
Each
+line in the file defines a :term:`cache span` which is treated as a uniform
+persistent store.
 
 .. figure:: images/cache-spans.png
:align: center
 
Two cache spans
 
-This storage organized in to a set of :term:`cache volume`\ s which are 
defined in :file:`volume.config` for the
-purposes of the administrator. These are the units that used for all other 
administator level configuration.
+This storage organized into a set of :term:`cache volumes cache volume` which
+are defined in :file:`volume.config`. These are the units that are used for all
+other administator level configuration.
 
-Cache volumes can be defined by a percentage of the total storage or an 
absolute amount of storage. By default each
-cache volume is spread across all of the cache spans for robustness. The 
intersection of a cache volume and a cache span
-is a :term:`cache stripe`. Each cache span is divided in to cache stripes and 
each cache volume is a collection of those
-stripes.
+Cache volumes can be defined by a percentage of the total storage or as an
+absolute amount of storage. By default, each cache volume is spread across all
+of the cache spans for robustness. The intersection of a cache volume and a
+cache span is a :term:`cache

[2/2] trafficserver git commit: update CHANGES

2014-12-10 Thread sudheerv 
update CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6a876491
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6a876491
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6a876491

Branch: refs/heads/master
Commit: 6a87649159927693589ce1036b4966d3410aef3d
Parents: 3c1aee7
Author: Sudheer Vinukonda sudhe...@yahoo-inc.com
Authored: Wed Dec 10 22:42:40 2014 +
Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com
Committed: Wed Dec 10 22:42:40 2014 +

--
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6a876491/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 51f119e..88590fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.3.0
 
+  *) [TS-3226]: Move access of read vio inside the mutex to prevent ntodo 
corruption
+
   *) [TS-3224] fix ts_lua core dump issue.
 
   *) [TS-3229] Filter unsupported epic metric names.

trafficserver git commit: fix minor coverity errors

2014-12-10 Thread sudheerv 
Repository: trafficserver
Updated Branches:
  refs/heads/master 6a8764915 - f351ed2cf


fix minor coverity errors


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f351ed2c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f351ed2c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f351ed2c

Branch: refs/heads/master
Commit: f351ed2cf23489331fcdfb0c3849667ff790a7e7
Parents: 6a87649
Author: Sudheer Vinukonda sudhe...@yahoo-inc.com
Authored: Thu Dec 11 04:15:46 2014 +
Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com
Committed: Thu Dec 11 04:15:46 2014 +

--
 mgmt/api/CoreAPIRemote.cc | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f351ed2c/mgmt/api/CoreAPIRemote.cc
--
diff --git a/mgmt/api/CoreAPIRemote.cc b/mgmt/api/CoreAPIRemote.cc
index 8ddc45b..11b647b 100644
--- a/mgmt/api/CoreAPIRemote.cc
+++ b/mgmt/api/CoreAPIRemote.cc
@@ -300,7 +300,7 @@ DiagnosticMessage(TSDiagsT mode, const char *fmt, va_list 
ap)
   // format the diag message now so it can be sent
   // vsnprintf does not compile on DEC
   vsnprintf(diag_msg, MAX_BUF_SIZE - 1, fmt, ap);
-  MGMTAPI_SEND_MESSAGE(main_socket_fd, DIAGS, optype, level, msg);
+  (void) MGMTAPI_SEND_MESSAGE(main_socket_fd, DIAGS, optype, level, msg);
 }
 
 /***
@@ -441,9 +441,6 @@ Bounce(unsigned options)
   MgmtMarshallInt oval = options;
 
   ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, BOUNCE, optype, oval);
-  if (ret != TS_ERR_OKAY) {
-return ret;
-  }
 
   return (ret == TS_ERR_OKAY) ? parse_generic_response(BOUNCE, main_socket_fd) 
: ret;
 }