apache · zwoop · Feb 14, 2023 · Feb 12, 2023 · Feb 12, 2023 · Feb 13, 2023
diff --git a/include/tscore/UDP_stubs.h b/include/tscore/UDP_stubs.h
@@ -0,0 +1,36 @@
+/** @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.
+ */
+
+// This is needed to avoid library dependency ugliness.
+// ToDo: This would be good to eliminate in the libraries...
+#include "I_NetVConnection.h"
+#include "P_UDPConnection.h"
+#include "P_UDPPacket.h"
+
+void
+UDPConnection::Release()
+{
+}
+
+ClassAllocator<UDPPacketInternal> udpPacketAllocator("udpPacketAllocator");
+int fds_limit = 8000;
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
@@ -58,7 +58,6 @@ test_AIO_LDADD = \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@
 
 include $(top_srcdir)/build/tidy.mk

diff --git a/iocore/aio/test_AIO.cc b/iocore/aio/test_AIO.cc
@@ -33,6 +33,9 @@
 using std::cout;
 using std::endl;
 
+// ToDo: It would be nice to decouple these UDP dependencies ...
+#include "tscore/UDP_stubs.h"
+
 // Necessary for AIO
 int net_config_poll_timeout = 10;
 

diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
@@ -99,7 +99,6 @@ test_LD_ADD = \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@
 
 test_EventSystem_SOURCES = unit_tests/test_EventSystem.cc

diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
@@ -76,7 +76,6 @@ test_LD_ADD = \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@
 
 test_RefCountCache_CPPFLAGS = $(test_CPP_FLAGS)

diff --git a/iocore/net/quic/Makefile.am b/iocore/net/quic/Makefile.am
@@ -170,7 +170,6 @@ test_LDADD = \
   libquic.a \
   $(top_builddir)/src/records/librecords_p.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
   $(top_builddir)/src/tscore/libtscore.la \
   $(top_builddir)/src/tscpp/util/libtscpputil.la \
   $(top_builddir)/proxy/ParentSelectionStrategy.o \

diff --git a/iocore/net/quic/test/test_QUICAddrVerifyState.cc b/iocore/net/quic/test/test_QUICAddrVerifyState.cc
@@ -26,6 +26,8 @@
 #include "P_QUICNetVConnection.h"
 #include <memory>
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICAddrVerifyState", "[quic]")
 {
   QUICAddrVerifyState state;

diff --git a/iocore/net/quic/test/test_QUICFlowController.cc b/iocore/net/quic/test/test_QUICFlowController.cc
@@ -27,6 +27,8 @@
 #include "quic/Mock.h"
 #include <memory>
 
+#include "tscore/UDP_stubs.h"
+
 static constexpr int DEFAULT_RTT = 1 * HRTIME_SECOND;
 
 class MockRTTProvider : public QUICRTTProvider

diff --git a/iocore/net/quic/test/test_QUICFrame.cc b/iocore/net/quic/test/test_QUICFrame.cc
@@ -27,6 +27,8 @@
 #include "quic/QUICFrame.h"
 #include "quic/QUICStream.h"
 
+#include "tscore/UDP_stubs.h"
+
 extern const ink_freelist_ops *freelist_global_ops;
 extern const ink_freelist_ops *freelist_class_ops;
 

diff --git a/iocore/net/quic/test/test_QUICFrameDispatcher.cc b/iocore/net/quic/test/test_QUICFrameDispatcher.cc
@@ -27,6 +27,8 @@
 #include "quic/Mock.h"
 #include <memory>
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICFrameHandler", "[quic]")
 {
   Ptr<IOBufferBlock> block = make_ptr<IOBufferBlock>(new_IOBufferBlock());

diff --git a/iocore/net/quic/test/test_QUICHandshakeProtocol.cc b/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
@@ -27,6 +27,8 @@
 #include <fstream>
 #include <iomanip>
 
+#include "tscore/UDP_stubs.h"
+
 #ifdef OPENSSL_IS_BORINGSSL
 #include <openssl/base.h>
 #endif

diff --git a/iocore/net/quic/test/test_QUICLossDetector.cc b/iocore/net/quic/test/test_QUICLossDetector.cc
@@ -32,6 +32,8 @@
 #include "Mock.h"
 #include "tscore/ink_hrtime.h"
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICLossDetector_Loss", "[quic]")
 {
   MockQUICPacketProtectionKeyInfo pp_key_info;

diff --git a/iocore/net/quic/test/test_QUICPacketFactory.cc b/iocore/net/quic/test/test_QUICPacketFactory.cc
@@ -27,6 +27,8 @@
 #include "quic/QUICPacketFactory.h"
 #include "quic/Mock.h"
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICPacketFactory_Create_VersionNegotiationPacket", "[quic]")
 {
   MockQUICPacketProtectionKeyInfo pp_key_info;

diff --git a/iocore/net/quic/test/test_QUICPacketHeaderProtector.cc b/iocore/net/quic/test/test_QUICPacketHeaderProtector.cc
@@ -29,6 +29,8 @@
 #include "QUICGlobals.h"
 #include "Mock.h"
 
+#include "tscore/UDP_stubs.h"
+
 struct PollCont;
 #include "P_UDPConnection.h"
 #include "P_UnixNet.h"

diff --git a/iocore/net/quic/test/test_QUICPathValidator.cc b/iocore/net/quic/test/test_QUICPathValidator.cc
@@ -28,6 +28,8 @@
 #include "stdio.h"
 #include "stdlib.h"
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICPathValidator", "[quic]")
 {
   MockQUICConnectionInfoProvider cinfo_provider;

diff --git a/iocore/net/quic/test/test_QUICStream.cc b/iocore/net/quic/test/test_QUICStream.cc
@@ -28,6 +28,8 @@
 #include "quic/QUICStreamVCAdapter.h"
 #include "quic/Mock.h"
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICBidiStream", "[quic]")
 {
   // Test Data

diff --git a/iocore/net/quic/test/test_QUICStreamManager.cc b/iocore/net/quic/test/test_QUICStreamManager.cc
@@ -30,6 +30,8 @@
 #include "quic/QUICFrame.h"
 #include "quic/Mock.h"
 
+#include "tscore/UDP_stubs.h"
+
 MockQUICContext context;
 
 TEST_CASE("QUICStreamManager_NewStream", "[quic]")

diff --git a/iocore/net/quic/test/test_QUICStreamState.cc b/iocore/net/quic/test/test_QUICStreamState.cc
@@ -29,6 +29,8 @@
 #include "quic/QUICStreamState.h"
 #include "quic/Mock.h"
 
+#include "tscore/UDP_stubs.h"
+
 // Unidirectional (sending)
 TEST_CASE("QUICSendStreamState", "[quic]")
 {

diff --git a/iocore/net/quic/test/test_QUICVersionNegotiator.cc b/iocore/net/quic/test/test_QUICVersionNegotiator.cc
@@ -29,6 +29,8 @@
 #include "quic/QUICPacketFactory.h"
 #include "quic/Mock.h"
 
+#include "tscore/UDP_stubs.h"
+
 TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
 {
   MockQUICPacketProtectionKeyInfo pp_key_info;

diff --git a/mgmt/rpc/Makefile.am b/mgmt/rpc/Makefile.am
@@ -72,7 +72,6 @@ test_jsonrpc_LDADD = \
 	$(top_builddir)/src/records/librecords_p.a \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	$(top_builddir)/mgmt/utils/libutils_p.la \
 	@YAMLCPP_LIBS@ @HWLOC_LIBS@
 
@@ -117,7 +116,6 @@ test_jsonrpcserver_LDADD = \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
 	$(top_builddir)/src/tscore/libtscore.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	$(top_builddir)/mgmt/utils/libutils_p.la \
 	@YAMLCPP_LIBS@ @HWLOC_LIBS@  @SWOC_LIBS@ @YAMLCPP_LIBS@
 

diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
@@ -88,7 +88,6 @@ test_proxy_hdrs_LDADD = \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@ \
 	@LIBCAP@
 
@@ -106,7 +105,6 @@ test_hdr_heap_LDADD = -L. -lhdrs \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@ \
 	@LIBCAP@
 

diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
@@ -108,7 +108,6 @@ test_proxy_http_LDADD = \
 	$(top_builddir)/proxy/logging/liblogging.a \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	$(top_builddir)/iocore/utils/libinkutils.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@ \
 	@LIBCAP@

diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
@@ -74,7 +74,6 @@ COMMON_PLUGINDSO_LDADDS = \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@
 
 clang-tidy-local: $(libhttp_remap_a_SOURCES)

diff --git a/proxy/http/remap/unit-tests/nexthop_test_stubs.cc b/proxy/http/remap/unit-tests/nexthop_test_stubs.cc
@@ -32,6 +32,9 @@
 #include "HttpSM.h"
 #include "nexthop_test_stubs.h"
 
+// ToDo: It would be nice to decouple these UDP dependencies ...
+#include "tscore/UDP_stubs.h"
+
 HttpSM::HttpSM() : Continuation(nullptr), vc_table(this) {}
 void
 HttpSM::cleanup()
@@ -214,14 +217,3 @@ HostStatus::setHostStatus(const std::string_view host, TSHostStatus status, unsi
   this->hosts_statuses[std::string(host)]->local_down_time = down_time;
   NH_Debug("next_hop", "setting host status for '%.*s' to %s", host.size(), host.data(), HostStatusNames[status]);
 }
-
-#include "I_UDPConnection.h"
-
-void
-UDPConnection::Release()
-{
-}
-
-#include "P_UDPPacket.h"
-ClassAllocator<UDPPacketInternal> udpPacketAllocator("udpPacketAllocator");
-// for UDPPacketInternal::free()
diff --git a/proxy/http/unit_tests/unit_test_main.cc b/proxy/http/unit_tests/unit_test_main.cc
@@ -28,3 +28,6 @@
 #include "tscore/I_Version.h"
 
 AppVersionInfo appVersionInfo;
+
+// ToDo: It would be nice to decouple these UDP dependencies ...
+#include "tscore/UDP_stubs.h"
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
@@ -77,7 +77,6 @@ test_libhttp2_LDADD = \
 	$(top_builddir)/proxy/hdrs/libhdrs.a \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@
 
 if OS_LINUX
@@ -129,7 +128,6 @@ test_HPACK_LDADD = \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
 	@SWOC_LIBS@ @HWLOC_LIBS@
 
 test_HPACK_SOURCES = \

diff --git a/proxy/http3/Makefile.am b/proxy/http3/Makefile.am
@@ -76,7 +76,6 @@ test_LDADD = \
   $(top_builddir)/src/tscore/libtscore.la \
   $(top_builddir)/src/tscpp/util/libtscpputil.la \
   $(top_builddir)/proxy/hdrs/libhdrs.a \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
   @LIBPCRE@ \
   @OPENSSL_LIBS@ \
   @HWLOC_LIBS@ @SWOC_LIBS@

diff --git a/proxy/http3/test/main_qpack.cc b/proxy/http3/test/main_qpack.cc
@@ -38,6 +38,9 @@
 #include "QPACK.h"
 #include "HTTP.h"
 
+// ToDo: It would be nice to decouple these UDP dependencies ...
+#include "tscore/UDP_stubs.h"
+
 #define TEST_THREADS 1
 
 char qifdir[256]  = "./qifs/qifs";

diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
@@ -39,6 +39,7 @@
 #include "MgmtUtils.h"
 // Needs LibRecordsConfigInit()
 #include "records/I_RecordsConfig.h"
+#include "I_Machine.h"
 
 #define LOG_FILENAME_SIZE 255
 
@@ -202,8 +203,7 @@ init_log_standalone(const char *pgm_name, bool one_copy)
 
   1) does not call initialize_process_manager
   2) initializes the diags with use_records = false
-  3) does not call Machine::init()
-  4) assumes multiple copies of the application can run, so does not
+  3) assumes multiple copies of the application can run, so does not
      do lock checking
   -------------------------------------------------------------------------*/
 
@@ -215,6 +215,10 @@ init_log_standalone_basic(const char *pgm_name)
   snprintf(logfile, sizeof(logfile), "%s.log", pgm_name);
   openlog(pgm_name, LOG_PID | LOG_NDELAY | LOG_NOWAIT, LOG_DAEMON);
 
+  // Makes the logging library happy. ToDo: This should be eliminated when
+  // the cross dependencies aren't ugly.
+  Machine::init("localhost", nullptr);
+
   init_system(false);
   const bool use_records = false;
   diagsConfig            = new DiagsConfig(pgm_name, logfile, error_tags, action_tags, use_records);

diff --git a/proxy/logging/unit-tests/benchmark_LogObject.cc b/proxy/logging/unit-tests/benchmark_LogObject.cc
@@ -41,7 +41,6 @@ benchmark_LogObject_LDADD = \
        $(top_builddir)/proxy/http/libhttp.a \
        $(top_builddir)/proxy/hdrs/libhdrs.a \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
-       $(top_builddir)/proxy/shared/libUglyLogStubs.a \
        $(top_builddir)/proxy/shared/libdiagsconfig.a \
        @HWLOC_LIBS@
 

diff --git a/proxy/shared/CMakeLists.txt b/proxy/shared/CMakeLists.txt
@@ -24,11 +24,3 @@ target_include_directories(diagsconfig PRIVATE
         ${CMAKE_SOURCE_DIR}/mgmt/utils
         ${YAMLCPP_INCLUDE_DIR}
 )
-add_library(UglyLogStubs STATIC UglyLogStubs.cc)
-target_include_directories(UglyLogStubs PRIVATE
-        ${IOCORE_INCLUDE_DIRS}
-        ${PROXY_INCLUDE_DIRS}
-        ${CMAKE_SOURCE_DIR}/mgmt
-        ${CMAKE_SOURCE_DIR}/mgmt/utils
-        ${YAMLCPP_INCLUDE_DIR}
-)
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
@@ -20,8 +20,7 @@ include $(top_srcdir)/build/tidy.mk
 
 # Note that hdrs is targeted from ../Makefile.am
 noinst_LIBRARIES = \
-	libdiagsconfig.a \
-	libUglyLogStubs.a
+	libdiagsconfig.a
 
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
@@ -41,8 +40,5 @@ AM_CPPFLAGS += \
 libdiagsconfig_a_SOURCES = \
 	DiagsConfig.cc
 
-libUglyLogStubs_a_SOURCES = \
-	UglyLogStubs.cc
-
-clang-tidy-local: $(libdiagsconfig_a_SOURCES) $(libUglyLogStubs_a_SOURCES)
+clang-tidy-local: $(libdiagsconfig_a_SOURCES)
 	$(CXX_Clang_Tidy)