You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by er...@apache.org on 2018/12/28 11:48:43 UTC

[celix] branch develop updated (52ca1dd -> 7f67b07)

This is an automated email from the ASF dual-hosted git repository.

erjanaltena pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git.


    from 52ca1dd  Fixed link in Doap file to new GitBox url
     add 4fc1f3d  NanoMsgAdmin: first version
     add cb740b0  Updates to nanomsg admin
     add 95892a8  admin mutexes replaced by std::mutex and lock_guard
     add 3009e64  Replaced celix-map with std::map
     add 95633eb  Removed celix-maps from nanomsg admin
     add c19a5bd  nanomsg topicreceiver changed to class
     add 0abbf43  nanomsg Topic receiver to class
     add 8658738  nanomsg celix-map replaced by std::map
     add 120895d  subscriber.map now std::map
     add 883abee  Nanomsg: moved charptr to std::string
     add cdefb0d  Nanomsg
     add 7c14142  NanoMsg
     add 15f268d  Nanomsg
     add b6a0337  NanoMsg
     add 707b8e5  Nanomsg
     add b53498a  Nanomsg: added LogHelper class
     add a54c3c5  NanoMsg, fixed deadlock
     add f8a7dd1  Nanomsg removed debug prints
     new 7f67b07  Merge remote-tracking branch 'remotes/origin/develop' into nanomsg

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:
 .../device_access/device_access/src/activator.c    |   0
 bundles/log_service/loghelper_include/log_helper.h |   9 +-
 bundles/log_service/src/log_helper.c               |   2 +-
 bundles/pubsub/CMakeLists.txt                      |   2 +
 bundles/pubsub/examples/CMakeLists.txt             |  88 ++-
 bundles/pubsub/pubsub_admin_nanomsg/CMakeLists.txt |  51 ++
 .../pubsub/pubsub_admin_nanomsg/src/LogHelper.h    |  98 ++++
 .../src/psa_nanomsg_activator.cc                   |  87 +++
 .../src/pubsub_nanomsg_admin.cc                    | 609 +++++++++++++++++++++
 .../src/pubsub_nanomsg_admin.h                     | 136 +++++
 .../src/pubsub_nanomsg_common.cc}                  |  26 +-
 .../src/pubsub_nanomsg_common.h}                   |  27 +-
 .../src/pubsub_nanomsg_topic_receiver.cc           | 319 +++++++++++
 .../src/pubsub_nanomsg_topic_receiver.h            | 125 +++++
 .../src/pubsub_nanomsg_topic_sender.cc             | 267 +++++++++
 .../src/pubsub_nanomsg_topic_sender.h              | 111 ++++
 .../src/pubsub_psa_nanomsg_constants.h             |  35 +-
 .../pubsub_admin_udp_mc/src/pubsub_udpmc_admin.c   |   2 +-
 .../pubsub/pubsub_spi/include/pubsub_endpoint.h    |  23 +-
 bundles/pubsub/pubsub_spi/include/pubsub_utils.h   |  50 +-
 cmake/Modules/{FindZMQ.cmake => FindNanoMsg.cmake} |  14 +-
 doap/doap_Celix.rdf                                |   0
 libs/framework/include/celix_bundle_activator.h    |   2 +-
 23 files changed, 1987 insertions(+), 96 deletions(-)
 mode change 100755 => 100644 bundles/device_access/device_access/src/activator.c
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/CMakeLists.txt
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/LogHelper.h
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.h
 copy bundles/pubsub/{pubsub_admin_zmq/src/pubsub_zmq_common.c => pubsub_admin_nanomsg/src/pubsub_nanomsg_common.cc} (66%)
 copy bundles/pubsub/{pubsub_admin_zmq/src/pubsub_zmq_common.h => pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h} (70%)
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.h
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.cc
 create mode 100644 bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.h
 copy libs/utils/include/filter.h => bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_psa_nanomsg_constants.h (51%)
 copy cmake/Modules/{FindZMQ.cmake => FindNanoMsg.cmake} (78%)
 mode change 100755 => 100644 doap/doap_Celix.rdf


[celix] 01/01: Merge remote-tracking branch 'remotes/origin/develop' into nanomsg

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

erjanaltena pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 7f67b07cf27bfca062388f261643f4e418d89a19
Merge: f8a7dd1 52ca1dd
Author: Erjan Altena <er...@gmail.com>
AuthorDate: Fri Dec 28 12:42:53 2018 +0100

    Merge remote-tracking branch 'remotes/origin/develop' into nanomsg

 bundles/log_service/loghelper_include/log_helper.h |   2 +-
 .../log_writer/log_writer_syslog/CMakeLists.txt    |   2 +-
 .../pubsub_discovery/src/pubsub_discovery_impl.c   |  31 +-
 .../pubsub/pubsub_spi/include/pubsub_constants.h   |  15 +
 .../pubsub/pubsub_spi/include/pubsub_endpoint.h    |   6 +-
 .../src/pubsub_topology_manager.c                  | 103 ++--
 .../src/pubsub_topology_manager.h                  |   3 +-
 .../discovery_common/src/discovery_activator.c     |   2 +-
 .../discovery_etcd/src/etcd_watcher.c              |   4 +-
 bundles/shell/shell/include/shell.h                |   2 +-
 bundles/shell/shell/src/dm_shell_list_command.c    | 115 ++---
 cmake/cmake_celix/ContainerPackaging.cmake         | 151 +++---
 cmake/cmake_celix/DockerPackaging.cmake            |   2 +-
 cmake/cmake_celix/runtime_common.sh.in             |   4 +-
 doap/doap_Celix.rdf                                |   2 +-
 documents/cmake_commands/readme.md                 |  10 +-
 examples/celix-examples/CMakeLists.txt             |   2 +
 .../bar/private/src/bar_activator.c                |  13 +-
 .../foo1/private/src/foo1_activator.c              |  28 +-
 .../foo2/private/src/foo2.c                        |   2 +-
 .../foo2/private/src/foo2_activator.c              |  30 +-
 .../celix-examples/civetweb/src/bundle_activator.c |   2 +-
 examples/celix-examples/dm_example/CMakeLists.txt  |   5 +-
 .../dm_example/phase1/CMakeLists.txt               |  11 -
 .../dm_example/phase1/src/phase1_activator.c       |  47 +-
 .../dm_example/phase1/src/phase1_cmp.c             |   6 +-
 .../dm_example/phase1/src/phase1_cmp.h             |   2 +-
 .../dm_example/phase2a/CMakeLists.txt              |  11 -
 .../dm_example/phase2a/src/phase2a_activator.c     |  59 +--
 .../dm_example/phase2b/CMakeLists.txt              |  11 -
 .../dm_example/phase2b/src/phase2b_activator.c     |  60 +--
 .../dm_example/phase3/CMakeLists.txt               |  11 -
 .../dm_example/phase3/src/phase3_activator.c       |  62 ++-
 .../dm_example/phase3/src/phase3_cmp.c             |   2 +-
 .../celix-examples/dm_example_cxx/CMakeLists.txt   |   1 +
 .../dm_example_cxx/phase1/src/Phase1Activator.cc   |   8 +-
 .../dm_example_cxx/phase1/src/Phase1Activator.h    |   1 -
 .../celix-examples/embedding/private/src/main.c    |   8 +-
 .../hello_world/private/src/activator.c            |   8 +-
 .../hello_world_test/private/src/activator.c       |   8 +-
 .../log_service_example/src/activator.c            |   8 +-
 .../service_hook_example/src/activator.c           |  12 +-
 .../src/dynamic_provider_example.c                 |   2 +-
 libs/dependency_manager/src/dm_activator.c         |  10 +-
 libs/dependency_manager_cxx/src/dm_activator.cc    |  18 +-
 libs/framework/include/bundle.h                    |  76 +--
 libs/framework/include/bundle_activator.h          |  16 +-
 libs/framework/include/bundle_context.h            |  54 +-
 libs/framework/include/bundle_revision.h           |   4 +-
 libs/framework/include/celix/dm/Component.h        |  26 +-
 libs/framework/include/celix/dm/Component_Impl.h   |  37 +-
 .../framework/include/celix/dm/DependencyManager.h |  18 +-
 libs/framework/include/celix/dm/DmActivator.h      |  14 +-
 .../framework/include/celix/dm/ServiceDependency.h |  16 +-
 .../include/celix/dm/ServiceDependency_Impl.h      |  88 ++--
 libs/framework/include/celix_api.h                 |   3 +-
 libs/framework/include/celix_bundle_context.h      |   2 +-
 libs/framework/include/celix_dependency_manager.h  |  86 ++++
 .../{dm_component.h => celix_dm_component.h}       |  63 +--
 libs/framework/include/celix_dm_info.h             |  76 +++
 .../include/celix_dm_service_dependency.h          | 169 +++++++
 libs/framework/include/celix_framework.h           |   2 -
 libs/framework/include/celix_framework_factory.h   |   2 +-
 libs/framework/include/celix_launcher.h            |  14 +-
 libs/framework/include/celix_types.h               |  50 +-
 libs/framework/include/constants.h                 |   3 +
 libs/framework/include/dm_activator.h              |  12 +-
 libs/framework/include/dm_component.h              |  52 +-
 libs/framework/include/dm_dependency_manager.h     |  18 +-
 libs/framework/include/dm_info.h                   |  76 ---
 libs/framework/include/dm_service_dependency.h     |  36 +-
 libs/framework/include/framework.h                 |  17 +-
 libs/framework/include/listener_hook_service.h     |   6 +-
 libs/framework/include/manifest.h                  |   4 +-
 libs/framework/include/module.h                    |  12 +-
 libs/framework/include/service_reference.h         |   6 +-
 libs/framework/include/service_registration.h      |   4 +-
 libs/framework/include/service_registry.h          |  40 +-
 libs/framework/include/service_tracker.h           |  12 +-
 .../private/mock/dm_dependency_manager_mock.c      |  24 +-
 libs/framework/src/bundle_context.c                |  15 +-
 libs/framework/src/bundle_context_private.h        |   8 +-
 libs/framework/src/bundle_private.h                |   4 +-
 libs/framework/src/celix_launcher.c                | 177 ++++---
 libs/framework/src/dm_component_impl.c             | 423 +++++++++-------
 libs/framework/src/dm_component_impl.h             |   6 +-
 libs/framework/src/dm_dependency_manager_impl.c    | 215 ++++++--
 libs/framework/src/dm_dependency_manager_impl.h    |  21 +-
 libs/framework/src/dm_service_dependency.c         | 299 ++++++-----
 libs/framework/src/dm_service_dependency_impl.h    |  63 +--
 libs/framework/src/framework.c                     | 558 +++++++++++----------
 libs/framework/src/framework_private.h             |   4 +-
 libs/framework/src/module.c                        |   2 +-
 libs/framework/tst/CMakeLists.txt                  |   3 +-
 .../framework/tst/bundle_context_bundles_tests.cpp |  16 +
 libs/framework/tst/subdir/CMakeLists.txt           |  20 +
 libs/utils/include/array_list.h                    |  67 ++-
 libs/utils/include/celix_array_list.h              |  17 +-
 libs/utils/include/celix_properties.h              |  10 +-
 libs/utils/include/filter.h                        |   2 +-
 libs/utils/include/hash_map.h                      |   2 -
 libs/utils/include/linked_list.h                   |  56 ++-
 libs/utils/include/properties.h                    |  35 +-
 libs/utils/private/test/filter_test.cpp            |   2 +-
 libs/utils/private/test/properties_test.cpp        |  20 +
 libs/utils/src/array_list_private.h                |   4 +-
 libs/utils/src/filter.c                            |  79 ++-
 libs/utils/src/hash_map.c                          |   2 +-
 libs/utils/src/properties.c                        |  58 ++-
 109 files changed, 2430 insertions(+), 1798 deletions(-)

diff --cc bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h
index 9cda058,2d6d9be..5f0349e
--- a/bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h
+++ b/bundles/pubsub/pubsub_spi/include/pubsub_endpoint.h
@@@ -42,19 -40,14 +43,20 @@@ extern "C" 
  #define PUBSUB_ENDPOINT_SERIALIZER       PUBSUB_SERIALIZER_TYPE_KEY
  
  
- #define PUBSUB_PUBLISHER_ENDPOINT_TYPE  "pubsub.publisher"
- #define PUBSUB_SUBSCRIBER_ENDPOINT_TYPE "pubsub.subscriber"
+ #define PUBSUB_PUBLISHER_ENDPOINT_TYPE      "pubsub.publisher"
+ #define PUBSUB_SUBSCRIBER_ENDPOINT_TYPE     "pubsub.subscriber"
+ #define PUBSUB_ENDPOINT_VISIBILITY_DEFAULT  PUBSUB_ENDPOINT_SYSTEM_VISIBLITY
  
  
 -celix_properties_t* pubsubEndpoint_create(const char* fwUUID, const char* scope, const char* topic, const char* pubsubType, const char* adminType, const char *serType, celix_properties_t *topic_props);
 -celix_properties_t* pubsubEndpoint_createFromSubscriberSvc(bundle_context_t* ctx, long svcBndId, const celix_properties_t *svcProps);
 -celix_properties_t* pubsubEndpoint_createFromPublisherTrackerInfo(bundle_context_t *ctx, long bundleId, const char *filter);
 +celix_properties_t *
 +pubsubEndpoint_create(const char *fwUUID, const char *scope, const char *topic, const char *pubsubType,
 +                      const char *adminType, const char *serType, celix_properties_t *topic_props);
 +
 +celix_properties_t *
 +pubsubEndpoint_createFromSubscriberSvc(bundle_context_t *ctx, long svcBndId, const celix_properties_t *svcProps);
 +
 +celix_properties_t *
 +pubsubEndpoint_createFromPublisherTrackerInfo(bundle_context_t *ctx, long bundleId, const char *filter);
  
  bool pubsubEndpoint_equals(const celix_properties_t *psEp1, const celix_properties_t *psEp2);
  
diff --cc doap/doap_Celix.rdf
index 4f1e62b,3722961..3722961
mode 100644,100755..100644
--- a/doap/doap_Celix.rdf
+++ b/doap/doap_Celix.rdf