You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2023/06/09 21:50:01 UTC
[trafficserver] branch master updated: Resolve circular dep in esi components (#9817)
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new c3fa888b5f Resolve circular dep in esi components (#9817)
c3fa888b5f is described below
commit c3fa888b5f491d10532c3bc8bda884c41e06f20e
Author: JosiahWI <41...@users.noreply.github.com>
AuthorDate: Fri Jun 9 16:49:54 2023 -0500
Resolve circular dep in esi components (#9817)
Some files in esi/fetcher depended on files in esi/lib and vice-versa.
I was able to move the shared dependencies into esi/common, and now
the dependency hierarchy is a little cleaner. This made it easy to
add the esi plugin and its tests to the CMake build, so this refactoring
is a precursor to bringing in those changes as well.
---
plugins/esi/Makefile.inc | 21 +++++++++++----------
plugins/esi/{lib => common}/Attribute.h | 0
plugins/esi/{lib => common}/ComponentBase.h | 0
plugins/esi/{lib => common}/DocNode.cc | 0
plugins/esi/{lib => common}/DocNode.h | 0
plugins/esi/{lib => common}/HttpHeader.h | 0
plugins/esi/{lib => common}/StringHash.h | 0
plugins/esi/{lib => common}/Utils.cc | 0
plugins/esi/{lib => common}/Utils.h | 0
plugins/esi/{lib => common}/gzip.cc | 0
plugins/esi/{lib => common}/gzip.h | 0
plugins/esi/esi.cc | 4 ++--
plugins/esi/fetcher/HttpDataFetcherImpl.cc | 4 ++--
plugins/esi/fetcher/HttpDataFetcherImpl.h | 4 ++--
plugins/esi/lib/EsiParser.h | 4 ++--
plugins/esi/lib/EsiProcessor.h | 6 +++---
16 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/plugins/esi/Makefile.inc b/plugins/esi/Makefile.inc
index 9e1bd76243..23bef0782f 100644
--- a/plugins/esi/Makefile.inc
+++ b/plugins/esi/Makefile.inc
@@ -16,6 +16,7 @@
ESI_CPPFLAGS = \
-I$(srcdir)/esi \
+ -I$(srcdir)/esi/common \
-I$(srcdir)/esi/lib \
-I$(srcdir)/esi/fetcher \
-I$(srcdir)/esi/test \
@@ -40,10 +41,10 @@ check_PROGRAMS += \
esi/gzip_test
esi_libesicore_la_SOURCES = \
- esi/lib/Attribute.h \
- esi/lib/ComponentBase.h \
- esi/lib/DocNode.cc \
- esi/lib/DocNode.h \
+ esi/common/Attribute.h \
+ esi/common/ComponentBase.h \
+ esi/common/DocNode.cc \
+ esi/common/DocNode.h \
esi/lib/EsiGunzip.cc \
esi/lib/EsiGunzip.h \
esi/lib/EsiGzip.cc \
@@ -55,18 +56,18 @@ esi_libesicore_la_SOURCES = \
esi/lib/Expression.cc \
esi/lib/Expression.h \
esi/lib/HandlerManager.h \
- esi/lib/HttpHeader.h \
+ esi/common/HttpHeader.h \
esi/lib/IncludeHandlerFactory.h \
esi/lib/SpecialIncludeHandler.h \
esi/lib/Stats.cc \
esi/lib/Stats.h \
- esi/lib/StringHash.h \
- esi/lib/Utils.cc \
- esi/lib/Utils.h \
+ esi/common/StringHash.h \
+ esi/common/Utils.cc \
+ esi/common/Utils.h \
esi/lib/Variables.cc \
esi/lib/Variables.h \
- esi/lib/gzip.cc \
- esi/lib/gzip.h
+ esi/common/gzip.cc \
+ esi/common/gzip.h
esi_libesicore_la_CPPFLAGS = $(ESI_CPPFLAGS)
esi_libesicore_la_CXXFLAGS = $(ESI_CXXFLAGS)
diff --git a/plugins/esi/lib/Attribute.h b/plugins/esi/common/Attribute.h
similarity index 100%
rename from plugins/esi/lib/Attribute.h
rename to plugins/esi/common/Attribute.h
diff --git a/plugins/esi/lib/ComponentBase.h b/plugins/esi/common/ComponentBase.h
similarity index 100%
rename from plugins/esi/lib/ComponentBase.h
rename to plugins/esi/common/ComponentBase.h
diff --git a/plugins/esi/lib/DocNode.cc b/plugins/esi/common/DocNode.cc
similarity index 100%
rename from plugins/esi/lib/DocNode.cc
rename to plugins/esi/common/DocNode.cc
diff --git a/plugins/esi/lib/DocNode.h b/plugins/esi/common/DocNode.h
similarity index 100%
rename from plugins/esi/lib/DocNode.h
rename to plugins/esi/common/DocNode.h
diff --git a/plugins/esi/lib/HttpHeader.h b/plugins/esi/common/HttpHeader.h
similarity index 100%
rename from plugins/esi/lib/HttpHeader.h
rename to plugins/esi/common/HttpHeader.h
diff --git a/plugins/esi/lib/StringHash.h b/plugins/esi/common/StringHash.h
similarity index 100%
rename from plugins/esi/lib/StringHash.h
rename to plugins/esi/common/StringHash.h
diff --git a/plugins/esi/lib/Utils.cc b/plugins/esi/common/Utils.cc
similarity index 100%
rename from plugins/esi/lib/Utils.cc
rename to plugins/esi/common/Utils.cc
diff --git a/plugins/esi/lib/Utils.h b/plugins/esi/common/Utils.h
similarity index 100%
rename from plugins/esi/lib/Utils.h
rename to plugins/esi/common/Utils.h
diff --git a/plugins/esi/lib/gzip.cc b/plugins/esi/common/gzip.cc
similarity index 100%
rename from plugins/esi/lib/gzip.cc
rename to plugins/esi/common/gzip.cc
diff --git a/plugins/esi/lib/gzip.h b/plugins/esi/common/gzip.h
similarity index 100%
rename from plugins/esi/lib/gzip.h
rename to plugins/esi/common/gzip.h
diff --git a/plugins/esi/esi.cc b/plugins/esi/esi.cc
index 8993a80887..5c5f4ba26a 100644
--- a/plugins/esi/esi.cc
+++ b/plugins/esi/esi.cc
@@ -36,8 +36,8 @@
#include "ts/experimental.h"
#include "ts/remap.h"
-#include "lib/Utils.h"
-#include "lib/gzip.h"
+#include "Utils.h"
+#include "gzip.h"
#include "EsiGzip.h"
#include "EsiGunzip.h"
#include "EsiProcessor.h"
diff --git a/plugins/esi/fetcher/HttpDataFetcherImpl.cc b/plugins/esi/fetcher/HttpDataFetcherImpl.cc
index 0c0d6fbeaf..0f41feb380 100644
--- a/plugins/esi/fetcher/HttpDataFetcherImpl.cc
+++ b/plugins/esi/fetcher/HttpDataFetcherImpl.cc
@@ -22,8 +22,8 @@
*/
#include "HttpDataFetcherImpl.h"
-#include "lib/Utils.h"
-#include "lib/gzip.h"
+#include "Utils.h"
+#include "gzip.h"
#include <arpa/inet.h>
#include <cstdlib>
diff --git a/plugins/esi/fetcher/HttpDataFetcherImpl.h b/plugins/esi/fetcher/HttpDataFetcherImpl.h
index fe9cdd2b96..d29b1d47c5 100644
--- a/plugins/esi/fetcher/HttpDataFetcherImpl.h
+++ b/plugins/esi/fetcher/HttpDataFetcherImpl.h
@@ -29,8 +29,8 @@
#include <netinet/in.h>
#include "ts/ts.h"
-#include "lib/StringHash.h"
-#include "lib/HttpHeader.h"
+#include "StringHash.h"
+#include "HttpHeader.h"
#include "HttpDataFetcher.h"
class HttpDataFetcherImpl : public HttpDataFetcher
diff --git a/plugins/esi/lib/EsiParser.h b/plugins/esi/lib/EsiParser.h
index eb856d59cc..41a77a9c23 100644
--- a/plugins/esi/lib/EsiParser.h
+++ b/plugins/esi/lib/EsiParser.h
@@ -25,8 +25,8 @@
#include <string>
-#include "lib/ComponentBase.h"
-#include "lib/DocNode.h"
+#include "ComponentBase.h"
+#include "DocNode.h"
class EsiParser : private EsiLib::ComponentBase
{
diff --git a/plugins/esi/lib/EsiProcessor.h b/plugins/esi/lib/EsiProcessor.h
index b591c82da4..a632c4f2b6 100644
--- a/plugins/esi/lib/EsiProcessor.h
+++ b/plugins/esi/lib/EsiProcessor.h
@@ -25,9 +25,9 @@
#include <string>
#include <map>
-#include "lib/ComponentBase.h"
-#include "lib/StringHash.h"
-#include "lib/DocNode.h"
+#include "ComponentBase.h"
+#include "StringHash.h"
+#include "DocNode.h"
#include "EsiParser.h"
#include "HttpDataFetcher.h"
#include "Variables.h"