You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2020/06/30 16:31:13 UTC
[celix] 02/02: Merge remote-tracking branch 'remotes/origin/master'
into bugfix/pstm_deadlock_introduce_use_counts
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch bugfix/pstm_deadlock_work_outside_of_locks
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 48af5e5ee37c33e09bf8a6b67c9d8edf1b750489
Merge: 2411b40 a11b4c9
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Tue Jun 30 16:40:02 2020 +0200
Merge remote-tracking branch 'remotes/origin/master' into bugfix/pstm_deadlock_introduce_use_counts
# Conflicts:
# bundles/pubsub/test/CMakeLists.txt
bundles/pubsub/examples/CMakeLists.txt | 6 +-
.../src/pubsub_psa_tcp_constants.h | 12 ++++
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 16 ++---
.../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 12 ++--
.../src/pubsub_tcp_topic_receiver.c | 11 +++-
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 8 ++-
.../src/pubsub_psa_udpmc_constants.h | 11 ++++
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 15 ++---
.../src/pubsub_udpmc_topic_receiver.c | 11 +++-
.../src/pubsub_udpmc_topic_sender.c | 17 ++++-
.../src/pubsub_psa_websocket_constants.h | 6 ++
.../src/pubsub_websocket_admin.c | 15 ++---
.../src/pubsub_websocket_topic_receiver.c | 9 ++-
.../src/pubsub_psa_zmq_constants.h | 12 ++++
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 41 ++++++++----
.../src/pubsub_zmq_topic_receiver.c | 13 +++-
bundles/pubsub/pubsub_spi/CMakeLists.txt | 7 +-
bundles/pubsub/pubsub_spi/gtest/CMakeLists.txt | 25 +++++++
.../gtest/src/PubSubEndpointUtilsTestSuite.cc | 47 +++++++++++++
.../pubsub/pubsub_spi/include/pubsub_endpoint.h | 16 ++++-
bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 3 +-
.../pubsub/pubsub_spi/src/pubsub_endpoint_match.c | 11 ++++
bundles/pubsub/pubsub_utils/include/pubsub_utils.h | 10 +++
bundles/pubsub/pubsub_utils/src/pubsub_utils.c | 15 +++++
bundles/pubsub/test/CMakeLists.txt | 2 +-
bundles/pubsub/test/test/test_runner.cc | 76 +++++++++++++++++-----
bundles/pubsub/test/test/tst_activator.c | 6 +-
.../{tst_activator.c => tst_endpoint_activator.c} | 67 +++++--------------
libs/utils/gtest/src/LogUtilsTestSuite.cc | 2 -
29 files changed, 371 insertions(+), 131 deletions(-)
diff --cc bundles/pubsub/test/CMakeLists.txt
index 7b8dd5f,80859fa..8b7e061
--- a/bundles/pubsub/test/CMakeLists.txt
+++ b/bundles/pubsub/test/CMakeLists.txt
@@@ -145,43 -123,8 +145,43 @@@ if (BUILD_PUBSUB_PSA_UDP_MC
target_link_libraries(pubsub_udpmc_tests PRIVATE Celix::pubsub_api ${CppUTest_LIBRARIES} Jansson Celix::dfi)
target_include_directories(pubsub_udpmc_tests SYSTEM PRIVATE ${CppUTest_INCLUDE_DIR} test)
- add_test(NAME pubsub_udpmc_tests COMMAND pubsub_udpmc_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_udpmc_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_udpmc_tests_cov SCAN_DIR ..)
+ add_celix_container(pstm_deadlock_udpmc_test
+ USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
+ LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/pstm_deadlock_test/test_runner.cc
+ DIR ${CMAKE_CURRENT_BINARY_DIR}
+ PROPERTIES
+ LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
+ BUNDLES
+ Celix::pubsub_serializer_json
+ Celix::pubsub_topology_manager
+ Celix::pubsub_admin_zmq
+ Celix::pubsub_protocol_wire_v2
+ Celix::shell
+ Celix::shell_tui
+ )
+ target_compile_definitions(pstm_deadlock_udpmc_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\")
+ target_link_libraries(pstm_deadlock_udpmc_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Jansson Celix::dfi ZMQ::lib CZMQ::lib)
+ target_include_directories(pstm_deadlock_udpmc_test SYSTEM PRIVATE pstm_deadlock_udpmc_test)
+
+ #Note we do not link to bundles, as result (to ensure a bundle zip file is created) an dependency on the bundle is needed.
+ add_dependencies(pstm_deadlock_udpmc_test pubsub_deadlock_sut_bundle)
+
+ #Framework "bundle" has no cache dir. Default as "cache dir" the cwd is used.
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_udpmc_test/META-INF/descriptors/msg.descriptor COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_udpmc_test/META-INF/topics/pub/deadlock.properties COPYONLY)
+
+ add_test(NAME pstm_deadlock_udpmc_test COMMAND pstm_deadlock_udpmc_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_udpmc_test,CONTAINER_LOC>)
+ setup_target_for_coverage(pstm_deadlock_udpmc_test SCAN_DIR ..)
+
+ #TCP Endpoint test is disabled because the test is not stable when running on Travis
+ if (ENABLE_PUBSUB_PSA_TCP_ENDPOINT_TEST)
+ add_test(NAME pubsub_tcp_endpoint_tests COMMAND pubsub_tcp_endpoint_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_endpoint_tests,CONTAINER_LOC>)
+ setup_target_for_coverage(pubsub_tcp_endpoint_tests SCAN_DIR ..)
+ endif()
+
+ #TODO fix issues with UDPMC and reanble test again
+ #add_test(NAME pubsub_udpmc_tests COMMAND pubsub_udpmc_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_udpmc_tests,CONTAINER_LOC>)
- #setup_target_for_coverage(pubsub_udpmc_tests_cov pubsub_udpmc_tests ${CMAKE_BINARY_DIR}/coverage/pubsub_udpmc_tests/pubsub_udpmc_tests ..)
++ #setup_target_for_coverage(pubsub_udpmc_tests SCAN_DIR ..)
endif()
if (BUILD_PUBSUB_PSA_TCP)