You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2018/06/08 17:24:20 UTC

[trafficserver] branch 8.0.x updated (16ae0b9 -> bb85b9c)

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


    from 16ae0b9  Update documentation for TSfread/TSfwrite to match new types.
     new 4a6d0fb  Removed defines that are not used
     new bb85b9c  HostDB code cleanup

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 iocore/cache/CacheWrite.cc        |  1 -
 iocore/eventsystem/UnixEThread.cc |  1 -
 iocore/hostdb/HostDB.cc           | 10 +---------
 iocore/net/SSLSNIConfig.cc        |  4 ----
 iocore/net/UnixUDPNet.cc          |  4 ----
 lib/ts/ink_string.cc              |  2 --
 mgmt/api/APITestCliRemote.cc      |  4 ----
 mgmt/api/NetworkMessage.cc        |  1 -
 proxy/InkAPITestTool.cc           |  1 -
 proxy/Main.cc                     | 10 ----------
 proxy/PluginVC.cc                 |  3 ---
 proxy/hdrs/HdrToken.cc            |  1 -
 proxy/http/test_socket_close.cc   |  1 -
 proxy/logging/LogConfig.cc        |  1 -
 14 files changed, 1 insertion(+), 43 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
bcall@apache.org.

[trafficserver] 01/02: Removed defines that are not used

Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 4a6d0fb5ab9b9a0df224fd7e1f73b00fba6fe46d
Author: Bryan Call <bc...@apache.org>
AuthorDate: Thu Jun 7 16:41:49 2018 -0700

    Removed defines that are not used
    
    (cherry picked from commit 286fc381bbb6340658d7865c1a879d8ce97f137a)
---
 iocore/cache/CacheWrite.cc        |  1 -
 iocore/eventsystem/UnixEThread.cc |  1 -
 iocore/net/SSLSNIConfig.cc        |  4 ----
 iocore/net/UnixUDPNet.cc          |  4 ----
 lib/ts/ink_string.cc              |  2 --
 mgmt/api/APITestCliRemote.cc      |  4 ----
 mgmt/api/NetworkMessage.cc        |  1 -
 proxy/InkAPITestTool.cc           |  1 -
 proxy/Main.cc                     | 10 ----------
 proxy/PluginVC.cc                 |  3 ---
 proxy/hdrs/HdrToken.cc            |  1 -
 proxy/http/test_socket_close.cc   |  1 -
 proxy/logging/LogConfig.cc        |  1 -
 13 files changed, 34 deletions(-)

diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index 626b626..cd873ef 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -23,7 +23,6 @@
 
 #include "P_Cache.h"
 
-#define IS_POWER_2(_x) (!((_x) & ((_x)-1)))
 #define UINT_WRAP_LTE(_x, _y) (((_y) - (_x)) < INT_MAX) // exploit overflow
 #define UINT_WRAP_GTE(_x, _y) (((_x) - (_y)) < INT_MAX) // exploit overflow
 #define UINT_WRAP_LT(_x, _y) (((_x) - (_y)) >= INT_MAX) // exploit overflow
diff --git a/iocore/eventsystem/UnixEThread.cc b/iocore/eventsystem/UnixEThread.cc
index 05cf373..225d81f 100644
--- a/iocore/eventsystem/UnixEThread.cc
+++ b/iocore/eventsystem/UnixEThread.cc
@@ -34,7 +34,6 @@
 
 struct AIOCallback;
 
-#define MAX_HEARTBEATS_MISSED 10
 #define NO_HEARTBEAT -1
 #define THREAD_MAX_HEARTBEAT_MSECONDS 60
 
diff --git a/iocore/net/SSLSNIConfig.cc b/iocore/net/SSLSNIConfig.cc
index d947b9c..9c3cc5b 100644
--- a/iocore/net/SSLSNIConfig.cc
+++ b/iocore/net/SSLSNIConfig.cc
@@ -36,10 +36,6 @@
 #include "ts/ink_memory.h"
 #include <ts/TextView.h>
 
-#define SNI_NAME_TAG "dest_host"
-#define SNI_ACTION_TAG "action"
-#define SNI_PARAM_TAG "param"
-
 static ConfigUpdateHandler<SNIConfig> *sniConfigUpdate;
 struct NetAccept;
 Map<int, SSLNextProtocolSet *> snpsMap;
diff --git a/iocore/net/UnixUDPNet.cc b/iocore/net/UnixUDPNet.cc
index 533d568..71b45bb 100644
--- a/iocore/net/UnixUDPNet.cc
+++ b/iocore/net/UnixUDPNet.cc
@@ -37,10 +37,6 @@ using UDPNetContHandler = int (UDPNetHandler::*)(int, void *);
 inkcoreapi ClassAllocator<UDPPacketInternal> udpPacketAllocator("udpPacketAllocator");
 EventType ET_UDP;
 
-#if defined(linux) && !defined(DEBUG)
-#define NODIAGS
-#endif
-
 //
 // Global Data
 //
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index cbc4de1..c36dda0 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -29,8 +29,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#define INK_MAX_STRING_ARRAY_SIZE 128
-
 /*-------------------------------------------------------------------------
   -------------------------------------------------------------------------*/
 char *
diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc
index 2103ae5..201f85c 100644
--- a/mgmt/api/APITestCliRemote.cc
+++ b/mgmt/api/APITestCliRemote.cc
@@ -97,10 +97,6 @@
 
 #define SET_INT 0
 
-// set to 1 if running as part of installation package
-// set to 0 if being tested in developer environment
-#define INSTALL_TEST 0
-
 /***************************************************************************
  * Printing Helper Functions
  ***************************************************************************/
diff --git a/mgmt/api/NetworkMessage.cc b/mgmt/api/NetworkMessage.cc
index 459e64c..44aa6ee 100644
--- a/mgmt/api/NetworkMessage.cc
+++ b/mgmt/api/NetworkMessage.cc
@@ -29,7 +29,6 @@
 #include "mgmtapi.h"
 #include "NetworkMessage.h"
 
-#define MAX_OPERATION_BUFSZ 1024
 #define MAX_OPERATION_FIELDS 16
 
 struct NetCmdOperation {
diff --git a/proxy/InkAPITestTool.cc b/proxy/InkAPITestTool.cc
index 645362d..fabc430 100644
--- a/proxy/InkAPITestTool.cc
+++ b/proxy/InkAPITestTool.cc
@@ -44,7 +44,6 @@
 #define SYNSERVER_LISTEN_PORT 3300
 #define SYNSERVER_DUMMY_PORT -1
 
-#define PROXY_CONFIG_NAME_HTTP_PORT "proxy.config.http.server_port"
 #define PROXY_HTTP_DEFAULT_PORT 8080
 
 #define REQUEST_MAX_SIZE 4095
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 0e88da1..ad4ecce 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -106,18 +106,8 @@ extern "C" int plock(int);
 //
 // Global Data
 //
-#define DEFAULT_HTTP_ACCEPT_PORT_NUMBER 0
 #define DEFAULT_COMMAND_FLAG 0
 
-#define DEFAULT_VERBOSE_FLAG 0
-#define DEFAULT_STACK_TRACE_FLAG 0
-
-#if DEFAULT_COMMAND_FLAG
-#define DEFAULT_COMMAND_FLAG_TYPE "f"
-#else
-#define DEFAULT_COMMAND_FLAG_TYPE "F"
-#endif
-
 #define DEFAULT_REMOTE_MANAGEMENT_FLAG 0
 #define DIAGS_LOG_FILENAME "diags.log"
 
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index d4e2de5..55ea62f 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -80,9 +80,6 @@
 #define PVC_DEFAULT_MAX_BYTES 32768
 #define MIN_BLOCK_TRANSFER_BYTES 128
 
-#define EVENT_PTR_LOCKED (void *)0x1
-#define EVENT_PTR_CLOSED (void *)0x2
-
 #define PVC_TYPE ((vc_type == PLUGIN_VC_ACTIVE) ? "Active" : "Passive")
 
 PluginVC::PluginVC(PluginVCCore *core_obj)
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index f2b3689..33e004f 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -262,7 +262,6 @@ DFA *hdrtoken_strs_dfa = nullptr;
  ***********************************************************************/
 
 #define HDRTOKEN_HASH_TABLE_SIZE 65536
-#define HDRTOKEN_HASH_TABLE_MASK HDRTOKEN_HASH_TABLE_SIZE - 1
 
 struct HdrTokenHashBucket {
   const char *wks;
diff --git a/proxy/http/test_socket_close.cc b/proxy/http/test_socket_close.cc
index a049b29..4be9c58 100644
--- a/proxy/http/test_socket_close.cc
+++ b/proxy/http/test_socket_close.cc
@@ -115,7 +115,6 @@ char read_buf[10];
 int state_delay_ms = 0;
 
 #define IS_DONE(c) (c.state.state == STATE_DONE || c.state.state == STATE_ERROR)
-#define IS_IDLE(c) (c.state.state == STATE_IDLE)
 
 void main_loop();
 void state_act(Conn *c);
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index da079dd..f52517b 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -61,7 +61,6 @@
   "Access logging to local log directory suspended - " \
   "configured space allocation almost exhausted."
 #define DISK_IS_ACTUAL_LOW_MESSAGE "Access logging to local log directory suspended - partition space is low."
-#define DUP_FORMAT_MESSAGE "Format named %s already exists; duplicate format names are not allowed."
 
 #define PARTITION_HEADROOM_MB 10
 

-- 
To stop receiving notification emails like this one, please contact
bcall@apache.org.

[trafficserver] 02/02: HostDB code cleanup

Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit bb85b9cfa6551231688a19a5fb89df67e9989e0f
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Jun 6 15:02:01 2018 -0700

    HostDB code cleanup
    
    (cherry picked from commit 3570fdf04d4ce89d4b21e784e1981cbb5c09f7b1)
---
 iocore/hostdb/HostDB.cc | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 237208e..2726e7c 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -21,25 +21,17 @@
   limitations under the License.
  */
 
-#define _HOSTDB_CC_
-
 #include "P_HostDB.h"
 #include "P_RefCountCacheSerializer.h"
 #include "ts/I_Layout.h"
 #include "Show.h"
 #include "ts/Tokenizer.h"
+#include "ts/ink_apidefs.h"
 
 #include <utility>
 #include <vector>
 #include <algorithm>
 
-// dxu: turn off all Diags.h 's function.
-//#define Debug
-//#define Warning
-//#define Note
-
-#include "ts/ink_apidefs.h"
-
 HostDBProcessor hostDBProcessor;
 int HostDBProcessor::hostdb_strict_round_robin = 0;
 int HostDBProcessor::hostdb_timed_round_robin  = 0;

-- 
To stop receiving notification emails like this one, please contact
bcall@apache.org.