apache · cmcfarlen · Feb 10, 2023 · Feb 7, 2023 · Feb 7, 2023 · Feb 9, 2023
diff --git a/include/records/I_RecCore.h b/include/records/I_RecCore.h
@@ -135,7 +135,6 @@ RecErrT RecRegisterRawStatUpdateFunc(const char *name, RecRawStatBlock *rsb, int
 // be sure to set 'lock' to 'false' as the hash-table rwlock has
 // already been taken out for the callback.
 
-// RecSetRecordConvert -> WebMgmtUtils.cc::varSetFromStr()
 RecErrT RecSetRecordConvert(const char *name, const RecString rec_string, RecSourceT source, bool lock = true);
 RecErrT RecSetRecordInt(const char *name, RecInt rec_int, RecSourceT source, bool lock = true);
 RecErrT RecSetRecordFloat(const char *name, RecFloat rec_float, RecSourceT source, bool lock = true);

diff --git a/mgmt/RecordsConfig.h → include/records/I_RecordsConfig.h b/mgmt/RecordsConfig.h → include/records/I_RecordsConfig.h
diff --git a/include/tscpp/util/Makefile.am b/include/tscpp/util/Makefile.am
@@ -26,4 +26,5 @@ library_include_HEADERS = \
 	PostScript.h \
 	Strerror.h \
 	TextView.h \
-	TsSharedMutex.h
+	TsSharedMutex.h \
+        YamlCfg.h
diff --git a/mgmt/YamlCfg.h → include/tscpp/util/YamlCfg.h b/mgmt/YamlCfg.h → include/tscpp/util/YamlCfg.h
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
@@ -55,8 +55,6 @@ test_AIO_CPPFLAGS = \
 test_AIO_LDADD = \
 	libinkaio.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/mgmt/libmgmt_p.la \
-	$(top_builddir)/mgmt/libmgmt_c.la \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \

diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
@@ -101,7 +101,6 @@ test_LDADD = \
 	$(top_builddir)/proxy/logging/liblogging.a \
 	$(top_builddir)/proxy/hdrs/libhdrs.a \
 	$(top_builddir)/proxy/shared/libdiagsconfig.a \
-	$(top_builddir)/mgmt/libmgmt_p.la \
 	$(top_builddir)/iocore/utils/libinkutils.a \
 	$(top_builddir)/iocore/aio/libinkaio.a \
 	$(top_builddir)/src/tscore/libtscore.la \

diff --git a/iocore/cache/test/main.h b/iocore/cache/test/main.h
@@ -31,7 +31,7 @@
 #include "tscore/Diags.h"
 #include "tscore/TSSystemState.h"
 
-#include "RecordsConfig.h"
+#include "records/I_RecordsConfig.h"
 #include "records/I_RecProcess.h"
 #include "P_AIO.h"
 #include "P_CacheDisk.h"

diff --git a/iocore/dns/P_SplitDNSProcessor.h b/iocore/dns/P_SplitDNSProcessor.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 
 #include "tscore/HostLookup.h"
 

diff --git a/mgmt/ProxyConfig.cc → iocore/eventsystem/ConfigProcessor.cc b/mgmt/ProxyConfig.cc → iocore/eventsystem/ConfigProcessor.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 #include "P_EventSystem.h"
 #if TS_HAS_TESTS
 #include "tscore/TestBox.h"

diff --git a/mgmt/ProxyConfig.h → iocore/eventsystem/ConfigProcessor.h b/mgmt/ProxyConfig.h → iocore/eventsystem/ConfigProcessor.h
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
@@ -68,7 +68,9 @@ libinkevent_a_SOURCES = \
 	Thread.cc \
 	UnixEThread.cc \
 	UnixEvent.cc \
-	UnixEventProcessor.cc
+	UnixEventProcessor.cc \
+	ConfigProcessor.cc \
+	ConfigProcessor.h
 
 check_PROGRAMS = test_IOBuffer \
 	test_EventSystem \
@@ -94,7 +96,6 @@ test_CPP_FLAGS = \
 test_LD_ADD = \
 	libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/mgmt/libmgmt_p.la \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \

diff --git a/iocore/eventsystem/unit_tests/test_IOBuffer.cc b/iocore/eventsystem/unit_tests/test_IOBuffer.cc
@@ -27,7 +27,7 @@
 #include "tscore/I_Layout.h"
 
 #include "I_EventSystem.h"
-#include "RecordsConfig.h"
+#include "records/I_RecordsConfig.h"
 
 #include "diags.i"
 

diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
@@ -73,8 +73,6 @@ test_CPP_FLAGS = \
 
 test_LD_ADD = \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/mgmt/libmgmt_p.la \
-	$(top_builddir)/mgmt/libmgmt_c.la \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \

diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
@@ -80,8 +80,6 @@ test_UDPNet_LDADD = \
 	libinknet.a \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/mgmt/libmgmt_p.la \
-	$(top_builddir)/mgmt/libmgmt_c.la \
 	$(top_builddir)/src/tscore/libtscore.la $(top_builddir)/src/tscpp/util/libtscpputil.la \
 	$(top_builddir)/proxy/hdrs/libhdrs.a \
 	$(top_builddir)/proxy/ParentSelectionStrategy.o \
@@ -116,8 +114,6 @@ test_libinknet_LDADD = \
 	libinknet.a \
 	$(top_builddir)/iocore/eventsystem/libinkevent.a \
 	$(top_builddir)/src/records/librecords_p.a \
-	$(top_builddir)/mgmt/libmgmt_p.la \
-	$(top_builddir)/mgmt/libmgmt_c.la \
 	$(top_builddir)/proxy/hdrs/libhdrs.a \
 	$(top_builddir)/src/tscore/libtscore.la \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \

diff --git a/iocore/net/P_SSLCertLookup.h b/iocore/net/P_SSLCertLookup.h
@@ -28,7 +28,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 
 struct SSLConfigParams;
 struct SSLContextStorage;

diff --git a/iocore/net/P_SSLClientCoordinator.h b/iocore/net/P_SSLClientCoordinator.h
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 #include <memory>
 
 // A class to pass the ConfigUpdateHandler, so both SSLConfig and SNIConfig get updated

diff --git a/iocore/net/P_SSLConfig.h b/iocore/net/P_SSLConfig.h
@@ -37,7 +37,7 @@
 #include "tscore/ink_inet.h"
 #include "tscore/IpMap.h"
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 
 #include "SSLSessionCache.h"
 #include "YamlSNIConfig.h"

diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
@@ -40,10 +40,8 @@
 #include "P_SSLNetVConnection.h"
 #include "BIO_fastopen.h"
 #include "SSLStats.h"
-#include "SSLInternal.h"
 #include "P_ALPNSupport.h"
 
-#include <climits>
 #include <string>
 #include <cstring>
 

diff --git a/iocore/net/SSLSNIConfig.h b/iocore/net/SSLSNIConfig.h
@@ -35,7 +35,7 @@
 #include <strings.h>
 #include <memory>
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 #include "SNIActionPerformer.h"
 #include "YamlSNIConfig.h"
 

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)/mgmt/libmgmt_p.la \
   $(top_builddir)/proxy/shared/libUglyLogStubs.a \
   $(top_builddir)/src/tscore/libtscore.la \
   $(top_builddir)/src/tscpp/util/libtscpputil.la \

diff --git a/iocore/net/quic/QUICConfig.h b/iocore/net/quic/QUICConfig.h
@@ -25,7 +25,7 @@
 
 #include <openssl/ssl.h>
 
-#include "ProxyConfig.h"
+#include "ConfigProcessor.h"
 #include "P_SSLCertLookup.h"
 
 class QUICConfigParams : public ConfigInfo

diff --git a/iocore/net/quic/test/event_processor_main.cc b/iocore/net/quic/test/event_processor_main.cc
@@ -30,7 +30,7 @@
 #include "tscore/Diags.h"
 
 #include "I_EventSystem.h"
-#include "RecordsConfig.h"
+#include "records/I_RecordsConfig.h"
 
 #include "QUICConfig.h"
 

diff --git a/iocore/net/quic/test/main.cc b/iocore/net/quic/test/main.cc
@@ -29,7 +29,7 @@
 #include "tscore/I_Layout.h"
 #include "tscore/Diags.h"
 
-#include "RecordsConfig.h"
+#include "records/I_RecordsConfig.h"
 #include "QUICGlobals.h"
 #include "QUICConfig.h"
 

diff --git a/mgmt/DerivativeMetrics.cc b/mgmt/DerivativeMetrics.cc
diff --git a/mgmt/DerivativeMetrics.h b/mgmt/DerivativeMetrics.h