This is an automated email from the ASF dual-hosted git repository. abroekhuis pushed a commit to branch feature/support_multiple_build_types in repository https://gitbox.apache.org/repos/asf/celix.git
commit 73e51ae5b3e189135273b6ecb1c989228ff7b6c8 Merge: dc49710 23a9f61 Author: Alexander Broekhuis <[email protected]> AuthorDate: Thu May 7 08:55:42 2020 +0200 Merge branch 'develop' of github.com:apache/celix into feature/support_multiple_build_types * 'develop' of github.com:apache/celix: (30 commits) Feature/refactored logging service (#209) Updates first svc id to 1 Adds thread protection to the use of zmq socket. Fixes an potential race conditation issues with the creation of service ids. Fix data race in get/set bundle state (#214) Adds missing lock Removing libffi flags from macos build config Removing installing libffi with brew from the OSX build. Lets see if the provided libffi for OSX is good enough. Changes FindFFI so that the dir /usr/local/opt/libffi has prefernce over /usr/lib for finding libffi. Fix crash in pub using ip with post fix Fix review comment Fix printf error Fix test for OSX Avoid segfault when stopping bundle Fix TCP endpoint handling Changed freeSerializeMsg behaviour for pubsub serialization. Get proper backtraces when using asan Adds link to blocking issue to enable upload to coveralls Disables last step of the coverage workflow. Will be enabled when Celix project can configure the thresholds. Removes unused c thread pool and add coverage setup for filter tests ... .github/workflows/build.yml | 90 -- .github/workflows/coverage.yml | 49 + .github/workflows/macos.yml | 38 + .github/workflows/ubuntu.yml | 76 ++ .travis.yml | 6 +- bundles/deployment_admin/CMakeLists.txt | 2 +- bundles/deployment_admin/src/deployment_admin.c | 26 +- bundles/deployment_admin/src/log_sync.c | 8 +- bundles/device_access/device_access/CMakeLists.txt | 2 - .../device_access/device_access/src/activator.c | 15 +- .../device_access/src/device_manager.c | 47 +- .../device_access/src/device_manager.h | 4 +- .../device_access/src/driver_matcher.c | 17 +- bundles/device_access/example/CMakeLists.txt | 2 +- .../example/base_driver/src/activator.c | 6 +- .../example/consuming_driver/src/activator.c | 3 +- .../example/refining_driver/src/activator.c | 3 +- bundles/http_admin/test/CMakeLists.txt | 2 +- bundles/logging/CMakeLists.txt | 15 +- bundles/logging/README.md | 53 + .../logging/log_admin}/CMakeLists.txt | 29 +- .../log_writer => log_admin/gtest}/CMakeLists.txt | 20 +- .../log_admin/gtest/src/LogAdminTestSuite.cc | 446 ++++++++ bundles/logging/log_admin/src/celix_log_admin.c | 659 ++++++++++++ bundles/logging/log_admin/src/celix_log_admin.h | 76 ++ .../log_admin/src/celix_log_admin_activator.c | 38 + bundles/logging/log_helper/CMakeLists.txt | 46 + .../gtest}/CMakeLists.txt | 19 +- .../log_helper/gtest/src/LogHelperTestSuite.cc | 101 ++ .../logging/log_helper/include/celix_log_helper.h | 114 ++ .../include_v2}/log_helper.h | 0 bundles/logging/log_helper/src/celix_log_helper.c | 169 +++ .../{log_service => log_helper}/src/log_helper.c | 0 bundles/logging/log_service/CMakeLists.txt | 60 -- bundles/logging/log_service/README.md | 19 - .../logging/log_service_api}/CMakeLists.txt | 28 +- .../log_service_api/include/celix_log_control.h | 59 ++ .../log_service_api/include/celix_log_service.h | 118 +++ .../log_service_api/include/celix_log_sink.h | 60 ++ .../include_v2}/log_entry.h | 0 .../include_v2}/log_listener.h | 0 .../include_v2}/log_reader_service.h | 0 .../include_v2}/log_service.h | 0 .../CMakeLists.txt | 45 +- .../src/deprecated_log_writer_stdout_activator.c | 36 + .../{log_service => log_service_v2}/src/log.c | 2 +- .../{log_service => log_service_v2}/src/log.h | 0 .../src/log_entry.c | 0 .../src/log_factory.c | 0 .../src/log_factory.h | 0 .../src/log_reader_service_impl.c | 0 .../src/log_reader_service_impl.h | 0 .../src/log_service_activator.c | 1 - .../src/log_service_impl.c | 0 .../src/log_service_impl.h | 0 bundles/logging/log_writer/README.md | 13 - .../log_writer/include/celix_log_writer.h | 33 - .../log_writer/src/log_writer_activator.c | 65 -- .../log_writer_stdout/src/log_writer_stdout.c | 50 - .../log_writer/log_writer_syslog/CMakeLists.txt | 49 - .../private/src/log_writer_syslog.c | 68 -- .../logging/log_writers}/CMakeLists.txt | 6 +- bundles/logging/log_writers/README.md | 11 + .../log_writers/syslog_writer}/CMakeLists.txt | 22 +- .../syslog_writer}/gtest/CMakeLists.txt | 23 +- .../gtest/src/SyslogWriterTestSuite.cc | 100 ++ .../src/celix_syslog_writer_activator.c | 93 ++ bundles/pubsub/examples/CMakeLists.txt | 14 +- .../pubsub/pubsub_admin_tcp/src/psa_activator.c | 10 +- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c | 12 +- .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h | 4 +- .../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 140 +-- .../pubsub_admin_tcp/src/pubsub_tcp_handler.h | 4 +- .../src/pubsub_tcp_topic_receiver.c | 21 +- .../src/pubsub_tcp_topic_receiver.h | 2 +- .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 15 +- .../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.h | 2 +- .../pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 10 +- .../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c | 14 +- .../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.h | 4 +- .../src/pubsub_udpmc_topic_receiver.c | 14 +- .../src/pubsub_udpmc_topic_receiver.h | 4 +- .../src/pubsub_udpmc_topic_sender.c | 1 - .../pubsub_admin_websocket/src/psa_activator.c | 10 +- .../src/pubsub_websocket_admin.c | 12 +- .../src/pubsub_websocket_admin.h | 4 +- .../src/pubsub_websocket_topic_receiver.c | 14 +- .../src/pubsub_websocket_topic_receiver.h | 2 +- .../src/pubsub_websocket_topic_sender.c | 15 +- .../src/pubsub_websocket_topic_sender.h | 2 +- .../pubsub/pubsub_admin_zmq/src/psa_activator.c | 10 +- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 12 +- .../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.h | 4 +- .../src/pubsub_zmq_topic_receiver.c | 14 +- .../src/pubsub_zmq_topic_receiver.h | 2 +- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c | 23 +- .../pubsub_admin_zmq/src/pubsub_zmq_topic_sender.h | 3 +- .../pubsub/pubsub_discovery/src/psd_activator.c | 10 +- .../pubsub_discovery/src/pubsub_discovery_impl.c | 10 +- .../pubsub_discovery/src/pubsub_discovery_impl.h | 6 +- .../pubsub_protocol_wire_v1/gtest/CMakeLists.txt | 2 +- .../src/pubsub_avrobin_serializer_impl.c | 29 +- .../src/pubsub_avrobin_serializer_impl.h | 2 +- .../src/pubsub_serializer_impl.c | 39 +- .../src/pubsub_serializer_impl.h | 2 +- .../pubsub_topology_manager/src/pstm_activator.c | 11 +- .../src/pubsub_topology_manager.c | 31 +- .../src/pubsub_topology_manager.h | 6 +- bundles/pubsub/pubsub_utils/src/pubsub_utils_url.c | 2 +- bundles/pubsub/test/CMakeLists.txt | 12 +- bundles/remote_services/CMakeLists.txt | 21 +- .../discovery_common/include/discovery.h | 4 +- .../include/endpoint_discovery_poller.h | 4 +- .../discovery_common/src/discovery.c | 16 +- .../discovery_common/src/discovery_activator.c | 16 +- .../src/endpoint_descriptor_reader.c | 6 +- .../src/endpoint_discovery_poller.c | 14 +- .../src/endpoint_discovery_server.c | 18 +- .../discovery_configured/CMakeLists.txt | 44 +- .../discovery_configured/src/discovery_impl.c | 10 +- .../discovery_configured/src/discovery_impl.h | 2 +- .../remote_services/discovery_etcd/CMakeLists.txt | 61 +- .../discovery_etcd/src/discovery_impl.c | 9 +- .../discovery_etcd/src/discovery_impl.h | 2 +- .../discovery_etcd/src/etcd_watcher.c | 11 +- .../remote_services/discovery_shm/CMakeLists.txt | 53 +- .../discovery_shm/src/discovery_impl.c | 7 +- .../discovery_shm/src/discovery_shmWatcher.c | 10 +- bundles/remote_services/examples/CMakeLists.txt | 81 +- .../remote_service_admin_dfi/CMakeLists.txt | 72 +- .../remote_service_admin_dfi/gtest/CMakeLists.txt | 2 +- .../src/export_registration_dfi.c | 18 +- .../src/export_registration_dfi.h | 4 +- .../src/remote_service_admin_dfi.c | 65 +- .../private/src/remote_service_admin_impl.c | 68 +- .../private/test/CMakeLists.txt | 2 +- .../rsa_common/src/endpoint_description.c | 2 +- .../rsa_common/src/export_registration_impl.c | 6 +- .../rsa_common/src/export_registration_impl.h | 6 +- .../rsa_common/src/import_registration_impl.c | 12 +- .../rsa_common/src/import_registration_impl.h | 6 +- .../topology_manager/CMakeLists.txt | 49 +- .../topology_manager/src/activator.c | 17 +- .../topology_manager/src/topology_manager.c | 41 +- .../topology_manager/src/topology_manager.h | 4 +- .../topology_manager/tms_tst/CMakeLists.txt | 2 +- bundles/shell/remote_shell/CMakeLists.txt | 4 +- bundles/shell/remote_shell/src/activator.c | 14 +- .../shell/remote_shell/src/connection_listener.c | 25 +- bundles/shell/remote_shell/src/remote_shell.c | 7 +- bundles/shell/remote_shell/src/remote_shell.h | 2 +- bundles/shell/remote_shell/src/shell_mediator.c | 11 +- bundles/shell/remote_shell/src/shell_mediator.h | 3 +- bundles/shell/shell/CMakeLists.txt | 1 - bundles/shell/shell/src/activator.c | 15 +- bundles/shell/shell/src/log_command.c | 94 -- bundles/shell/shell/src/shell.c | 26 +- bundles/shell/shell/src/shell_private.h | 4 +- bundles/shell/shell/src/std_commands.h | 1 - bundles/shell/shell/test/CMakeLists.txt | 2 +- cmake/Modules/FindFFI.cmake | 32 +- cmake/celix_project/CelixProject.cmake | 16 +- cmake/celix_project/CodeCoverage.cmake | 75 +- documents/intro/README.md | 2 +- .../celix-examples/dm_example_cxx/CMakeLists.txt | 4 +- .../dm_example_cxx/phase2/src/Phase2Cmp.h | 6 +- .../dm_example_cxx/phase2/src/Phase2aActivator.cc | 4 +- .../dm_example_cxx/phase2/src/Phase2aCmp.cc | 12 +- .../dm_example_cxx/phase2/src/Phase2bActivator.cc | 4 +- .../dm_example_cxx/phase2/src/Phase2bCmp.cc | 10 +- .../log_service_example/CMakeLists.txt | 4 +- .../log_service_example/src/activator.c | 22 +- libs/dfi/gtest/CMakeLists.txt | 2 +- libs/framework/CMakeLists.txt | 294 +----- libs/framework/gtest/CMakeLists.txt | 2 +- .../gtest/src/bundle_context_services_test.cpp | 24 +- libs/framework/include/bundle_context.h | 2 +- libs/framework/include/celix_bundle_context.h | 3 +- libs/framework/include/celix_constants.h | 6 + libs/framework/include/celix_framework.h | 9 + libs/framework/include/celix_log.h | 42 +- libs/framework/include/framework_event.h | 2 +- libs/framework/include/service_registry.h | 6 + .../integration-test/test_bundle1/src/activator.c | 79 -- .../integration-test/test_launcher/src/launcher.c | 95 -- libs/framework/private/mock/attribute_mock.c | 60 -- libs/framework/private/mock/bundle_archive_mock.c | 165 --- libs/framework/private/mock/bundle_cache_mock.c | 67 -- libs/framework/private/mock/bundle_context_mock.c | 382 ------- libs/framework/private/mock/bundle_mock.c | 327 ------ libs/framework/private/mock/bundle_revision_mock.c | 80 -- libs/framework/private/mock/capability_mock.c | 68 -- libs/framework/private/mock/celix_log_mock.c | 100 -- .../private/mock/dm_dependency_manager_mock.c | 41 - libs/framework/private/mock/filter_mock.c | 55 - libs/framework/private/mock/framework_mock.c | 393 ------- libs/framework/private/mock/manifest_mock.c | 80 -- libs/framework/private/mock/manifest_parser_mock.c | 82 -- libs/framework/private/mock/miniunz_mock.c | 39 - libs/framework/private/mock/module_mock.c | 155 --- libs/framework/private/mock/properties_mock.c | 74 -- libs/framework/private/mock/requirement_mock.c | 66 -- libs/framework/private/mock/resolver_mock.c | 51 - .../private/mock/service_reference_mock.c | 192 ---- .../private/mock/service_registration_mock.c | 164 --- .../framework/private/mock/service_registry_mock.c | 238 ----- .../private/mock/service_tracker_customizer_mock.c | 84 -- libs/framework/private/mock/service_tracker_stub.c | 24 - libs/framework/private/mock/version_mock.c | 112 -- libs/framework/private/mock/version_range_mock.c | 69 -- libs/framework/private/mock/wire_mock.c | 75 -- libs/framework/private/resources-test/NOTE | 24 - libs/framework/private/resources-test/manifest.txt | 4 - .../private/resources-test/manifest_sections.txt | 17 - libs/framework/private/test/attribute_test.cpp | 121 --- .../framework/private/test/bundle_archive_test.cpp | 313 ------ libs/framework/private/test/bundle_cache_test.cpp | 159 --- .../framework/private/test/bundle_context_test.cpp | 621 ----------- .../private/test/bundle_revision_test.cpp | 158 --- libs/framework/private/test/bundle_test.cpp | 1007 ------------------ libs/framework/private/test/capability_test.cpp | 163 --- .../private/test/celix_errorcodes_test.cpp | 87 -- libs/framework/private/test/framework_test.c | 149 --- libs/framework/private/test/framework_test.cpp | 112 -- .../private/test/manifest_parser_test.cpp | 255 ----- libs/framework/private/test/manifest_test.cpp | 215 ---- libs/framework/private/test/module_test.cpp | 397 ------- libs/framework/private/test/requirement_test.cpp | 179 ---- libs/framework/private/test/resolver_test.cpp | 353 ------- .../private/test/service_reference_test.cpp | 798 -------------- .../private/test/service_registration_test.cpp | 391 ------- .../private/test/service_registry_test.cpp | 1084 -------------------- .../test/service_tracker_customizer_test.cpp | 171 --- .../private/test/service_tracker_test.cpp | 1075 ------------------- libs/framework/private/test/wire_test.cpp | 100 -- libs/framework/src/attribute.c | 9 +- libs/framework/src/bundle.c | 48 +- libs/framework/src/bundle_archive.c | 48 +- libs/framework/src/bundle_cache.c | 10 +- libs/framework/src/bundle_context.c | 68 +- libs/framework/src/bundle_revision.c | 19 +- libs/framework/src/capability.c | 2 +- libs/framework/src/celix_errorcodes.c | 21 +- libs/framework/src/celix_log.c | 163 +-- libs/framework/src/framework.c | 93 +- libs/framework/src/framework_private.h | 2 +- libs/framework/src/manifest.c | 10 +- libs/framework/src/manifest_parser.c | 2 +- libs/framework/src/requirement.c | 4 +- libs/framework/src/resolver.c | 6 +- libs/framework/src/service_reference.c | 8 +- libs/framework/src/service_registration.c | 10 +- libs/framework/src/service_registry.c | 129 ++- libs/framework/src/service_registry_private.h | 2 +- libs/framework/src/service_tracker.c | 82 +- libs/framework/src/service_tracker_customizer.c | 2 +- libs/framework/src/wire.c | 2 +- libs/utils/CMakeLists.txt | 29 +- .../test_bundle1 => utils/gtest}/CMakeLists.txt | 17 +- libs/utils/gtest/src/LogUtilsTestSuite.cc | 76 ++ libs/utils/include/celix_errno.h | 7 +- libs/utils/include/celix_log_constants.h | 26 + libs/utils/include/celix_log_level.h | 41 + libs/utils/include/celix_log_utils.h | 106 ++ libs/utils/include/celix_properties.h | 2 +- libs/utils/include/celix_utils.h | 14 + libs/utils/include/utils.h | 7 - libs/utils/private/test/celix_threads_test.cpp | 29 +- libs/utils/private/test/thread_pool_test.cpp | 120 --- libs/utils/src/celix_log_utils.c | 164 +++ libs/utils/src/celix_threads.c | 4 +- libs/utils/src/properties.c | 2 +- libs/utils/src/thpool.c | 535 ---------- libs/utils/src/utils.c | 24 +- .../bundles/config_admin/CMakeLists.txt | 2 +- .../config_admin/config_admin_tst/CMakeLists.txt | 2 +- .../private/src/event_admin_activator.c | 2 - .../event_admin/private/src/event_admin_impl.c | 22 +- .../event_admin/private/src/event_impl.c | 6 +- .../private/src/event_handler_activator.c | 3 +- .../event_handler/private/src/event_handler_impl.c | 14 +- .../private/src/event_publisher_impl.c | 12 +- 282 files changed, 4321 insertions(+), 14314 deletions(-)
