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 2021/08/06 08:31:15 UTC

[celix] 01/01: Merge pull request #353 from apache/feature/pubsub-interceptor-fix

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 3d8a89fdfffcd543a7617b68b0c3d70f5b24e50f
Merge: 25c890b 53177ff
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri Aug 6 10:31:09 2021 +0200

    Merge pull request #353 from apache/feature/pubsub-interceptor-fix
    
    Feature/pubsub interceptor fix

 .github/workflows/celix_etcdlib.yml                |   2 +-
 .github/workflows/celix_promise.yml                |   2 +-
 .github/workflows/coverage.yml                     |   2 +-
 .github/workflows/ubuntu-nightly.yml               |   2 +-
 .github/workflows/ubuntu.yml                       |   2 +-
 CMakeLists.txt                                     |   3 +-
 bundles/cxx_remote_services/CMakeLists.txt         |   3 +-
 bundles/cxx_remote_services/admin/CMakeLists.txt   |   1 -
 .../cxx_remote_services/admin/gtest/CMakeLists.txt |   1 -
 .../discovery_configured/CMakeLists.txt            |   2 +-
 .../discovery_configured/gtest/CMakeLists.txt      |   2 -
 .../cxx_remote_services/integration/CMakeLists.txt |  24 +-
 .../integration/gtest/CMakeLists.txt               |  17 +-
 bundles/cxx_remote_services/rsa_spi/CMakeLists.txt |   2 -
 .../topology_manager/CMakeLists.txt                |   3 +-
 bundles/http_admin/http_admin/CMakeLists.txt       |   1 +
 bundles/logging/log_admin/CMakeLists.txt           |   1 +
 bundles/logging/log_service_v2/CMakeLists.txt      |   2 +
 .../log_writers/syslog_writer/CMakeLists.txt       |   1 +
 bundles/pubsub/CMakeLists.txt                      |   6 +-
 bundles/pubsub/examples/CMakeLists.txt             | 156 ++++-----
 .../include/first_interceptor_private.h            |   8 +-
 .../include/second_interceptor_private.h           |   8 +-
 .../pubsub/interceptors/src/first_interceptor.c    |   8 +-
 .../pubsub/interceptors/src/second_interceptor.c   |   8 +-
 .../pubsub/{test => integration}/CMakeLists.txt    | 381 ++++++++++++---------
 .../gtest/PubSubEndpointIntegrationTestSuite.cc}   |   0
 .../gtest/PubSubIntegrationTestSuite.cc}           |   0
 .../gtest/PubSubInterceptorTestSuite.cc            | 235 +++++++++++++
 .../PubSubTopicAndScopeIntegrationTestSuite.cc     |   0
 .../gtest}/loopback_activator.c                    |   0
 .../pubsub/{test/test => integration/gtest}/msg.h  |   0
 .../gtest}/receive_count_service.h                 |   0
 .../gtest}/serializer_activator.cc                 |   0
 .../test => integration/gtest}/sut_activator.c     |  11 +-
 .../gtest}/sut_endpoint_activator.c                |   0
 .../test => integration/gtest}/tst_activator.c     |   6 +-
 .../gtest}/tst_endpoint_activator.c                |   0
 .../meta_data/deadlock.scope.properties            |   0
 .../meta_data/deadlock.scope2.properties           |   0
 .../{test => integration}/meta_data/msg.descriptor |   0
 .../meta_data/ping.properties                      |   0
 .../meta_data/ping2.properties                     |   0
 .../meta_data/ping3.properties                     |   0
 .../meta_data/pong2.properties                     |   0
 .../meta_data/pong3.properties                     |   0
 .../pstm_deadlock_test/test_runner.cc              |   0
 bundles/pubsub/mock/CMakeLists.txt                 |  40 ---
 bundles/pubsub/mock/api/pubsub/publisher_mock.h    |  44 ---
 bundles/pubsub/mock/src/publisher_mock.cc          |  57 ---
 bundles/pubsub/mock/tst/pubsubmock_test.cc         |  76 ----
 bundles/pubsub/mock/tst/run_tests.cc               |  25 --
 bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt  |  22 +-
 .../v1/src/pubsub_tcp_topic_receiver.c             |  54 ++-
 .../v1/src/pubsub_tcp_topic_sender.c               |  87 ++---
 bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt  |   2 +-
 .../pubsub_admin_tcp/v2/src/pubsub_tcp_handler.c   |   9 +-
 .../v2/src/pubsub_tcp_topic_receiver.c             | 205 ++++++-----
 .../v2/src/pubsub_tcp_topic_sender.c               |   9 +-
 bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt  |   2 +-
 .../pubsub_admin_websocket/v1/CMakeLists.txt       |  20 +-
 .../v1/src/pubsub_websocket_topic_receiver.c       |   5 +-
 .../pubsub_admin_websocket/v2/CMakeLists.txt       |   2 +-
 .../v2/src/pubsub_websocket_common.h               |   2 +-
 .../v2/src/pubsub_websocket_topic_receiver.c       | 210 ++++++------
 .../v2/src/pubsub_websocket_topic_sender.c         |  18 +-
 bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt  |  20 +-
 .../v1/src/pubsub_zmq_topic_receiver.c             |  98 +-----
 .../v1/src/pubsub_zmq_topic_sender.c               | 232 ++++++-------
 bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt  |   2 +-
 .../v2/src/pubsub_zmq_topic_receiver.c             | 183 +++++-----
 .../v2/src/pubsub_zmq_topic_sender.c               |  15 +-
 .../pubsub/pubsub_api/include/pubsub/publisher.h   |  14 +-
 .../pubsub/pubsub_api/include/pubsub/subscriber.h  |  19 +-
 bundles/pubsub/pubsub_discovery/CMakeLists.txt     |   2 +-
 .../pubsub_protocol_wire_v1/CMakeLists.txt         |   2 +-
 .../pubsub_protocol_wire_v2/CMakeLists.txt         |   2 +-
 .../pubsub_serializer_avrobin/CMakeLists.txt       |   2 +-
 .../pubsub_serializer_avrobin/gtest/CMakeLists.txt |   1 -
 .../pubsub/pubsub_serializer_json/CMakeLists.txt   |   2 +-
 .../pubsub_serializer_json/gtest/CMakeLists.txt    |   1 -
 bundles/pubsub/pubsub_spi/gtest/CMakeLists.txt     |   1 -
 bundles/pubsub/pubsub_spi/include/pubsub_admin.h   |  14 +-
 .../pubsub_spi/include/pubsub_admin_metrics.h      |   7 +
 .../pubsub/pubsub_spi/include/pubsub_interceptor.h |  83 ++++-
 .../include/pubsub_interceptors_handler.h          |  54 ++-
 .../pubsub/pubsub_spi/include/pubsub_listeners.h   |   9 +-
 .../include/pubsub_message_serialization_marker.h  |   7 +
 .../include/pubsub_message_serialization_service.h |   7 +
 .../pubsub/pubsub_spi/include/pubsub_protocol.h    |   7 +
 .../pubsub/pubsub_spi/include/pubsub_serializer.h  |   7 +
 .../pubsub_spi/src/pubsub_interceptors_handler.c   | 141 ++++----
 .../pubsub/pubsub_topology_manager/CMakeLists.txt  |   2 +-
 .../src/pubsub_topology_manager.c                  |   9 +-
 bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt   |   1 -
 .../src/PubSubSerializationHandlerTestSuite.cc     |  51 ++-
 .../pubsub_utils/src/pubsub_serializer_handler.c   |   6 +
 bundles/shell/remote_shell/CMakeLists.txt          |   1 +
 bundles/shell/shell/CMakeLists.txt                 |   3 +
 bundles/shell/shell_bonjour/CMakeLists.txt         |   1 +
 bundles/shell/shell_tui/CMakeLists.txt             |   1 +
 bundles/shell/shell_wui/CMakeLists.txt             |   1 +
 cmake/AddGTest.cmake                               |   2 +-
 cmake/CelixConfig.cmake                            |  11 +
 cmake/cmake_celix/BundlePackaging.cmake            | 109 +++---
 cmake/cmake_celix/Generic.cmake                    |  13 +-
 documents/cmake_commands/README.md                 |  28 ++
 examples/CMakeLists.txt                            |   2 +-
 libs/framework/CMakeLists.txt                      |   2 +
 libs/promises/CMakeLists.txt                       |   2 -
 libs/promises/gtest/CMakeLists.txt                 |   1 -
 111 files changed, 1578 insertions(+), 1389 deletions(-)