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 2018/10/12 09:03:41 UTC
[24/34] celix git commit: CELIX-454: Fixes some bugs
CELIX-454: Fixes some bugs
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/3fafef66
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/3fafef66
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/3fafef66
Branch: refs/heads/develop
Commit: 3fafef66aef21bdbb9825180c44670d43a71a8e3
Parents: 07a491b
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon Oct 1 14:57:26 2018 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon Oct 1 14:57:26 2018 +0200
----------------------------------------------------------------------
bundles/pubsub/examples/CMakeLists.txt | 12 +++---------
.../examples/pubsub/msg_descriptors/poi1.properties | 3 +++
.../examples/pubsub/msg_descriptors/poi2.properties | 3 +++
bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 2 +-
.../pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c | 4 ++++
.../src/pubsub_topology_manager.c | 4 ++--
6 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/3fafef66/bundles/pubsub/examples/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/CMakeLists.txt b/bundles/pubsub/examples/CMakeLists.txt
index 9df2314..e8113b9 100644
--- a/bundles/pubsub/examples/CMakeLists.txt
+++ b/bundles/pubsub/examples/CMakeLists.txt
@@ -102,7 +102,7 @@ endif ()
if (BUILD_PUBSUB_PSA_ZMQ)
# Dynamic ZMQ / UDP admin
- add_celix_container("pubsub_publisher"
+ add_celix_container(pubsub_publisher
GROUP "pubsub"
BUNDLES
Celix::shell
@@ -114,13 +114,10 @@ if (BUILD_PUBSUB_PSA_ZMQ)
Celix::pubsub_admin_udp_multicast
celix_pubsub_poi_publisher
celix_pubsub_poi_publisher2
- PROPERTIES
- poi1.psa=zmq
- poi2.psa=udp
)
target_link_libraries(pubsub_publisher PRIVATE ${PUBSUB_CONTAINER_LIBS})
- add_celix_container("pubsub_subscriber"
+ add_celix_container(pubsub_subscriber
GROUP "pubsub"
BUNDLES
Celix::shell
@@ -131,10 +128,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
Celix::pubsub_admin_zmq
Celix::pubsub_admin_udp_multicast
celix_pubsub_poi_subscriber
- PROPERTIES
- poi1.psa=zmq
- poi2.psa=udp
- )
+ )
target_link_libraries(pubsub_subscriber PRIVATE ${PUBSUB_CONTAINER_LIBS})
# ZMQ
http://git-wip-us.apache.org/repos/asf/celix/blob/3fafef66/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties b/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
index 16a1962..1a07f35 100644
--- a/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
+++ b/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
@@ -33,3 +33,6 @@ interface.message.consumer.range@poi1=[0.0.0,1.0.0)
interface.message.provider.version@poi1=0.0.0
interface.message.consumer.range@poi2=[0.0.0,1.0.0)
interface.message.provider.version@poi2=0.0.0
+
+
+qos=sample
http://git-wip-us.apache.org/repos/asf/celix/blob/3fafef66/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties b/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
index 739075c..c0c6e28 100644
--- a/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
+++ b/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
@@ -33,3 +33,6 @@ interface.message.consumer.range@poi1=[0.0.0,1.0.0)
interface.message.provider.version@poi1=0.0.0
interface.message.consumer.range@poi2=[0.0.0,1.0.0)
interface.message.provider.version@poi2=0.0.0
+
+
+qos=control
http://git-wip-us.apache.org/repos/asf/celix/blob/3fafef66/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
----------------------------------------------------------------------
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c b/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
index a2b2d0c..c838899 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
+++ b/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
@@ -74,7 +74,7 @@ int psa_udpmc_start(psa_udpmc_activator_t *act, celix_bundle_context_t *ctx) {
psaSvc->matchEndpoint = pubsub_udpmcAdmin_matchEndpoint;
psaSvc->setupTopicSender = pubsub_udpmcAdmin_setupTopicSender;
psaSvc->teardownTopicSender = pubsub_udpmcAdmin_teardownTopicSender;
- psaSvc->setupTopicReceover = pubsub_udpmcAdmin_setupTopicReceiver;
+ psaSvc->setupTopicReceiver = pubsub_udpmcAdmin_setupTopicReceiver;
psaSvc->teardownTopicReceiver = pubsub_udpmcAdmin_teardownTopicReceiver;
psaSvc->addEndpoint = pubsub_udpmcAdmin_addEndpoint;
psaSvc->removeEndpoint = pubsub_udpmcAdmin_removeEndpoint;
http://git-wip-us.apache.org/repos/asf/celix/blob/3fafef66/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
----------------------------------------------------------------------
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
index 3b13935..1a75497 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
+++ b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_sender.c
@@ -322,3 +322,7 @@ static unsigned int rand_range(unsigned int min, unsigned int max){
double scaled = ((double)random())/((double)RAND_MAX);
return (unsigned int)((max-min+1)*scaled + min);
}
+
+long pubsub_udpmcTopicSender_serializerSvcId(pubsub_udpmc_topic_sender_t *sender) {
+ return sender->serializerSvcId;
+}
http://git-wip-us.apache.org/repos/asf/celix/blob/3fafef66/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
----------------------------------------------------------------------
diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
index 84d0a0d..9c7fff4 100644
--- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
+++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
@@ -607,7 +607,7 @@ static void pstm_teardownTopicSenders(pubsub_topology_manager_t *manager) {
static void pstm_teardownTopicReceiverCallback(void *handle, void *svc) {
pstm_topic_receiver_or_sender_entry_t *entry = handle;
pubsub_admin_service_t *psa = svc;
- psa->teardownTopicSender(psa->handle, entry->scope, entry->topic);
+ psa->teardownTopicReceiver(psa->handle, entry->scope, entry->topic);
}
static void pstm_teardownTopicReceivers(pubsub_topology_manager_t *manager) {
@@ -761,7 +761,7 @@ static void pstm_setupTopicSenders(pubsub_topology_manager_t *manager) {
static void pstm_setupTopicReceiverCallback(void *handle, void *svc) {
pstm_topic_receiver_or_sender_entry_t *entry = handle;
pubsub_admin_service_t *psa = svc;
- psa->setupTopicReciever(psa->handle, entry->scope, entry->topic, entry->selectedSerializerSvcId, &entry->endpoint);
+ psa->setupTopicReceiver(psa->handle, entry->scope, entry->topic, entry->selectedSerializerSvcId, &entry->endpoint);
}
static void pstm_setupTopicReceivers(pubsub_topology_manager_t *manager) {