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 Fri, 20 Nov 2015 07:24:58 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/77b8e711
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/77b8e711
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/77b8e711

Branch: refs/heads/develop
Commit: 77b8e711fa812a7472e00a2449ab87cb6a94af2c
Parents: eac117a 4b85f42
Author: Bjoern Petri <bpetri@apache.org>
Authored: Fri Nov 20 08:24:33 2015 +0100
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Fri Nov 20 08:24:33 2015 +0100

----------------------------------------------------------------------
 examples/CMakeLists.txt                         |   2 +-
 examples/locking/CMakeLists.txt                 |   8 +-
 examples/locking/benchmark/CMakeLists.txt       |  10 +-
 .../private/src/benchmark_runner_activator.c    | 176 +++++++++++--------
 .../benchmark/public/include/benchmark_result.h |   1 +
 .../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  |  16 +-
 examples/locking/deploy.cmake                   |  26 +++
 examples/locking/math_provider/CMakeLists.txt   |  11 +-
 .../math_provider/private/src/math_component.c  |   5 +-
 .../private/src/provider_activator.c            |  66 ++++---
 examples/locking/mutex_benchmark/CMakeLists.txt |  11 +-
 .../private/src/mutex_benchmark.c               |  13 +-
 examples/locking/services/benchmark_service.h   |  27 +++
 examples/locking/services/frequency_service.h   |  47 +++++
 examples/locking/services/math_service.h        |  40 +++++
 .../private/include/service_tracker_private.h   |   4 +-
 framework/private/src/service_reference.c       |  18 +-
 framework/private/src/service_tracker.c         | 114 ++++++++----
 21 files changed, 416 insertions(+), 293 deletions(-)
----------------------------------------------------------------------



Mime
View raw message