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 2020/06/30 06:52:25 UTC
[celix] 01/01: Merge remote-tracking branch 'remotes/origin/master'
into bugfix/zmq_wrong_sender_connections
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch bugfix/zmq_wrong_sender_connections
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 82255bc7790211e0a3ec3df4d3d0e54568cf162e
Merge: 5190d49 8e35298
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Tue Jun 30 08:50:00 2020 +0200
Merge remote-tracking branch 'remotes/origin/master' into bugfix/zmq_wrong_sender_connections
# Conflicts:
# bundles/pubsub/test/test/test_runner.cc
bundles/pubsub/examples/CMakeLists.txt | 6 +-
.../src/pubsub_psa_tcp_constants.h | 12 ++++
.../pubsub_admin_tcp/src/pubsub_tcp_handler.c | 12 ++--
.../src/pubsub_tcp_topic_receiver.c | 8 ++-
.../pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c | 8 ++-
.../src/pubsub_psa_udpmc_constants.h | 11 ++++
.../src/pubsub_udpmc_topic_receiver.c | 6 +-
.../src/pubsub_udpmc_topic_sender.c | 17 +++++-
.../src/pubsub_psa_websocket_constants.h | 6 ++
.../src/pubsub_websocket_topic_receiver.c | 6 +-
.../src/pubsub_psa_zmq_constants.h | 12 ++++
.../pubsub/pubsub_admin_zmq/src/pubsub_zmq_admin.c | 6 +-
.../src/pubsub_zmq_topic_receiver.c | 6 +-
bundles/pubsub/pubsub_utils/include/pubsub_utils.h | 10 ++++
bundles/pubsub/pubsub_utils/src/pubsub_utils.c | 15 +++++
bundles/pubsub/test/CMakeLists.txt | 6 +-
bundles/pubsub/test/test/test_runner.cc | 70 +++++++++++++++++-----
bundles/pubsub/test/test/tst_activator.c | 6 +-
.../{tst_activator.c => tst_endpoint_activator.c} | 67 ++++++---------------
19 files changed, 203 insertions(+), 87 deletions(-)
diff --cc bundles/pubsub/test/test/test_runner.cc
index b279bfd,9ed12da..9f7a0b2
--- a/bundles/pubsub/test/test/test_runner.cc
+++ b/bundles/pubsub/test/test/test_runner.cc
@@@ -31,24 -31,58 +31,58 @@@ int main(int argc, char **argv)
}
TEST_GROUP(PUBSUB_INT_GROUP) {
-- celix_framework_t *fw = NULL;
-- celix_bundle_context_t *ctx = NULL;
-- void setup() override {
-- celixLauncher_launch("config.properties", &fw);
-- ctx = celix_framework_getFrameworkContext(fw);
-- }
++ celix_framework_t *fw = NULL;
++ celix_bundle_context_t *ctx = NULL;
++ void setup() override {
++ celixLauncher_launch("config.properties", &fw);
++ ctx = celix_framework_getFrameworkContext(fw);
++ }
-- void teardown() override {
-- celixLauncher_stop(fw);
-- celixLauncher_waitForShutdown(fw);
-- celixLauncher_destroy(fw);
-- ctx = NULL;
-- fw = NULL;
-- }
++ void teardown() override {
++ celixLauncher_stop(fw);
++ celixLauncher_waitForShutdown(fw);
++ celixLauncher_destroy(fw);
++ ctx = NULL;
++ fw = NULL;
++ }
};
- TEST(PUBSUB_INT_GROUP, recvTest) {
+ TEST_GROUP(PUBSUB_INT_ENV_GROUP) {
- celix_framework_t *fw = NULL;
- celix_bundle_context_t *ctx = NULL;
- void setup() override {
- setenv("PSA_TCP_STATIC_BIND_URL_FOR_ping", "tcp://localhost:9001", 1);
- setenv("PSA_TCP_STATIC_CONNECT_URL_FOR_ping", "tcp://localhost:9001", 1);
- setenv("PSA_UDPMC_STATIC_BIND_PORT_FOR_ping", "9001", 1);
- setenv("PSA_UDPMC_STATIC_CONNECT_URLS_FOR_ping", "224.100.0.1:9001", 1);
- setenv("PUBSUB_WEBSOCKET_STATIC_CONNECT_SOCKET_ADDRESSES_FOR_ping", "127.0.0.1:9001", 1);
- setenv("CELIX_HTTP_ADMIN_LISTENING_PORTS", "9001", 1);
- setenv("PSA_ZMQ_STATIC_BIND_URL_FOR_ping", "ipc:///tmp/pubsub-envtest", 1);
- setenv("PSA_ZMQ_STATIC_CONNECT_URL_FOR_ping", "ipc:///tmp/pubsub-envtest", 1);
++ celix_framework_t *fw = NULL;
++ celix_bundle_context_t *ctx = NULL;
++ void setup() override {
++ setenv("PSA_TCP_STATIC_BIND_URL_FOR_ping", "tcp://localhost:9001", 1);
++ setenv("PSA_TCP_STATIC_CONNECT_URL_FOR_ping", "tcp://localhost:9001", 1);
++ setenv("PSA_UDPMC_STATIC_BIND_PORT_FOR_ping", "9001", 1);
++ setenv("PSA_UDPMC_STATIC_CONNECT_URLS_FOR_ping", "224.100.0.1:9001", 1);
++ setenv("PUBSUB_WEBSOCKET_STATIC_CONNECT_SOCKET_ADDRESSES_FOR_ping", "127.0.0.1:9001", 1);
++ setenv("CELIX_HTTP_ADMIN_LISTENING_PORTS", "9001", 1);
++ setenv("PSA_ZMQ_STATIC_BIND_URL_FOR_ping", "ipc:///tmp/pubsub-envtest", 1);
++ setenv("PSA_ZMQ_STATIC_CONNECT_URL_FOR_ping", "ipc:///tmp/pubsub-envtest", 1);
+
- celixLauncher_launch("config.properties", &fw);
- ctx = celix_framework_getFrameworkContext(fw);
- }
++ celixLauncher_launch("config.properties", &fw);
++ ctx = celix_framework_getFrameworkContext(fw);
++ }
+
- void teardown() override {
- celixLauncher_stop(fw);
- celixLauncher_waitForShutdown(fw);
- celixLauncher_destroy(fw);
- ctx = NULL;
- fw = NULL;
- unsetenv("PSA_TCP_STATIC_BIND_URL_FOR_ping");
- unsetenv("PSA_TCP_STATIC_CONNECT_URL_FOR_ping");
- unsetenv("PSA_UDPMC_STATIC_BIND_PORT_FOR_ping");
- unsetenv("PSA_UDPMC_STATIC_CONNECT_URLS_FOR_ping");
- unsetenv("PUBSUB_WEBSOCKET_STATIC_CONNECT_SOCKET_ADDRESSES_FOR_ping");
- unsetenv("CELIX_HTTP_ADMIN_LISTENING_PORTS");
- unsetenv("PSA_ZMQ_STATIC_BIND_URL_FOR_ping");
- unsetenv("PSA_ZMQ_STATIC_CONNECT_URL_FOR_ping");
- }
++ void teardown() override {
++ celixLauncher_stop(fw);
++ celixLauncher_waitForShutdown(fw);
++ celixLauncher_destroy(fw);
++ ctx = NULL;
++ fw = NULL;
++ unsetenv("PSA_TCP_STATIC_BIND_URL_FOR_ping");
++ unsetenv("PSA_TCP_STATIC_CONNECT_URL_FOR_ping");
++ unsetenv("PSA_UDPMC_STATIC_BIND_PORT_FOR_ping");
++ unsetenv("PSA_UDPMC_STATIC_CONNECT_URLS_FOR_ping");
++ unsetenv("PUBSUB_WEBSOCKET_STATIC_CONNECT_SOCKET_ADDRESSES_FOR_ping");
++ unsetenv("CELIX_HTTP_ADMIN_LISTENING_PORTS");
++ unsetenv("PSA_ZMQ_STATIC_BIND_URL_FOR_ping");
++ unsetenv("PSA_ZMQ_STATIC_CONNECT_URL_FOR_ping");
++ }
+ };
+
+ void receiveTest(celix_bundle_context_t *ctx) {
- constexpr int TRIES = 25;
+ constexpr int TRIES = 40;
constexpr int TIMEOUT = 250000;
constexpr int MSG_COUNT = 100;