You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2020/03/05 12:16:56 UTC
[celix] branch develop updated (8c956d8 -> 78ef99c)
This is an automated email from the ASF dual-hosted git repository.
abroekhuis pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git.
from 8c956d8 Refactors curl read and add code for manual unrolling. (#160)
add 1a1ffe3 Added protocol service API and wire protocol implementation to be used by admin (sender/receiver). Actual used service is matched, similar to serializer.
add 7b4554c Changed signature of function
add c9f331e Fixed incorrect function argument.
add 4a1b587 Fixed Curl includes and CPPuTest usage in cmake file Updated pubsub code to compile on OSX as well Added CMake options to enable/disable PubSub admins
add f251a6a Fixed incorrect else in defines
add a908658 Added missing include
add ec6daaf Add missing include
add 9ce7c8a Add missing include
add 4d2717a Fixed integration tests for pubsub. Fixed incorrect free in zmq sender
add 8fdf2d3 Fixed incorrect param order for matching. Fixed zero copy sending for zmq.
add 5db95a4 Changed linked libs
add 7e96b4e Moves part of the wire protocol as a static library so that the gtest do not derirectly use the bundle lib (with automatically adjusted rpath)
add b02379b Removes usage of non existing dynMessage_parseAvpr function.
add 70d1c66 Added api doc
add b6605cf Disabled zero copy test for zmq.
new 78ef99c Merge pull request #156 from apache/feature/pubsubadmin_protocol
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 7 +-
CMakeLists.txt | 7 +
bundles/http_admin/civetweb/CMakeLists.txt | 2 +
bundles/http_admin/test/CMakeLists.txt | 4 +-
bundles/pubsub/CMakeLists.txt | 31 ++-
bundles/pubsub/examples/CMakeLists.txt | 296 ++++++++++----------
bundles/pubsub/examples/pubsub/CMakeLists.txt | 4 +-
.../publisher/private/src/pubsub_publisher.c | 4 +-
.../private/include/pubsub_websocket_private.h | 2 +-
.../private/src/pubsub_websocket_example.c | 4 +-
.../private/include/pubsub_subscriber_private.h | 2 +-
.../subscriber/private/src/pubsub_subscriber.c | 14 +-
bundles/pubsub/mock/CMakeLists.txt | 2 +-
bundles/pubsub/mock/src/publisher_mock.cc | 4 +-
bundles/pubsub/mock/tst/pubsubmock_test.cc | 5 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 18 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 8 +-
.../src/pubsub_tcp_topic_receiver.c | 2 +-
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 4 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 18 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 8 +-
.../src/pubsub_udpmc_topic_receiver.c | 2 +-
.../src/pubsub_udpmc_topic_sender.c | 4 +-
.../pubsub_admin_websocket/src/psa_activator.c | 14 -
.../src/pubsub_websocket_admin.c | 46 +--
.../src/pubsub_websocket_admin.h | 10 +-
.../src/pubsub_websocket_topic_receiver.c | 3 +-
.../src/pubsub_websocket_topic_receiver.h | 4 -
.../src/pubsub_websocket_topic_sender.c | 4 +-
.../src/pubsub_websocket_topic_sender.h | 5 -
bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 78 +++---
.../pubsub/pubsub_admin_zmq/src/psa_activator.c | 16 ++
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 164 +++++++++--
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 11 +-
.../pubsub_admin_zmq/src/pubsub_zmq_common.c | 132 ---------
.../pubsub_admin_zmq/src/pubsub_zmq_common.h | 59 ----
.../src/pubsub_zmq_topic_receiver.c | 197 ++++++++-----
.../src/pubsub_zmq_topic_receiver.h | 7 +-
.../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 121 +++++---
.../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.h | 3 +
.../pubsub/pubsub_api/include/pubsub/publisher.h | 26 +-
.../pubsub/pubsub_api/include/pubsub/subscriber.h | 40 ++-
.../pubsub_discovery/src/pubsub_discovery_impl.c | 14 +-
.../pubsub/pubsub_protocol_wire_v1/CMakeLists.txt | 43 +++
.../pubsub_protocol_wire_v1/gtest/CMakeLists.txt | 26 +-
.../gtest/src/PS_WP_tests.cc | 230 +++++++++++++++
.../pubsub_protocol_wire_v1/gtest/src/main.cc} | 12 +-
.../src/ps_wire_protocol_activator.c | 64 +++++
.../src/pubsub_wire_protocol_common.c | 72 +++++
.../src/pubsub_wire_protocol_common.h | 27 +-
.../src/pubsub_wire_protocol_impl.c | 309 +++++++++++++++++++++
.../src/pubsub_wire_protocol_impl.h | 50 ++++
.../src/pubsub_avrobin_serializer_impl.c | 5 +-
.../src/pubsub_serializer_impl.c | 5 +-
bundles/pubsub/pubsub_spi/include/pubsub_admin.h | 8 +-
.../pubsub/pubsub_spi/include/pubsub_constants.h | 5 +-
.../pubsub/pubsub_spi/include/pubsub_endpoint.h | 3 +-
.../pubsub/pubsub_spi/include/pubsub_protocol.h | 144 ++++++++++
bundles/pubsub/pubsub_spi/include/pubsub_utils.h | 12 +-
bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 15 +-
bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c | 103 ++++++-
.../src/pubsub_topology_manager.c | 33 ++-
.../src/pubsub_topology_manager.h | 1 +
bundles/pubsub/test/CMakeLists.txt | 171 ++++++------
bundles/pubsub/test/test/loopback_activator.c | 6 +-
bundles/pubsub/test/test/sut_activator.c | 5 +-
bundles/pubsub/test/test/sut_endpoint_activator.c | 3 +-
bundles/pubsub/test/test/tst_activator.c | 4 +-
bundles/pubsub/test/test/tst_endpoint_activator.c | 4 +-
.../remote_service_admin_dfi/test/CMakeLists.txt | 2 +-
.../remote_service_admin_shm/CMakeLists.txt | 10 +-
.../topology_manager/CMakeLists.txt | 4 +-
.../topology_manager/tms_tst/CMakeLists.txt | 2 +-
.../topology_manager/tms_tst/bundle/CMakeLists.txt | 2 +-
.../tms_tst/disc_mock/CMakeLists.txt | 2 +-
bundles/shell/shell/test/CMakeLists.txt | 2 +-
cmake/AddGTest.cmake | 51 ++++
libs/dfi/CMakeLists.txt | 3 +-
libs/framework/CMakeLists.txt | 6 +-
libs/utils/CMakeLists.txt | 2 +-
libs/utils/include/celix_properties.h | 2 +
libs/utils/private/test/properties_test.cpp | 6 +
libs/utils/src/properties.c | 15 +
.../bundles/config_admin/CMakeLists.txt | 2 +-
84 files changed, 2042 insertions(+), 835 deletions(-)
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_common.c
delete mode 100644 bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_common.h
create mode 100644 bundles/pubsub/pubsub_protocol_wire_v1/CMakeLists.txt
copy cmake/celix_project/ApacheRat.cmake => bundles/pubsub/pubsub_protocol_wire_v1/gtest/CMakeLists.txt (58%)
create mode 100644 bundles/pubsub/pubsub_protocol_wire_v1/gtest/src/PS_WP_tests.cc
copy bundles/{shell/shell/src/quit_command.c => pubsub/pubsub_protocol_wire_v1/gtest/src/main.cc} (72%)
create mode 100644 bundles/pubsub/pubsub_protocol_wire_v1/src/ps_wire_protocol_activator.c
create mode 100644 bundles/pubsub/pubsub_protocol_wire_v1/src/pubsub_wire_protocol_common.c
copy libs/framework/include/celix_framework_factory.h => bundles/pubsub/pubsub_protocol_wire_v1/src/pubsub_wire_protocol_common.h (57%)
create mode 100644 bundles/pubsub/pubsub_protocol_wire_v1/src/pubsub_wire_protocol_impl.c
create mode 100644 bundles/pubsub/pubsub_protocol_wire_v1/src/pubsub_wire_protocol_impl.h
create mode 100644 bundles/pubsub/pubsub_spi/include/pubsub_protocol.h
create mode 100644 cmake/AddGTest.cmake
[celix] 01/01: Merge pull request #156 from
apache/feature/pubsubadmin_protocol
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abroekhuis pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 78ef99c21c1a791c800a68eb7b753401b1a13fc3
Merge: 8c956d8 b6605cf
Author: Alexander Broekhuis <ab...@apache.org>
AuthorDate: Thu Mar 5 13:16:48 2020 +0100
Merge pull request #156 from apache/feature/pubsubadmin_protocol
Added protocol service API and wire protocol implementation to be used by PubSub admins.
.travis.yml | 7 +-
CMakeLists.txt | 7 +
bundles/http_admin/civetweb/CMakeLists.txt | 2 +
bundles/http_admin/test/CMakeLists.txt | 4 +-
bundles/pubsub/CMakeLists.txt | 31 ++-
bundles/pubsub/examples/CMakeLists.txt | 296 ++++++++++----------
bundles/pubsub/examples/pubsub/CMakeLists.txt | 4 +-
.../publisher/private/src/pubsub_publisher.c | 4 +-
.../private/include/pubsub_websocket_private.h | 2 +-
.../private/src/pubsub_websocket_example.c | 4 +-
.../private/include/pubsub_subscriber_private.h | 2 +-
.../subscriber/private/src/pubsub_subscriber.c | 14 +-
bundles/pubsub/mock/CMakeLists.txt | 2 +-
bundles/pubsub/mock/src/publisher_mock.cc | 4 +-
bundles/pubsub/mock/tst/pubsubmock_test.cc | 5 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 18 +-
.../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 8 +-
.../src/pubsub_tcp_topic_receiver.c | 2 +-
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 4 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 18 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 8 +-
.../src/pubsub_udpmc_topic_receiver.c | 2 +-
.../src/pubsub_udpmc_topic_sender.c | 4 +-
.../pubsub_admin_websocket/src/psa_activator.c | 14 -
.../src/pubsub_websocket_admin.c | 46 +--
.../src/pubsub_websocket_admin.h | 10 +-
.../src/pubsub_websocket_topic_receiver.c | 3 +-
.../src/pubsub_websocket_topic_receiver.h | 4 -
.../src/pubsub_websocket_topic_sender.c | 4 +-
.../src/pubsub_websocket_topic_sender.h | 5 -
bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 78 +++---
.../pubsub/pubsub_admin_zmq/src/psa_activator.c | 16 ++
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 164 +++++++++--
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 11 +-
.../pubsub_admin_zmq/src/pubsub_zmq_common.c | 132 ---------
.../pubsub_admin_zmq/src/pubsub_zmq_common.h | 59 ----
.../src/pubsub_zmq_topic_receiver.c | 197 ++++++++-----
.../src/pubsub_zmq_topic_receiver.h | 7 +-
.../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 121 +++++---
.../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.h | 3 +
.../pubsub/pubsub_api/include/pubsub/publisher.h | 26 +-
.../pubsub/pubsub_api/include/pubsub/subscriber.h | 40 ++-
.../pubsub_discovery/src/pubsub_discovery_impl.c | 14 +-
.../pubsub/pubsub_protocol_wire_v1/CMakeLists.txt | 43 +++
.../pubsub_protocol_wire_v1/gtest}/CMakeLists.txt | 30 +-
.../gtest/src/PS_WP_tests.cc | 230 +++++++++++++++
.../pubsub_protocol_wire_v1/gtest/src/main.cc | 26 ++
.../src/ps_wire_protocol_activator.c | 64 +++++
.../src/pubsub_wire_protocol_common.c | 72 +++++
.../src/pubsub_wire_protocol_common.h} | 37 +--
.../src/pubsub_wire_protocol_impl.c | 309 +++++++++++++++++++++
.../src/pubsub_wire_protocol_impl.h | 50 ++++
.../src/pubsub_avrobin_serializer_impl.c | 5 +-
.../src/pubsub_serializer_impl.c | 5 +-
bundles/pubsub/pubsub_spi/include/pubsub_admin.h | 8 +-
.../pubsub/pubsub_spi/include/pubsub_constants.h | 5 +-
.../pubsub/pubsub_spi/include/pubsub_endpoint.h | 3 +-
.../pubsub/pubsub_spi/include/pubsub_protocol.h | 144 ++++++++++
bundles/pubsub/pubsub_spi/include/pubsub_utils.h | 12 +-
bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c | 15 +-
bundles/pubsub/pubsub_spi/src/pubsub_utils_match.c | 103 ++++++-
.../src/pubsub_topology_manager.c | 33 ++-
.../src/pubsub_topology_manager.h | 1 +
bundles/pubsub/test/CMakeLists.txt | 171 ++++++------
bundles/pubsub/test/test/loopback_activator.c | 6 +-
bundles/pubsub/test/test/sut_activator.c | 5 +-
bundles/pubsub/test/test/sut_endpoint_activator.c | 3 +-
bundles/pubsub/test/test/tst_activator.c | 4 +-
bundles/pubsub/test/test/tst_endpoint_activator.c | 4 +-
.../remote_service_admin_dfi/test/CMakeLists.txt | 2 +-
.../remote_service_admin_shm/CMakeLists.txt | 10 +-
.../topology_manager/CMakeLists.txt | 4 +-
.../topology_manager/tms_tst/CMakeLists.txt | 2 +-
.../topology_manager/tms_tst/bundle/CMakeLists.txt | 2 +-
.../tms_tst/disc_mock/CMakeLists.txt | 2 +-
bundles/shell/shell/test/CMakeLists.txt | 2 +-
cmake/AddGTest.cmake | 51 ++++
libs/dfi/CMakeLists.txt | 3 +-
libs/framework/CMakeLists.txt | 6 +-
libs/utils/CMakeLists.txt | 2 +-
libs/utils/include/celix_properties.h | 2 +
libs/utils/private/test/properties_test.cpp | 6 +
libs/utils/src/properties.c | 15 +
.../bundles/config_admin/CMakeLists.txt | 2 +-
84 files changed, 2070 insertions(+), 835 deletions(-)