[trafficserver] branch 9.0.x updated: Reverse debug specific check.

2019-11-07 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ce3e12e  Reverse debug specific check.
ce3e12e is described below

commit ce3e12e1be6f1f9f828f928ad1f987ef5991b553
Author: David Calavera 
AuthorDate: Wed Nov 6 10:24:07 2019 -0800

Reverse debug specific check.

debug_flag && diags->on() is almost an atomic operation,
while is_debug_tag_set requires Diags to run a regular expression.

When debug_flag is set to 1, we always want to print the debug log,
regardless of whether the tag is set or not, which makes the
is_debug_tag_set check useless, and expensive.

This change flips the conditional to check if debug_flag is 1 first,
skipping the tag check if it is.

Signed-off-by: David Calavera 
(cherry picked from commit 9e91efbb24eafe4150d286e1bab2a52d8bb0823c)
---
 src/traffic_server/InkAPI.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/traffic_server/InkAPI.cc b/src/traffic_server/InkAPI.cc
index 49ae843..1d9dea3 100644
--- a/src/traffic_server/InkAPI.cc
+++ b/src/traffic_server/InkAPI.cc
@@ -7447,7 +7447,7 @@ TSIsDebugTagSet(const char *t)
 void
 TSDebugSpecific(int debug_flag, const char *tag, const char *format_str, ...)
 {
-  if (is_debug_tag_set(tag) || (debug_flag && diags->on())) {
+  if ((debug_flag && diags->on()) || is_debug_tag_set(tag)) {
 va_list ap;
 
 va_start(ap, format_str);



[trafficserver] branch master updated (3ceab9e -> 9e91efb)

2019-11-07 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from 3ceab9e  thread ready check
 add 9e91efb  Reverse debug specific check.

No new revisions were added by this update.

Summary of changes:
 src/traffic_server/InkAPI.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[trafficserver] branch 8.0.x updated: Remove including sys/sysctl.h for Linux

2019-11-07 Thread bcall
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


The following commit(s) were added to refs/heads/8.0.x by this push:
 new 4be6906  Remove including sys/sysctl.h for Linux
4be6906 is described below

commit 4be6906afcf6e3abd3d03fbd6623d5c32ffc4aab
Author: Bryan Call 
AuthorDate: Tue Nov 5 17:36:55 2019 -0800

Remove including sys/sysctl.h for Linux

(cherry picked from commit 3ea8301d1572073072063233b6974244d1827e81)

 Conflicts:
src/tscore/ink_hrtime.cc
---
 include/tscore/ink_platform.h | 2 ++
 src/tscore/ink_hrtime.cc  | 2 ++
 tests/include/catch.hpp   | 4 
 3 files changed, 8 insertions(+)

diff --git a/include/tscore/ink_platform.h b/include/tscore/ink_platform.h
index 321bfdf..32212a9 100644
--- a/include/tscore/ink_platform.h
+++ b/include/tscore/ink_platform.h
@@ -157,9 +157,11 @@ typedef unsigned int in_addr_t;
 #include 
 #endif
 
+#if defined(darwin) || defined(freebsd)
 #ifdef HAVE_SYS_SYSCTL_H
 #include 
 #endif
+#endif
 
 #ifdef HAVE_SYS_SYSTEMINFO_H
 #include 
diff --git a/src/tscore/ink_hrtime.cc b/src/tscore/ink_hrtime.cc
index 3a328c2..a535065 100644
--- a/src/tscore/ink_hrtime.cc
+++ b/src/tscore/ink_hrtime.cc
@@ -35,8 +35,10 @@
 #if defined(freebsd)
 #include 
 #include 
+#ifdef HAVE_SYS_SYSCTL_H
 #include 
 #endif
+#endif
 #include 
 #include 
 
diff --git a/tests/include/catch.hpp b/tests/include/catch.hpp
index ecd8907..d7bb037 100644
--- a/tests/include/catch.hpp
+++ b/tests/include/catch.hpp
@@ -7093,7 +7093,11 @@ namespace Catch {
 #  include 
 #  include 
 #  include 
+#if defined(darwin) || defined(freebsd)
+#ifdef HAVE_SYS_SYSCTL_H
 #  include 
+#endif
+#endif
 #  include 
 #  include 
 



[trafficserver] branch master updated (61cce69 -> 3ceab9e)

2019-11-07 Thread duke8253
This is an automated email from the ASF dual-hosted git repository.

duke8253 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from 61cce69  tests: Cleans up local variable is assigned to but never used 
warnings
 add 3ceab9e  thread ready check

No new revisions were added by this update.

Summary of changes:
 iocore/eventsystem/I_EventProcessor.h|  4 
 iocore/eventsystem/UnixEventProcessor.cc | 27 +++
 proxy/http/HttpProxyServerMain.cc|  4 ++--
 proxy/http/HttpProxyServerMain.h |  2 +-
 src/traffic_server/traffic_server.cc | 12 +---
 5 files changed, 39 insertions(+), 10 deletions(-)



[trafficserver] branch master updated (de22d85 -> 61cce69)

2019-11-07 Thread rrm
This is an automated email from the ASF dual-hosted git repository.

rrm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from de22d85  Rename test to lua_watermark.test.py
 add 6b08479  tests: Cleans up imported but unused imports
 add 61cce69  tests: Cleans up local variable is assigned to but never used 
warnings

No new revisions were added by this update.

Summary of changes:
 tests/gold_tests/autest-site/curl_header.test.ext |  1 -
 tests/gold_tests/autest-site/init.cli.ext |  5 ++---
 tests/gold_tests/autest-site/microDNS.test.ext|  4 +---
 tests/gold_tests/autest-site/microserver.test.ext | 11 +--
 tests/gold_tests/autest-site/traffic_replay.test.ext  |  4 ++--
 tests/gold_tests/autest-site/trafficserver.test.ext   |  5 +
 tests/gold_tests/basic/config.test.py |  1 -
 tests/gold_tests/basic/copy_config.test.py|  2 +-
 tests/gold_tests/basic/deny0.test.py  |  1 -
 tests/gold_tests/cache/cache-control.test.py  |  3 +--
 tests/gold_tests/chunked_encoding/chunked_encoding.test.py|  1 -
 tests/gold_tests/continuations/double.test.py |  4 ++--
 tests/gold_tests/continuations/double_h2.test.py  |  4 ++--
 tests/gold_tests/continuations/openclose.test.py  |  4 ++--
 tests/gold_tests/h2/h2active_timeout.py   |  1 -
 tests/gold_tests/h2/h2bigclient.py|  2 --
 tests/gold_tests/h2/h2chunked.py  |  2 --
 tests/gold_tests/h2/h2client.py   |  2 --
 tests/gold_tests/h2/h2disable.test.py |  1 -
 tests/gold_tests/h2/h2disable_no_accept_threads.test.py   |  1 -
 tests/gold_tests/h2/h2enable.test.py  |  1 -
 tests/gold_tests/h2/h2enable_no_accept_threads.test.py|  1 -
 tests/gold_tests/h2/h2spec.test.py|  5 -
 tests/gold_tests/h2/http2_priority.test.py|  6 +-
 tests/gold_tests/headers/cache_and_req_body.test.py   |  1 -
 tests/gold_tests/headers/cachedIMSRange.test.py   |  2 --
 tests/gold_tests/headers/forwarded-observer.py|  1 -
 tests/gold_tests/headers/forwarded.test.py|  1 -
 tests/gold_tests/headers/hsts.test.py |  1 -
 tests/gold_tests/headers/http408.test.py  |  1 -
 tests/gold_tests/headers/normalize_ae.test.py |  1 -
 tests/gold_tests/headers/syntax.test.py   |  1 -
 tests/gold_tests/headers/via.test.py  |  1 -
 tests/gold_tests/logging/all_headers.test.py  |  1 -
 tests/gold_tests/logging/ccid_ctid.test.py|  1 -
 tests/gold_tests/logging/log-filter.test.py   |  9 -
 .../client_context_dump/client_context_dump.test.py   |  2 --
 tests/gold_tests/pluginTest/compress/compress.test.py |  2 --
 .../pluginTest/header_rewrite/header_rewrite.test.py  |  1 -
 tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py   |  1 -
 tests/gold_tests/pluginTest/slice/slice.test.py   |  2 --
 tests/gold_tests/pluginTest/slice/slice_error.test.py |  2 --
 tests/gold_tests/pluginTest/test_hooks/hook_add.test.py   |  2 +-
 tests/gold_tests/pluginTest/url_sig/url_sig.test.py   |  3 +--
 tests/gold_tests/redirect/redirect_post.test.py   |  1 -
 tests/gold_tests/remap/remap_http.test.py |  1 -
 tests/gold_tests/remap/remap_https.test.py|  1 -
 tests/gold_tests/runroot/runroot_error.test.py|  2 --
 tests/gold_tests/runroot/runroot_init.test.py |  2 --
 tests/gold_tests/runroot/runroot_manager.test.py  |  2 --
 tests/gold_tests/runroot/runroot_remove.test.py   |  2 --
 tests/gold_tests/runroot/runroot_use.test.py  |  2 --
 tests/gold_tests/runroot/runroot_verify.test.py   |  2 --
 tests/gold_tests/thread_config/thread_100_0.test.py   |  2 --
 tests/gold_tests/thread_config/thread_100_1.test.py   |  2 --
 tests/gold_tests/thread_config/thread_100_10.test.py  |  2 --
 tests/gold_tests/thread_config/thread_1_0.test.py |  2 --
 tests/gold_tests/thread_config/thread_1_1.test.py |  2 --
 tests/gold_tests/thread_config/thread_1_10.test.py|  2 --
 tests/gold_tests/thread_config/thread_2_0.test.py |  2 --
 tests/gold_tests/thread_config/thread_2_1.test.py |  2 --
 tests/gold_tests/thread_config/thread_2_10.test.py|  2 --
 tests/gold_tests/thread_config/thread_32_0.test.py|  2 --
 tests/gold_tests/thread_config/thread_32_1.test.py   

[trafficserver] branch master updated (7ba816f -> de22d85)

2019-11-07 Thread eze
This is an automated email from the ASF dual-hosted git repository.

eze pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from 7ba816f  Internal link needs _
 add 4d9c1fa  Add lua watermark test to check for existence of lua 
watermark upstream API call
 add 918240f  Add apache header to watermark lua test
 add de22d85  Rename test to lua_watermark.test.py

No new revisions were added by this update.

Summary of changes:
 .../lua_watermark.test.py} | 49 --
 .../gold_tests/pluginTest/lua/watermark.lua| 15 ---
 2 files changed, 33 insertions(+), 31 deletions(-)
 copy tests/gold_tests/pluginTest/{header_rewrite/header_rewrite.test.py => 
lua/lua_watermark.test.py} (57%)
 copy plugins/lua/example/test_hdr.lua => 
tests/gold_tests/pluginTest/lua/watermark.lua (74%)