celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject [2/2] celix git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop
Date Tue, 17 Nov 2015 14:17:13 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/4d58af88
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/4d58af88
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/4d58af88

Branch: refs/heads/develop
Commit: 4d58af88b2a9b2ce46b093f4837efc939f1816ea
Parents: 47875a7 048b799
Author: Bjoern Petri <bpetri@apache.org>
Authored: Tue Nov 17 15:16:55 2015 +0100
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Tue Nov 17 15:16:55 2015 +0100

----------------------------------------------------------------------
 .../private/src/dm_component_impl.c             |  14 +-
 .../private/src/dm_service_dependency.c         |   3 +
 .../private/src/dm_shell_list_command.c         |   4 +
 deployment_admin/private/src/deployment_admin.c |  38 +-
 examples/CMakeLists.txt                         |   1 +
 examples/deploy.cmake                           |   3 +
 examples/locking/CMakeLists.txt                 |  24 +
 examples/locking/benchmark/CMakeLists.txt       |  30 +
 .../private/src/benchmark_runner_activator.c    | 255 ++++++
 .../benchmark/public/include/benchmark.h        |  29 +
 .../benchmark/public/include/benchmark_result.h |  20 +
 .../public/include/benchmark_service.h          |  27 +
 .../public/include/frequency_service.h          |  47 ++
 .../benchmark/public/include/math_service.h     |  40 +
 .../benchmark/public/src/benchmark_activator.c  | 133 ++++
 examples/locking/consumer.c                     | 372 +++++++++
 examples/locking/math_provider/CMakeLists.txt   |  32 +
 .../private/include/math_component.h            |  14 +
 .../math_provider/private/src/math_component.c  |  28 +
 .../private/src/provider_activator.c            | 220 ++++++
 .../modified_bool_benchmark/CMakeLists.txt      |  32 +
 .../private/src/modified_bool_benchmark.c       | 162 ++++
 examples/locking/mutex_benchmark/CMakeLists.txt |  32 +
 .../private/src/mutex_benchmark.c               | 117 +++
 .../locking/reference_benchmark/CMakeLists.txt  |  32 +
 .../private/src/reference_benchmark.c           | 116 +++
 .../locking/start_stop_benchmark/CMakeLists.txt |  32 +
 .../private/src/start_stop_benchmark.c          | 189 +++++
 framework/CMakeLists.txt                        |  24 +-
 .../private/include/registry_callback_private.h |  42 +
 .../private/include/service_reference_private.h |  31 +-
 .../include/service_registration_private.h      |  23 +-
 .../private/include/service_registry_private.h  |  24 +-
 .../service_tracker_customizer_private.h        |   4 +
 framework/private/mock/service_reference_mock.c |  17 +-
 .../private/mock/service_registration_mock.c    |  10 +
 framework/private/mock/service_registry_mock.c  |  23 +
 framework/private/src/bundle_archive.c          |  68 +-
 framework/private/src/bundle_cache.c            |  92 ++-
 framework/private/src/bundle_context.c          |   2 +-
 framework/private/src/framework.c               |  78 +-
 framework/private/src/properties.c              |  24 +
 framework/private/src/service_reference.c       | 299 +++++--
 framework/private/src/service_registration.c    | 218 ++---
 framework/private/src/service_registry.c        | 791 ++++++++++---------
 framework/private/src/service_tracker.c         | 154 ++--
 framework/private/test/attribute_test.cpp       |   4 +-
 framework/private/test/bundle_archive_test.cpp  |  17 -
 framework/private/test/bundle_cache_test.cpp    |  17 -
 framework/private/test/bundle_context_test.cpp  |  11 -
 framework/private/test/bundle_test.cpp          |   1 +
 framework/private/test/capability_test.cpp      |   2 +-
 framework/private/test/module_test.cpp          |   1 -
 framework/private/test/resolver_test.cpp        |   1 -
 .../private/test/service_reference_test.cpp     |  24 +-
 .../private/test/service_registration_test.cpp  |  65 +-
 .../private/test/service_registry_test.cpp      |  13 +-
 .../test/service_tracker_customizer_test.cpp    |   1 -
 framework/private/test/service_tracker_test.cpp |   8 +-
 framework/private/test/version_range_test.cpp   |   2 -
 framework/private/test/version_test.cpp         |   4 +-
 framework/private/test/wire_test.cpp            |   1 -
 framework/public/include/properties.h           |   3 +
 framework/public/include/service_reference.h    |   3 +-
 framework/public/include/service_registration.h |   1 -
 framework/public/include/service_registry.h     |  19 +-
 framework/tst/multiple_frameworks_test.cpp      |   1 -
 framework/tst/single_framework_test.cpp         |   1 -
 .../private/src/calculator_endpoint_activator.c |   2 +-
 .../private/src/calculator_activator.c          |  12 +-
 .../CMakeLists.txt                              |   5 +
 .../json_rpc_tests.cpp                          |   6 +-
 .../rsa/private/src/export_registration_dfi.c   |  16 +-
 .../rsa/private/src/remote_service_admin_dfi.c  |  15 +-
 .../rsa_tst/CMakeLists.txt                      |   2 +-
 .../rsa_tst/rsa_client_server_tests.cpp         |   2 -
 .../rsa_tst/rsa_tests.cpp                       |   6 +
 .../private/test/rsa_client_server_tests.cpp    |   2 +-
 remote_shell/private/include/shell_mediator.h   |   1 +
 remote_shell/private/src/activator.c            |   1 +
 remote_shell/private/src/shell_mediator.c       |  41 +-
 shell/private/src/activator.c                   |   6 +-
 shell/private/src/shell.c                       |   5 -
 utils/private/src/celix_threads.c               |  32 +
 utils/public/include/celix_threads.h            |  20 +-
 85 files changed, 3352 insertions(+), 992 deletions(-)
----------------------------------------------------------------------



Mime
View raw message