Skip to content

Break the circular dependency between iocore and tscore. #9770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpeach merged 1 commit into from
Jun 5, 2023
Merged

Break the circular dependency between iocore and tscore. #9770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ lib/perl/lib/Apache/TS.pm
iocore/net/test_certlookup
iocore/net/test_UDPNet
iocore/net/test_libinknet
iocore/net/quic/test_QUIC*
iocore/net/quic/test_*
iocore/aio/test_AIO
iocore/eventsystem/test_IOBuffer
iocore/eventsystem/test_EventSystem
Expand Down
2 changes: 1 addition & 1 deletion include/tscore/MT_hashtable.h → iocore/net/quic/MTHashTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/****************************************************************************

MT_hashtable.h
MTHashTable.h

Multithread Safe Hash table implementation

Expand Down
14 changes: 14 additions & 0 deletions iocore/net/quic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ libquic_a_SOURCES = \
# Check Programs
#

check_PROGRAMS := test_MTHashTable

test_MTHashTable_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(abs_top_srcdir)/tests/include

test_MTHashTable_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@ @OPENSSL_LIBS@

test_MTHashTable_SOURCES = test_MTHashTable.cc

TESTS = $(check_PROGRAMS)

#
Expand Down
2 changes: 1 addition & 1 deletion iocore/net/quic/QUICConnectionTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include "QUICTypes.h"
#include "QUICConnection.h"
#include "tscore/MT_hashtable.h"
#include "MTHashTable.h"

class QUICConnectionTable
{
Expand Down
10 changes: 5 additions & 5 deletions src/tscore/unit_tests/test_MT_hashtable.cc → iocore/net/quic/test_MTHashTable.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
#include <cstdint>
#include "tscore/ink_platform.h"
#include "P_EventSystem.h"
#include "tscore/MT_hashtable.h"
#include "I_Lock.h"

#define CATCH_CONFIG_MAIN
#include <catch.hpp>

#include "P_EventSystem.h"
#include "MTHashTable.h"

// -------------
// --- TESTS ---
// -------------
Expand Down
5 changes: 2 additions & 3 deletions src/tscore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ add_executable(test_tscore
unit_tests/test_IntrusivePtr.cc
unit_tests/test_List.cc
unit_tests/test_MMH.cc
unit_tests/test_MT_hashtable.cc
unit_tests/test_ParseRules.cc
unit_tests/test_PluginUserArgs.cc
unit_tests/test_PriorityQueue.cc
Expand All @@ -140,7 +139,7 @@ add_executable(test_tscore
unit_tests/test_scoped_resource.cc
unit_tests/unit_test_main.cc
)
target_link_libraries(test_tscore PRIVATE tscore inkevent records_p libswoc)
target_include_directories(test_tscore PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/iocore/eventsystem ${CATCH_INCLUDE_DIR})
target_link_libraries(test_tscore PRIVATE tscore libswoc)
target_include_directories(test_tscore PRIVATE ${CMAKE_SOURCE_DIR}/include ${CATCH_INCLUDE_DIR})

install(TARGETS tscore)
6 changes: 2 additions & 4 deletions src/tscore/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ TESTS = $(check_PROGRAMS)
lib_LTLIBRARIES = libtscore.la

AM_CPPFLAGS += \
$(iocore_include_dirs) \
@SWOC_INCLUDES@ \
@SWOC_INCLUDES@ \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/lib \
$(TS_INCLUDES) \
Expand Down Expand Up @@ -164,7 +163,7 @@ test_tscore_CPPFLAGS = $(AM_CPPFLAGS)\
-I$(abs_top_srcdir)/tests/include

test_tscore_CXXFLAGS = -Wno-array-bounds $(AM_CXXFLAGS)
test_tscore_LDADD = libtscore.la $(top_builddir)/src/tscpp/util/libtscpputil.la $(top_builddir)/iocore/eventsystem/libinkevent.a @SWOC_LIBS@ @OPENSSL_LIBS@
test_tscore_LDADD = libtscore.la $(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @OPENSSL_LIBS@
test_tscore_SOURCES = \
unit_tests/unit_test_main.cc \
unit_tests/test_AcidPtr.cc \
Expand All @@ -183,7 +182,6 @@ test_tscore_SOURCES = \
unit_tests/test_IntrusivePtr.cc \
unit_tests/test_layout.cc \
unit_tests/test_List.cc \
unit_tests/test_MT_hashtable.cc \
unit_tests/test_ParseRules.cc \
unit_tests/test_PluginUserArgs.cc \
unit_tests/test_PriorityQueue.cc \
Expand Down