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/02/09 19:22:23 UTC

[celix] 01/01: Merge pull request #313 from apache/feature/refactor_c_dep_man_service_trackers

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 71ab9d636ed2909c9278885bf8af246a32d2f1ee
Merge: 8c58714 e55d9c4
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Tue Feb 9 20:22:14 2021 +0100

    Merge pull request #313 from apache/feature/refactor_c_dep_man_service_trackers
    
    Feature/refactor c dep man service trackers

 bundles/pubsub/test/CMakeLists.txt                 |   22 +-
 .../pubsub/test/pstm_deadlock_test/test_runner.cc  |   42 +-
 .../gtest/src/tst_activator.c                      |    6 +-
 bundles/shell/shell/src/dm_shell_list_command.c    |   51 +-
 bundles/shell/shell/test/src/ShellTestSuite.cpp    |    8 +
 cmake/cmake_celix/DockerPackaging.cmake            |    2 +-
 libs/dependency_manager_cxx/src/dm_activator.cc    |    6 +-
 libs/framework/CMakeLists.txt                      |    4 +-
 .../gtest/src/DependencyManagerTestSuite.cc        |  249 ++-
 .../gtest/src/bundle_context_bundles_tests.cpp     |    5 +
 .../gtest/src/bundle_context_services_test.cpp     |  145 ++
 libs/framework/gtest/src/single_framework_test.cpp |   69 +-
 libs/framework/include/bundle.h                    |    4 -
 libs/framework/include/bundle_state.h              |    3 +
 libs/framework/include/celix/dm/Component.h        |  105 +-
 libs/framework/include/celix/dm/Component_Impl.h   |   92 +-
 .../framework/include/celix/dm/DependencyManager.h |   76 +-
 .../include/celix/dm/DependencyManagerInfo.h       |  142 ++
 .../include/celix/dm/DependencyManager_Impl.h      |  146 +-
 libs/framework/include/celix/dm/DmActivator.h      |   12 +-
 libs/framework/include/celix/dm/ProvidedService.h  |   13 +-
 .../include/celix/dm/ProvidedService_Impl.h        |   21 +
 .../framework/include/celix/dm/ServiceDependency.h |   68 +-
 .../include/celix/dm/ServiceDependency_Impl.h      |   64 +-
 libs/framework/include/celix_bundle_activator.h    |    4 +-
 libs/framework/include/celix_bundle_context.h      |   58 +-
 libs/framework/include/celix_constants.h           |    5 +
 libs/framework/include/celix_dependency_manager.h  |   74 +-
 libs/framework/include/celix_dm_component.h        |   25 +-
 libs/framework/include/celix_dm_info.h             |   13 +-
 .../include/celix_dm_service_dependency.h          |   12 +-
 libs/framework/include/celix_framework_factory.h   |    2 +-
 libs/framework/include/celix_launcher.h            |   10 +-
 libs/framework/include/celix_log.h                 |   18 +-
 libs/framework/include/dm_service_dependency.h     |   20 +-
 libs/framework/include/requirement.h               |   11 +-
 libs/framework/src/bundle.c                        |   70 +-
 libs/framework/src/bundle_archive.c                |    3 +-
 libs/framework/src/bundle_context.c                |  100 +-
 libs/framework/src/bundle_context_private.h        |    8 +-
 .../src/celix_bundle_state.c}                      |   38 +-
 .../src/celix_dm_event.h}                          |   42 +-
 libs/framework/src/celix_framework_factory.c       |    3 +-
 libs/framework/src/celix_launcher.c                |   54 +-
 libs/framework/src/celix_log.c                     |   16 +-
 libs/framework/src/dm_component_impl.c             | 1631 +++++++-------------
 libs/framework/src/dm_component_impl.h             |    9 +-
 libs/framework/src/dm_dependency_manager_impl.c    |  163 +-
 libs/framework/src/dm_event.c                      |  103 --
 libs/framework/src/dm_event.h                      |   72 -
 libs/framework/src/dm_service_dependency.c         |  832 +++-------
 libs/framework/src/dm_service_dependency_impl.h    |   94 +-
 libs/framework/src/framework.c                     | 1042 ++++++-------
 .../src/framework_bundle_lifecycle_handler.c       |  130 ++
 libs/framework/src/framework_private.h             |   85 +-
 libs/framework/src/requirement.c                   |    2 +-
 libs/framework/src/requirement_private.h           |    2 +-
 libs/framework/src/service_registry.c              |   18 +-
 libs/framework/src/service_tracker.c               |   39 +-
 libs/utils/CMakeLists.txt                          |    5 -
 libs/utils/gtest/CMakeLists.txt                    |    2 +
 libs/utils/gtest/src/VersionRangeTestSuite.cc      |  423 +++++
 libs/utils/include/array_list.h                    |    7 -
 libs/utils/include/celix_utils.h                   |    5 +
 libs/utils/include/celix_version_range.h           |  144 ++
 libs/utils/include/version_range.h                 |    3 +-
 libs/utils/private/test/utils_test.cpp             |   11 +
 libs/utils/private/test/version_range_test.cpp     |  475 ------
 libs/utils/private/test/version_test.cpp           |   11 +
 libs/utils/src/array_list.c                        |    8 +-
 libs/utils/src/utils.c                             |    4 +
 libs/utils/src/version.c                           |    8 +-
 libs/utils/src/version_range.c                     |  276 ++--
 libs/utils/src/version_range_private.h             |   15 +-
 74 files changed, 3804 insertions(+), 3756 deletions(-)