Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6808617A97 for ; Tue, 17 Nov 2015 11:57:20 +0000 (UTC) Received: (qmail 78466 invoked by uid 500); 17 Nov 2015 11:57:20 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 78422 invoked by uid 500); 17 Nov 2015 11:57:20 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 77559 invoked by uid 99); 17 Nov 2015 11:57:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2015 11:57:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8A4DE13D0; Tue, 17 Nov 2015 11:57:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Tue, 17 Nov 2015 11:57:39 -0000 Message-Id: In-Reply-To: <00477df8e057472788bb73fe2114b916@git.apache.org> References: <00477df8e057472788bb73fe2114b916@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/38] celix git commit: Merge branch 'develop' into feature/CELIX-272_synchronization_service_registry Merge branch 'develop' into feature/CELIX-272_synchronization_service_registry Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/8c02ecf3 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/8c02ecf3 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/8c02ecf3 Branch: refs/heads/develop Commit: 8c02ecf382b529af57509188e380768f2817b20b Parents: eae936a 437da02 Author: Pepijn Noltes Authored: Mon Nov 16 16:43:07 2015 +0100 Committer: Pepijn Noltes Committed: Mon Nov 16 16:43:07 2015 +0100 ---------------------------------------------------------------------- .travis.yml | 2 +- log_service/public/src/log_helper.c | 4 +- .../private/include/endpoint_discovery_server.h | 2 +- .../private/src/endpoint_discovery_poller.c | 2 - remote_services/discovery_shm/CMakeLists.txt | 4 +- .../private/include/discovery_impl.h | 2 +- .../private/include/discovery_shm.h | 56 +++ .../private/include/discovery_shmWatcher.h | 40 +++ .../discovery_shm/private/include/shm.h | 56 --- .../discovery_shm/private/include/shm_watcher.h | 40 --- .../discovery_shm/private/src/discovery_impl.c | 81 ++--- .../discovery_shm/private/src/discovery_shm.c | 279 +++++++++++++++ .../private/src/discovery_shmWatcher.c | 249 +++++++++++++ remote_services/discovery_shm/private/src/shm.c | 264 -------------- .../discovery_shm/private/src/shm_watcher.c | 230 ------------ .../dynamic_function_interface/CMakeLists.txt | 2 +- .../private/test/rsa_client_server_tests.cpp | 351 ++++++++++++++++--- .../remote_service_admin_shm/CMakeLists.txt | 7 + .../src/remote_service_admin_activator.c | 114 +++--- .../private/src/remote_service_admin_impl.c | 199 ++++++----- .../private/test/CMakeLists.txt | 58 +++ .../private/test/client.properties.in | 25 ++ .../private/test/rsa_client_server_tests.cpp | 126 +++++++ .../private/test/run_tests.cpp | 24 ++ .../private/test/server.properties.in | 25 ++ .../private/src/topology_manager.c | 8 +- shell/private/src/activator.c | 2 + shell/private/src/shell.c | 3 + 28 files changed, 1405 insertions(+), 850 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/8c02ecf3/shell/private/src/activator.c ---------------------------------------------------------------------- diff --cc shell/private/src/activator.c index 19f9a17,aed0d9b..edd2931 --- a/shell/private/src/activator.c +++ b/shell/private/src/activator.c @@@ -269,10 -269,14 +269,12 @@@ celix_status_t bundleActivator_destroy( } } + serviceRegistration_unregister(instance_ptr->registration); + shell_destroy(&instance_ptr->shellService); + free(instance_ptr->listener); + free(instance_ptr); return CELIX_SUCCESS; http://git-wip-us.apache.org/repos/asf/celix/blob/8c02ecf3/shell/private/src/shell.c ----------------------------------------------------------------------