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 2017/11/21 20:08:01 UTC
[04/19] celix git commit: CELIX-417: Refactor for CMake usage in RSA,
PSA and Docker. mostly trying to identify the api and common libraries
http://git-wip-us.apache.org/repos/asf/celix/blob/2a670f26/remote_services/topology_manager/private/src/topology_manager.c
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/private/src/topology_manager.c b/remote_services/topology_manager/private/src/topology_manager.c
deleted file mode 100644
index 6472b01..0000000
--- a/remote_services/topology_manager/private/src/topology_manager.c
+++ /dev/null
@@ -1,985 +0,0 @@
-/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you under the Apache License, Version 2.0 (the
- *"License"); you may not use this file except in compliance
- *with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
- */
-/*
- * topology_manager.c
- *
- * \date Sep 29, 2011
- * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- * \copyright Apache License, Version 2.0
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "celixbool.h"
-#include "topology_manager.h"
-#include "bundle_context.h"
-#include "constants.h"
-#include "bundle.h"
-#include "remote_service_admin.h"
-#include "remote_constants.h"
-#include "filter.h"
-#include "listener_hook_service.h"
-#include "utils.h"
-#include "service_reference.h"
-#include "service_registration.h"
-#include "log_service.h"
-#include "log_helper.h"
-#include "topology_manager.h"
-#include "scope.h"
-#include "hash_map.h"
-
-struct topology_manager {
- bundle_context_pt context;
-
- celix_thread_mutex_t rsaListLock;
- celix_thread_mutexattr_t rsaListLockAttr;
- array_list_pt rsaList;
-
- celix_thread_mutex_t listenerListLock;
- hash_map_pt listenerList;
-
- celix_thread_mutex_t exportedServicesLock;
- hash_map_pt exportedServices;
-
- celix_thread_mutex_t importedServicesLock;
- celix_thread_mutexattr_t importedServicesLockAttr;
- hash_map_pt importedServices;
-
- scope_pt scope;
-
- log_helper_pt loghelper;
-};
-
-celix_status_t topologyManager_exportScopeChanged(void *handle, char *service_name);
-celix_status_t topologyManager_importScopeChanged(void *handle, char *service_name);
-celix_status_t topologyManager_notifyListenersEndpointAdded(topology_manager_pt manager, remote_service_admin_service_pt rsa, array_list_pt registrations);
-celix_status_t topologyManager_notifyListenersEndpointRemoved(topology_manager_pt manager, remote_service_admin_service_pt rsa, export_registration_pt export);
-
-celix_status_t topologyManager_create(bundle_context_pt context, log_helper_pt logHelper, topology_manager_pt *manager, void **scope) {
- celix_status_t status = CELIX_SUCCESS;
-
- *manager = calloc(1, sizeof(**manager));
-
- if (!*manager) {
- return CELIX_ENOMEM;
- }
-
- (*manager)->context = context;
- (*manager)->rsaList = NULL;
-
- arrayList_create(&(*manager)->rsaList);
-
-
- celixThreadMutexAttr_create(&(*manager)->rsaListLockAttr);
- celixThreadMutexAttr_settype(&(*manager)->rsaListLockAttr, CELIX_THREAD_MUTEX_RECURSIVE);
- celixThreadMutex_create(&(*manager)->rsaListLock, &(*manager)->rsaListLockAttr);
-
- celixThreadMutexAttr_create(&(*manager)->importedServicesLockAttr);
- celixThreadMutexAttr_settype(&(*manager)->importedServicesLockAttr, CELIX_THREAD_MUTEX_RECURSIVE);
- celixThreadMutex_create(&(*manager)->importedServicesLock, &(*manager)->importedServicesLockAttr);
-
- celixThreadMutex_create(&(*manager)->exportedServicesLock, NULL);
- celixThreadMutex_create(&(*manager)->listenerListLock, NULL);
-
- (*manager)->listenerList = hashMap_create(serviceReference_hashCode, NULL, serviceReference_equals2, NULL);
- (*manager)->exportedServices = hashMap_create(serviceReference_hashCode, NULL, serviceReference_equals2, NULL);
- (*manager)->importedServices = hashMap_create(NULL, NULL, NULL, NULL);
-
- status = scope_scopeCreate(*manager, &(*manager)->scope);
- scope_setExportScopeChangedCallback((*manager)->scope, topologyManager_exportScopeChanged);
- scope_setImportScopeChangedCallback((*manager)->scope, topologyManager_importScopeChanged);
- *scope = (*manager)->scope;
-
- (*manager)->loghelper = logHelper;
-
-
- return status;
-}
-
-celix_status_t topologyManager_destroy(topology_manager_pt manager) {
- celix_status_t status = CELIX_SUCCESS;
-
- celixThreadMutex_lock(&manager->listenerListLock);
- hashMap_destroy(manager->listenerList, false, false);
-
- celixThreadMutex_unlock(&manager->listenerListLock);
- celixThreadMutex_destroy(&manager->listenerListLock);
-
- celixThreadMutex_lock(&manager->rsaListLock);
-
- arrayList_destroy(manager->rsaList);
-
- celixThreadMutex_unlock(&manager->rsaListLock);
- celixThreadMutex_destroy(&manager->rsaListLock);
- celixThreadMutexAttr_destroy(&manager->rsaListLockAttr);
-
- celixThreadMutex_lock(&manager->exportedServicesLock);
-
- hashMap_destroy(manager->exportedServices, false, false);
-
- celixThreadMutex_unlock(&manager->exportedServicesLock);
- celixThreadMutex_destroy(&manager->exportedServicesLock);
-
- celixThreadMutex_lock(&manager->importedServicesLock);
-
- hashMap_destroy(manager->importedServices, false, false);
-
- celixThreadMutex_unlock(&manager->importedServicesLock);
- celixThreadMutex_destroy(&manager->importedServicesLock);
- celixThreadMutexAttr_destroy(&manager->importedServicesLockAttr);
-
- scope_scopeDestroy(manager->scope);
- free(manager);
-
- return status;
-}
-
-celix_status_t topologyManager_closeImports(topology_manager_pt manager) {
- celix_status_t status;
-
- status = celixThreadMutex_lock(&manager->importedServicesLock);
-
- hash_map_iterator_pt iter = hashMapIterator_create(manager->importedServices);
- while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
- endpoint_description_pt ep = hashMapEntry_getKey(entry);
- hash_map_pt imports = hashMapEntry_getValue(entry);
-
- if (imports != NULL) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Remove imported service (%s; %s).", ep->service, ep->id);
- hash_map_iterator_pt importsIter = hashMapIterator_create(imports);
-
- while (hashMapIterator_hasNext(importsIter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(importsIter);
-
- remote_service_admin_service_pt rsa = hashMapEntry_getKey(entry);
- import_registration_pt import = hashMapEntry_getValue(entry);
-
- status = rsa->importRegistration_close(rsa->admin, import);
- if (status == CELIX_SUCCESS) {
- hashMapIterator_remove(importsIter);
- }
- }
- hashMapIterator_destroy(importsIter);
-
- hashMapIterator_remove(iter);
-
- hashMap_destroy(imports, false, false);
- }
- }
- hashMapIterator_destroy(iter);
-
- status = celixThreadMutex_unlock(&manager->importedServicesLock);
-
- return status;
-}
-
-celix_status_t topologyManager_rsaAdding(void * handle, service_reference_pt reference, void **service) {
- celix_status_t status;
- topology_manager_pt manager = (topology_manager_pt) handle;
-
- status = bundleContext_getService(manager->context, reference, service);
-
- return status;
-}
-
-celix_status_t topologyManager_rsaAdded(void * handle, service_reference_pt reference, void * service) {
- celix_status_t status;
- topology_manager_pt manager = (topology_manager_pt) handle;
- properties_pt serviceProperties = NULL;
- remote_service_admin_service_pt rsa = (remote_service_admin_service_pt) service;
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Added RSA");
-
- status = celixThreadMutex_lock(&manager->rsaListLock);
-
- if (status == CELIX_SUCCESS) {
- arrayList_add(manager->rsaList, rsa);
- status = celixThreadMutex_unlock(&manager->rsaListLock);
- }
-
- // add already imported services to new rsa
- if (status == CELIX_SUCCESS) {
- status = celixThreadMutex_lock(&manager->importedServicesLock);
-
- if (status == CELIX_SUCCESS) {
- hash_map_iterator_pt importedServicesIterator = hashMapIterator_create(manager->importedServices);
-
- while (hashMapIterator_hasNext(importedServicesIterator)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(importedServicesIterator);
- endpoint_description_pt endpoint = hashMapEntry_getKey(entry);
- if (scope_allowImport(manager->scope, endpoint)) {
- import_registration_pt import = NULL;
- status = rsa->importService(rsa->admin, endpoint, &import);
-
- if (status == CELIX_SUCCESS) {
- hash_map_pt imports = hashMapEntry_getValue(entry);
-
- if (imports == NULL) {
- imports = hashMap_create(NULL, NULL, NULL, NULL);
- hashMap_put(manager->importedServices,endpoint,imports);
- }
-
- hashMap_put(imports, service, import);
- }
- }
- }
-
- hashMapIterator_destroy(importedServicesIterator);
-
- celixThreadMutex_unlock(&manager->importedServicesLock);
- }
- }
-
- // add already exported services to new rsa
- if (status == CELIX_SUCCESS) {
- status = celixThreadMutex_lock(&manager->exportedServicesLock);
-
- if (status == CELIX_SUCCESS) {
- hash_map_iterator_pt exportedServicesIterator = hashMapIterator_create(manager->exportedServices);
-
- while (hashMapIterator_hasNext(exportedServicesIterator)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(exportedServicesIterator);
- service_reference_pt reference = hashMapEntry_getKey(entry);
- const char* serviceId = NULL;
-
- serviceReference_getProperty(reference, OSGI_FRAMEWORK_SERVICE_ID, &serviceId);
-
- scope_getExportProperties(manager->scope, reference, &serviceProperties);
-
- array_list_pt endpoints = NULL;
- status = rsa->exportService(rsa->admin, (char*)serviceId, serviceProperties, &endpoints);
-
- if (status == CELIX_SUCCESS) {
- hash_map_pt exports = hashMapEntry_getValue(entry);
-
- if (exports == NULL) {
- exports = hashMap_create(NULL, NULL, NULL, NULL);
- hashMap_put(manager->exportedServices,reference,exports);
- }
-
- hashMap_put(exports, rsa, endpoints);
- status = topologyManager_notifyListenersEndpointAdded(manager, rsa, endpoints);
- }
- }
-
- hashMapIterator_destroy(exportedServicesIterator);
-
- celixThreadMutex_unlock(&manager->exportedServicesLock);
- }
- }
- return status;
-}
-
-celix_status_t topologyManager_rsaModified(void * handle, service_reference_pt reference, void * service) {
- celix_status_t status = CELIX_SUCCESS;
-
- // Nop...
-
- return status;
-}
-
-celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt reference, void * service) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = (topology_manager_pt) handle;
- remote_service_admin_service_pt rsa = (remote_service_admin_service_pt) service;
-
- if (celixThreadMutex_lock(&manager->exportedServicesLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt iter = hashMapIterator_create(manager->exportedServices);
-
- while (hashMapIterator_hasNext(iter)) {
-
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
- service_reference_pt key = hashMapEntry_getKey(entry);
- hash_map_pt exports = hashMapEntry_getValue(entry);
-
- /*
- * the problem here is that also the rsa has a a list of
- * endpoints which is destroyed when closing the exportRegistration
- */
- array_list_pt exports_list = hashMap_get(exports, rsa);
-
- if (exports_list != NULL) {
- int exportsIter = 0;
- int exportListSize = arrayList_size(exports_list);
- for (exportsIter = 0; exports_list != NULL && exportsIter < exportListSize; exportsIter++) {
- export_registration_pt export = arrayList_get(exports_list, exportsIter);
- topologyManager_notifyListenersEndpointRemoved(manager, rsa, export);
- rsa->exportRegistration_close(rsa->admin, export);
- }
- }
-
- hashMap_remove(exports, rsa);
- /*if(exports_list!=NULL){
- arrayList_destroy(exports_list);
- }*/
-
- if (hashMap_size(exports) == 0) {
- hashMap_remove(manager->exportedServices, key);
- hashMap_destroy(exports, false, false);
-
- hashMapIterator_destroy(iter);
- iter = hashMapIterator_create(manager->exportedServices);
- }
- }
- hashMapIterator_destroy(iter);
- celixThreadMutex_unlock(&manager->exportedServicesLock);
- }
-
- if (celixThreadMutex_lock(&manager->importedServicesLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt iter = hashMapIterator_create(manager->importedServices);
-
- while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
- hash_map_pt imports = hashMapEntry_getValue(entry);
-
- import_registration_pt import = hashMap_get(imports, rsa);
-
- if (import != NULL) {
- celix_status_t subStatus = rsa->importRegistration_close(rsa->admin, import);
-
- if (subStatus == CELIX_SUCCESS) {
- hashMap_remove(imports, rsa);
- } else {
- status = subStatus;
- }
- }
- }
- hashMapIterator_destroy(iter);
- celixThreadMutex_unlock(&manager->importedServicesLock);
- }
-
- if (celixThreadMutex_lock(&manager->rsaListLock) == CELIX_SUCCESS) {
- arrayList_removeElement(manager->rsaList, rsa);
- celixThreadMutex_unlock(&manager->rsaListLock);
- }
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Removed RSA");
-
- return status;
-}
-
-
-celix_status_t topologyManager_serviceChanged(void *listener, service_event_pt event) {
- celix_status_t status = CELIX_SUCCESS;
- service_listener_pt listen = listener;
- topology_manager_pt manager = listen->handle;
-
- const char* export = NULL;
- const char* serviceId = NULL;
- serviceReference_getProperty(event->reference, OSGI_RSA_SERVICE_EXPORTED_INTERFACES, &export);
- serviceReference_getProperty(event->reference, OSGI_FRAMEWORK_SERVICE_ID, &serviceId);
-
- if (!export) {
- // Nothing needs to be done: we're not interested...
- return status;
- }
-
- switch (event->type) {
- case OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED:
- status = topologyManager_addExportedService(manager, event->reference, (char*)serviceId);
- break;
- case OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED:
- status = topologyManager_removeExportedService(manager, event->reference, (char*)serviceId);
-
- if (status == CELIX_SUCCESS) {
- status = topologyManager_addExportedService(manager, event->reference, (char*)serviceId);
- }
- break;
- case OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING:
- status = topologyManager_removeExportedService(manager, event->reference, (char*)serviceId);
- break;
- case OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED_ENDMATCH:
- break;
- }
-
- return status;
-}
-
-celix_status_t topologyManager_exportScopeChanged(void *handle, char *filterStr) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = (topology_manager_pt) handle;
- service_registration_pt reg = NULL;
- const char* serviceId = NULL;
- bool found;
- properties_pt props;
- filter_pt filter = filter_create(filterStr);
-
- if (filter == NULL) {
- printf("filter creating failed\n");
- return CELIX_ENOMEM;
- }
-
- // add already exported services to new rsa
- if (celixThreadMutex_lock(&manager->exportedServicesLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt exportedServicesIterator = hashMapIterator_create(manager->exportedServices);
- int size = hashMap_size(manager->exportedServices);
- service_reference_pt *srvRefs = (service_reference_pt *) calloc(size, sizeof(service_reference_pt));
- char **srvIds = (char **) calloc(size, sizeof(char*));
- int nrFound = 0;
-
- found = false;
-
- while (hashMapIterator_hasNext(exportedServicesIterator)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(exportedServicesIterator);
- service_reference_pt reference = hashMapEntry_getKey(entry);
- reg = NULL;
- serviceReference_getServiceRegistration(reference, ®);
- if (reg != NULL) {
- props = NULL;
- serviceRegistration_getProperties(reg, &props);
- status = filter_match(filter, props, &found);
- if (found) {
- srvRefs[nrFound] = reference;
- serviceReference_getProperty(reference, OSGI_FRAMEWORK_SERVICE_ID, &serviceId);
- srvIds[nrFound++] = (char*)serviceId;
- }
- }
- }
-
- hashMapIterator_destroy(exportedServicesIterator);
- celixThreadMutex_unlock(&manager->exportedServicesLock);
-
- if (nrFound > 0) {
- for (int i = 0; i < nrFound; i++) {
- // Question: can srvRefs become invalid meanwhile??
- const char* export = NULL;
- serviceReference_getProperty(srvRefs[i], (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES, &export);
-
- if (export) {
- celix_status_t substatus = topologyManager_removeExportedService(manager, srvRefs[i], srvIds[i]);
-
- if (substatus != CELIX_SUCCESS) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_ERROR, "TOPOLOGY_MANAGER: Removal of exported service (%s) failed.", srvIds[i]);
- } else {
- substatus = topologyManager_addExportedService(manager, srvRefs[i], srvIds[i]);
- }
-
- if (substatus != CELIX_SUCCESS) {
- status = substatus;
- }
- }
- }
- }
-
- free(srvRefs);
- free(srvIds);
- }
-
- filter_destroy(filter);
-
- return status;
-}
-
-celix_status_t topologyManager_importScopeChanged(void *handle, char *service_name) {
- celix_status_t status = CELIX_SUCCESS;
- endpoint_description_pt endpoint;
- topology_manager_pt manager = (topology_manager_pt) handle;
- bool found = false;
-
- // add already exported services to new rsa
- if (celixThreadMutex_lock(&manager->importedServicesLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt importedServicesIterator = hashMapIterator_create(manager->importedServices);
- while (!found && hashMapIterator_hasNext(importedServicesIterator)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(importedServicesIterator);
- endpoint = hashMapEntry_getKey(entry);
-
- entry = hashMap_getEntry(endpoint->properties, (void *) OSGI_FRAMEWORK_OBJECTCLASS);
- char* name = (char *) hashMapEntry_getValue(entry);
- // Test if a service with the same name is imported
- if (strcmp(name, service_name) == 0) {
- found = true;
- }
- }
- hashMapIterator_destroy(importedServicesIterator);
- celixThreadMutex_unlock(&manager->importedServicesLock);
- }
-
- if (found) {
- status = topologyManager_removeImportedService(manager, endpoint, NULL);
-
- if (status != CELIX_SUCCESS) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_ERROR, "TOPOLOGY_MANAGER: Removal of imported service (%s; %s) failed.", endpoint->service, endpoint->id);
- } else {
- status = topologyManager_addImportedService(manager, endpoint, NULL);
- }
- }
- return status;
-}
-
-celix_status_t topologyManager_addImportedService(void *handle, endpoint_description_pt endpoint, char *matchedFilter) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = handle;
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Add imported service (%s; %s).", endpoint->service, endpoint->id);
-
- if (celixThreadMutex_lock(&manager->importedServicesLock) == CELIX_SUCCESS) {
-
- hash_map_pt imports = hashMap_create(NULL, NULL, NULL, NULL);
- hashMap_put(manager->importedServices, endpoint, imports);
-
- if (scope_allowImport(manager->scope, endpoint)) {
- if (celixThreadMutex_lock(&manager->rsaListLock) == CELIX_SUCCESS) {
- int size = arrayList_size(manager->rsaList);
-
- for (int iter = 0; iter < size; iter++) {
- import_registration_pt import = NULL;
- remote_service_admin_service_pt rsa = arrayList_get(manager->rsaList, iter);
- celix_status_t substatus = rsa->importService(rsa->admin, endpoint, &import);
- if (substatus == CELIX_SUCCESS) {
- hashMap_put(imports, rsa, import);
- } else {
- status = substatus;
- }
- }
- celixThreadMutex_unlock(&manager->rsaListLock);
- }
-
- }
-
- celixThreadMutex_unlock(&manager->importedServicesLock);
- }
-
-
- return status;
-}
-
-celix_status_t topologyManager_removeImportedService(void *handle, endpoint_description_pt endpoint, char *matchedFilter) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = handle;
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Remove imported service (%s; %s).", endpoint->service, endpoint->id);
-
- if (celixThreadMutex_lock(&manager->importedServicesLock) == CELIX_SUCCESS) {
-
- hash_map_iterator_pt iter = hashMapIterator_create(manager->importedServices);
- while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
- endpoint_description_pt ep = hashMapEntry_getKey(entry);
- hash_map_pt imports = hashMapEntry_getValue(entry);
-
- if (imports != NULL && strcmp(endpoint->id, ep->id) == 0) {
- hash_map_iterator_pt importsIter = hashMapIterator_create(imports);
-
- while (hashMapIterator_hasNext(importsIter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(importsIter);
- remote_service_admin_service_pt rsa = hashMapEntry_getKey(entry);
- import_registration_pt import = hashMapEntry_getValue(entry);
- celix_status_t substatus = rsa->importRegistration_close(rsa->admin, import);
- if (substatus == CELIX_SUCCESS) {
- hashMapIterator_remove(importsIter);
- } else {
- status = substatus;
- }
- }
- hashMapIterator_destroy(importsIter);
- hashMapIterator_remove(iter);
-
- hashMap_destroy(imports, false, false);
- }
- }
- hashMapIterator_destroy(iter);
- celixThreadMutex_unlock(&manager->importedServicesLock);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_addExportedService(topology_manager_pt manager, service_reference_pt reference, char *serviceId) {
- celix_status_t status = CELIX_SUCCESS;
- properties_pt serviceProperties = NULL;
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Add exported service (%s).", serviceId);
-
- if (celixThreadMutex_lock(&manager->exportedServicesLock) == CELIX_SUCCESS) {
- scope_getExportProperties(manager->scope, reference, &serviceProperties);
- hash_map_pt exports = hashMap_create(NULL, NULL, NULL, NULL);
- hashMap_put(manager->exportedServices, reference, exports);
-
- if (celixThreadMutex_lock(&manager->rsaListLock) == CELIX_SUCCESS) {
- int size = arrayList_size(manager->rsaList);
-
- if (size == 0) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_WARNING, "TOPOLOGY_MANAGER: No RSA available yet.");
- }
-
- for (int iter = 0; iter < size; iter++) {
- remote_service_admin_service_pt rsa = arrayList_get(manager->rsaList, iter);
-
- array_list_pt endpoints = NULL;
- celix_status_t substatus = rsa->exportService(rsa->admin, serviceId, serviceProperties, &endpoints);
-
- if (substatus == CELIX_SUCCESS) {
- hashMap_put(exports, rsa, endpoints);
- topologyManager_notifyListenersEndpointAdded(manager, rsa, endpoints);
- } else {
- status = substatus;
- }
- }
- celixThreadMutex_unlock(&manager->rsaListLock);
- }
- celixThreadMutex_unlock(&manager->exportedServicesLock);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_removeExportedService(topology_manager_pt manager, service_reference_pt reference, char *serviceId) {
- celix_status_t status = CELIX_SUCCESS;
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Remove exported service (%s).", serviceId);
-
- if (celixThreadMutex_lock(&manager->exportedServicesLock) == CELIX_SUCCESS) {
- hash_map_pt exports = hashMap_get(manager->exportedServices, reference);
- if (exports) {
- hash_map_iterator_pt iter = hashMapIterator_create(exports);
- while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
- remote_service_admin_service_pt rsa = hashMapEntry_getKey(entry);
- array_list_pt exportRegistrations = hashMapEntry_getValue(entry);
-
- int size = arrayList_size(exportRegistrations);
-
- for (int exportsIter = 0; exportsIter < size; exportsIter++) {
- export_registration_pt export = arrayList_get(exportRegistrations, exportsIter);
- topologyManager_notifyListenersEndpointRemoved(manager, rsa, export);
- rsa->exportRegistration_close(rsa->admin, export);
- }
-
- hashMap_remove(exports, rsa);
- //arrayList_destroy(exportRegistrations);
- hashMapIterator_destroy(iter);
- iter = hashMapIterator_create(exports);
-
- }
- hashMapIterator_destroy(iter);
- }
- exports = hashMap_remove(manager->exportedServices, reference);
-
- if (exports != NULL) {
- hashMap_destroy(exports, false, false);
- }
-
- celixThreadMutex_unlock(&manager->exportedServicesLock);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_getEndpointDescriptionForExportRegistration(remote_service_admin_service_pt rsa, export_registration_pt export, endpoint_description_pt *endpoint) {
- celix_status_t status;
-
- export_reference_pt reference = NULL;
- status = rsa->exportRegistration_getExportReference(export, &reference);
-
- if (status == CELIX_SUCCESS) {
- status = rsa->exportReference_getExportedEndpoint(reference, endpoint);
- }
-
- free(reference);
-
- return status;
-}
-
-celix_status_t topologyManager_endpointListenerAdding(void* handle, service_reference_pt reference, void** service) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = (topology_manager_pt) handle;
-
- bundleContext_getService(manager->context, reference, service);
-
- return status;
-}
-
-celix_status_t topologyManager_endpointListenerAdded(void* handle, service_reference_pt reference, void* service) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = handle;
- const char* scope = NULL;
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: Added ENDPOINT_LISTENER");
-
- if (celixThreadMutex_lock(&manager->listenerListLock) == CELIX_SUCCESS) {
- hashMap_put(manager->listenerList, reference, NULL);
- celixThreadMutex_unlock(&manager->listenerListLock);
-
- serviceReference_getProperty(reference, OSGI_ENDPOINT_LISTENER_SCOPE, &scope);
-
- filter_pt filter = filter_create(scope);
- hash_map_iterator_pt refIter = hashMapIterator_create(manager->exportedServices);
-
- while (hashMapIterator_hasNext(refIter)) {
- hash_map_pt rsaExports = hashMapIterator_nextValue(refIter);
- hash_map_iterator_pt rsaIter = hashMapIterator_create(rsaExports);
-
- while (hashMapIterator_hasNext(rsaIter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(rsaIter);
- remote_service_admin_service_pt rsa = hashMapEntry_getKey(entry);
- array_list_pt registrations = hashMapEntry_getValue(entry);
-
- int arrayListSize = arrayList_size(registrations);
- int cnt = 0;
-
- for (; cnt < arrayListSize; cnt++) {
- export_registration_pt export = arrayList_get(registrations, cnt);
- endpoint_description_pt endpoint = NULL;
-
- status = topologyManager_getEndpointDescriptionForExportRegistration(rsa, export, &endpoint);
- if (status == CELIX_SUCCESS) {
- bool matchResult = false;
- filter_match(filter, endpoint->properties, &matchResult);
- if (matchResult) {
- endpoint_listener_pt listener = (endpoint_listener_pt) service;
- status = listener->endpointAdded(listener->handle, endpoint, (char*)scope);
- }
- }
- }
- }
- hashMapIterator_destroy(rsaIter);
- }
- hashMapIterator_destroy(refIter);
-
- filter_destroy(filter);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_endpointListenerModified(void * handle, service_reference_pt reference, void * service) {
- celix_status_t status;
-
- status = topologyManager_endpointListenerRemoved(handle, reference, service);
-
- if (status == CELIX_SUCCESS) {
- status = topologyManager_endpointListenerAdded(handle, reference, service);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_endpointListenerRemoved(void * handle, service_reference_pt reference, void * service) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = handle;
-
- if (celixThreadMutex_lock(&manager->listenerListLock) == CELIX_SUCCESS) {
-
- if (hashMap_remove(manager->listenerList, reference)) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "EndpointListener Removed");
- }
-
- celixThreadMutex_unlock(&manager->listenerListLock);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_notifyListenersEndpointAdded(topology_manager_pt manager, remote_service_admin_service_pt rsa, array_list_pt registrations) {
- celix_status_t status = CELIX_SUCCESS;
-
- if (celixThreadMutex_lock(&manager->listenerListLock) == CELIX_SUCCESS) {
-
- hash_map_iterator_pt iter = hashMapIterator_create(manager->listenerList);
- while (hashMapIterator_hasNext(iter)) {
- const char* scope = NULL;
- endpoint_listener_pt epl = NULL;
- service_reference_pt reference = hashMapIterator_nextKey(iter);
-
- serviceReference_getProperty(reference, OSGI_ENDPOINT_LISTENER_SCOPE, &scope);
-
- status = bundleContext_getService(manager->context, reference, (void **) &epl);
- if (status == CELIX_SUCCESS) {
- filter_pt filter = filter_create(scope);
-
- int regSize = arrayList_size(registrations);
- for (int regIt = 0; regIt < regSize; regIt++) {
- export_registration_pt export = arrayList_get(registrations, regIt);
- endpoint_description_pt endpoint = NULL;
- celix_status_t substatus = topologyManager_getEndpointDescriptionForExportRegistration(rsa, export, &endpoint);
- if (substatus == CELIX_SUCCESS) {
- bool matchResult = false;
- filter_match(filter, endpoint->properties, &matchResult);
- if (matchResult) {
- status = epl->endpointAdded(epl->handle, endpoint, (char*)scope);
- }
- } else {
- status = substatus;
- }
- }
- filter_destroy(filter);
- }
- }
- hashMapIterator_destroy(iter);
- celixThreadMutex_unlock(&manager->listenerListLock);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_notifyListenersEndpointRemoved(topology_manager_pt manager, remote_service_admin_service_pt rsa, export_registration_pt export) {
- celix_status_t status = CELIX_SUCCESS;
-
- if (celixThreadMutex_lock(&manager->listenerListLock) == CELIX_SUCCESS) {
- hash_map_iterator_pt iter = hashMapIterator_create(manager->listenerList);
- while (hashMapIterator_hasNext(iter)) {
- endpoint_description_pt endpoint = NULL;
- endpoint_listener_pt epl = NULL;
- celix_status_t substatus;
- const char* scope = NULL;
-
- service_reference_pt reference = hashMapIterator_nextKey(iter);
- serviceReference_getProperty(reference, OSGI_ENDPOINT_LISTENER_SCOPE, &scope);
-
- substatus = bundleContext_getService(manager->context, reference, (void **) &epl);
-
- if (substatus == CELIX_SUCCESS) {
- substatus = topologyManager_getEndpointDescriptionForExportRegistration(rsa, export, &endpoint);
- }
-
- if (substatus == CELIX_SUCCESS) {
- substatus = epl->endpointRemoved(epl->handle, endpoint, NULL);
- }
-
- /* if (substatus != CELIX_SUCCESS) {
- status = substatus;
-
- }
- */
- }
- hashMapIterator_destroy(iter);
- celixThreadMutex_unlock(&manager->listenerListLock);
- }
-
- return status;
-}
-
-celix_status_t topologyManager_extendFilter(topology_manager_pt manager, char *filter, char **updatedFilter) {
- celix_status_t status;
- bundle_context_pt context = manager->context;
- const char* uuid = NULL;
-
- status = bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
-
- if (!uuid) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_ERROR, "TOPOLOGY_MANAGER: no framework UUID defined?!");
- return CELIX_BUNDLE_EXCEPTION;
- }
-
- int len = 10 + strlen(filter) + strlen(OSGI_RSA_ENDPOINT_FRAMEWORK_UUID) + strlen(uuid);
- *updatedFilter = malloc(len);
- if (!*updatedFilter) {
- return CELIX_ENOMEM;
- }
-
- snprintf(*updatedFilter, len, "(&%s(!(%s=%s)))", filter, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
-
- return status;
-}
-
-celix_status_t topologyManager_listenerAdded(void *handle, array_list_pt listeners) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = handle;
-
- for (int i = 0; i < arrayList_size(listeners); i++) {
- listener_hook_info_pt info = arrayList_get(listeners, i);
- bundle_pt bundle = NULL, self = NULL;
- bundleContext_getBundle(info->context, &bundle);
- bundleContext_getBundle(manager->context, &self);
- if (bundle == self) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_DEBUG, "TOPOLOGY_MANAGER: Ignore myself.");
- continue;
- }
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: listener with filter \"%s\" added", info->filter);
-
- char *filter = NULL;
- bool free_filter = true;
- status = topologyManager_extendFilter(manager, info->filter, &filter);
-#if 0
- if(filter != NULL){
- // TODO: add status handling
- status = celixThreadMutex_lock(&manager->importScopesLock);
-
- struct scope *interest = hashMap_get(manager->importScopes, filter);
- if (interest) {
- interest->refs++;
- free(filter);
- filter = NULL;
- } else {
- interest = malloc(sizeof(*interest));
- interest->filter = filter;
- interest->refs = 1;
- hashMap_put(manager->importScopes, filter, interest);
- free_filter = false;
- }
-
- status = celixThreadMutex_unlock(&manager->importScopesLock);
- }
-#endif
-
- if (filter != NULL && free_filter) {
- free(filter);
- }
-
- }
-
- return status;
-}
-
-celix_status_t topologyManager_listenerRemoved(void *handle, array_list_pt listeners) {
- celix_status_t status = CELIX_SUCCESS;
- topology_manager_pt manager = handle;
-
- for (int i = 0; i < arrayList_size(listeners); i++) {
- listener_hook_info_pt info = arrayList_get(listeners, i);
-
- bundle_pt bundle = NULL, self = NULL;
- bundleContext_getBundle(info->context, &bundle);
- bundleContext_getBundle(manager->context, &self);
- if (bundle == self) {
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_DEBUG, "TOPOLOGY_MANAGER: Ignore myself.");
- continue;
- }
-
- logHelper_log(manager->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: listener with filter \"%s\" removed.", info->filter);
-
- char *filter = NULL;
- topologyManager_extendFilter(manager, info->filter, &filter);
-#if 0
- status = celixThreadMutex_lock(&manager->importScopesLock);
-
- struct scope *interest = hashMap_get(manager->importScopes, filter);
- if (interest != NULL && --interest->refs <= 0) {
- // last reference, remove from scope
- hash_map_entry_pt entry = hashMap_getEntry(manager->importScopes, filter);
- char* key = (char*) hashMapEntry_getKey(entry);
- interest = hashMap_remove(manager->importScopes, filter);
- free(key);
- free(interest);
- }
-#endif
-
- if (filter != NULL) {
- free(filter);
- }
-#if 0
- status = celixThreadMutex_unlock(&manager->importScopesLock);
-#endif
- }
-
- return status;
-}
-
http://git-wip-us.apache.org/repos/asf/celix/blob/2a670f26/remote_services/topology_manager/public/include/tm_scope.h
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/public/include/tm_scope.h b/remote_services/topology_manager/public/include/tm_scope.h
deleted file mode 100644
index d4f60ca..0000000
--- a/remote_services/topology_manager/public/include/tm_scope.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you under the Apache License, Version 2.0 (the
- *"License"); you may not use this file except in compliance
- *with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
- */
-/*
- * tm_scope.h
- *
- * \date Oct 29, 2015
- * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- * \copyright Apache License, Version 2.0
- */
-
-#ifndef TM_SCOPE_H_
-#define TM_SCOPE_H_
-
-#include "celix_errno.h"
-
-#define TOPOLOGYMANAGER_SCOPE_SERVICE "tm_scope"
-
-
-struct tm_scope_service {
- void *handle; // scope_pt
- celix_status_t (*addExportScope)(void *handle, char *filter, properties_pt props);
- celix_status_t (*removeExportScope)(void *handle, char *filter);
- celix_status_t (*addImportScope)(void *handle, char *filter);
- celix_status_t (*removeImportScope)(void *handle, char *filter);
-};
-
-typedef struct tm_scope_service tm_scope_service_t;
-typedef tm_scope_service_t *tm_scope_service_pt;
-
-#endif /* TM_SCOPE_H_ */
http://git-wip-us.apache.org/repos/asf/celix/blob/2a670f26/remote_services/topology_manager/src/activator.c
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/src/activator.c b/remote_services/topology_manager/src/activator.c
new file mode 100644
index 0000000..7f39a25
--- /dev/null
+++ b/remote_services/topology_manager/src/activator.c
@@ -0,0 +1,289 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements. See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership. The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * activator.c
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "constants.h"
+#include "bundle_activator.h"
+#include "service_tracker.h"
+#include "service_registration.h"
+
+#include "topology_manager.h"
+#include "endpoint_listener.h"
+#include "remote_constants.h"
+#include "listener_hook_service.h"
+#include "log_service.h"
+#include "log_helper.h"
+#include "scope.h"
+#include "tm_scope.h"
+#include "topology_manager.h"
+
+struct activator {
+ bundle_context_pt context;
+
+ topology_manager_pt manager;
+
+ service_tracker_pt endpointListenerTracker;
+ service_tracker_pt remoteServiceAdminTracker;
+ service_listener_pt serviceListener;
+
+ endpoint_listener_pt endpointListener;
+ service_registration_pt endpointListenerService;
+
+ listener_hook_service_pt hookService;
+ service_registration_pt hook;
+
+ tm_scope_service_pt scopeService;
+ service_registration_pt scopeReg;
+
+ log_helper_pt loghelper;
+};
+
+
+static celix_status_t bundleActivator_createEPLTracker(struct activator *activator, service_tracker_pt *tracker);
+static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_pt *tracker);
+static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_pt *listener);
+
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
+ celix_status_t status = CELIX_SUCCESS;
+ struct activator *activator = NULL;
+ void *scope;
+
+ activator = calloc(1, sizeof(struct activator));
+
+ if (!activator) {
+ return CELIX_ENOMEM;
+ }
+
+ activator->context = context;
+ activator->endpointListenerService = NULL;
+ activator->endpointListenerTracker = NULL;
+ activator->hook = NULL;
+ activator->manager = NULL;
+ activator->remoteServiceAdminTracker = NULL;
+ activator->serviceListener = NULL;
+ activator->scopeService = calloc(1, sizeof(*(activator->scopeService)));
+ if (activator->scopeService == NULL)
+ {
+ free(activator);
+ return CELIX_ENOMEM;
+ }
+
+ activator->scopeService->addExportScope = tm_addExportScope;
+ activator->scopeService->removeExportScope = tm_removeExportScope;
+ activator->scopeService->addImportScope = tm_addImportScope;
+ activator->scopeService->removeImportScope = tm_removeImportScope;
+ activator->scopeReg = NULL; // explicitly needed, otherwise exception
+
+ logHelper_create(context, &activator->loghelper);
+ logHelper_start(activator->loghelper);
+
+ status = topologyManager_create(context, activator->loghelper, &activator->manager, &scope);
+ activator->scopeService->handle = scope;
+
+ if (status == CELIX_SUCCESS) {
+ status = bundleActivator_createEPLTracker(activator, &activator->endpointListenerTracker);
+ if (status == CELIX_SUCCESS) {
+ status = bundleActivator_createRSATracker(activator, &activator->remoteServiceAdminTracker);
+ if (status == CELIX_SUCCESS) {
+ status = bundleActivator_createServiceListener(activator, &activator->serviceListener);
+ if (status == CELIX_SUCCESS) {
+ *userData = activator;
+ }
+ }
+ }
+ }
+
+ if(status != CELIX_SUCCESS){
+ bundleActivator_destroy(activator,context);
+ }
+
+ return status;
+}
+
+static celix_status_t bundleActivator_createEPLTracker(struct activator *activator, service_tracker_pt *tracker) {
+ celix_status_t status;
+
+ service_tracker_customizer_pt customizer = NULL;
+
+ status = serviceTrackerCustomizer_create(activator->manager, topologyManager_endpointListenerAdding, topologyManager_endpointListenerAdded, topologyManager_endpointListenerModified,
+ topologyManager_endpointListenerRemoved, &customizer);
+
+ if (status == CELIX_SUCCESS) {
+ status = serviceTracker_create(activator->context, (char *) OSGI_ENDPOINT_LISTENER_SERVICE, customizer, tracker);
+ }
+
+ return status;
+}
+
+static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_pt *tracker) {
+ celix_status_t status;
+
+ service_tracker_customizer_pt customizer = NULL;
+
+ status = serviceTrackerCustomizer_create(activator->manager, topologyManager_rsaAdding, topologyManager_rsaAdded, topologyManager_rsaModified, topologyManager_rsaRemoved, &customizer);
+
+ if (status == CELIX_SUCCESS) {
+ status = serviceTracker_create(activator->context, OSGI_RSA_REMOTE_SERVICE_ADMIN, customizer, tracker);
+ }
+
+ return status;
+}
+
+static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_pt *listener) {
+ celix_status_t status = CELIX_SUCCESS;
+
+ *listener = malloc(sizeof(**listener));
+ if (!*listener) {
+ return CELIX_ENOMEM;
+ }
+
+ (*listener)->handle = activator->manager;
+ (*listener)->serviceChanged = topologyManager_serviceChanged;
+
+ return status;
+}
+
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
+ celix_status_t status;
+ struct activator *activator = userData;
+
+ endpoint_listener_pt endpointListener = malloc(sizeof(*endpointListener));
+ endpointListener->handle = activator->manager;
+ endpointListener->endpointAdded = topologyManager_addImportedService;
+ endpointListener->endpointRemoved = topologyManager_removeImportedService;
+ activator->endpointListener = endpointListener;
+
+ const char *uuid = NULL;
+ status = bundleContext_getProperty(activator->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
+ if (!uuid) {
+ logHelper_log(activator->loghelper, OSGI_LOGSERVICE_ERROR, "TOPOLOGY_MANAGER: no framework UUID defined?!");
+ return CELIX_ILLEGAL_STATE;
+ }
+
+ size_t len = 14 + strlen(OSGI_FRAMEWORK_OBJECTCLASS) + strlen(OSGI_RSA_ENDPOINT_FRAMEWORK_UUID) + strlen(uuid);
+ char *scope = malloc(len);
+ if (!scope) {
+ return CELIX_ENOMEM;
+ }
+
+ snprintf(scope, len, "(&(%s=*)(!(%s=%s)))", OSGI_FRAMEWORK_OBJECTCLASS, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
+
+ logHelper_log(activator->loghelper, OSGI_LOGSERVICE_INFO, "TOPOLOGY_MANAGER: endpoint listener scope is %s", scope);
+
+ properties_pt props = properties_create();
+ properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
+
+ // We can release the scope, as properties_set makes a copy of the key & value...
+ free(scope);
+
+ bundleContext_registerService(context, (char *) OSGI_ENDPOINT_LISTENER_SERVICE, endpointListener, props, &activator->endpointListenerService);
+
+ listener_hook_service_pt hookService = malloc(sizeof(*hookService));
+ hookService->handle = activator->manager;
+ hookService->added = topologyManager_listenerAdded;
+ hookService->removed = topologyManager_listenerRemoved;
+ activator->hookService = hookService;
+
+ bundleContext_registerService(context, (char *) OSGI_FRAMEWORK_LISTENER_HOOK_SERVICE_NAME, hookService, NULL, &activator->hook);
+ bundleContext_addServiceListener(context, activator->serviceListener, "(service.exported.interfaces=*)");
+
+ if (status == CELIX_SUCCESS) {
+ serviceTracker_open(activator->remoteServiceAdminTracker);
+ }
+
+ if (status == CELIX_SUCCESS) {
+ status = serviceTracker_open(activator->endpointListenerTracker);
+ }
+
+ bundleContext_registerService(context, (char *) TOPOLOGYMANAGER_SCOPE_SERVICE, activator->scopeService, NULL, &activator->scopeReg);
+
+ array_list_pt references = NULL;
+ bundleContext_getServiceReferences(context, NULL, "(service.exported.interfaces=*)", &references);
+ int i;
+ for (i = 0; i < arrayList_size(references); i++) {
+ service_reference_pt reference = arrayList_get(references, i);
+ const char* serviceId = NULL;
+ status = CELIX_DO_IF(status, serviceReference_getProperty(reference, OSGI_FRAMEWORK_SERVICE_ID, &serviceId));
+
+ CELIX_DO_IF(status, topologyManager_addExportedService(activator->manager, reference, (char*)serviceId));
+ }
+ arrayList_destroy(references);
+
+ return status;
+}
+
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
+ celix_status_t status = CELIX_SUCCESS;
+ struct activator *activator = userData;
+
+ if (serviceTracker_close(activator->remoteServiceAdminTracker) == CELIX_SUCCESS) {
+ serviceTracker_destroy(activator->remoteServiceAdminTracker);
+ }
+
+ if (serviceTracker_close(activator->endpointListenerTracker) == CELIX_SUCCESS) {
+ serviceTracker_destroy(activator->endpointListenerTracker);
+ }
+
+ bundleContext_removeServiceListener(context, activator->serviceListener);
+ free(activator->serviceListener);
+
+ serviceRegistration_unregister(activator->hook);
+ free(activator->hookService);
+
+ serviceRegistration_unregister(activator->endpointListenerService);
+ free(activator->endpointListener);
+
+ serviceRegistration_unregister(activator->scopeReg);
+
+ topologyManager_closeImports(activator->manager);
+
+ return status;
+}
+
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
+ celix_status_t status = CELIX_SUCCESS;
+
+ struct activator *activator = userData;
+ if (!activator || !activator->manager) {
+ status = CELIX_BUNDLE_EXCEPTION;
+ } else {
+ logHelper_stop(activator->loghelper);
+ logHelper_destroy(&activator->loghelper);
+
+ status = topologyManager_destroy(activator->manager);
+
+ if (activator->scopeService) {
+ free(activator->scopeService);
+ }
+
+ free(activator);
+ }
+
+ return status;
+}
http://git-wip-us.apache.org/repos/asf/celix/blob/2a670f26/remote_services/topology_manager/src/scope.c
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/src/scope.c b/remote_services/topology_manager/src/scope.c
new file mode 100644
index 0000000..b81d050
--- /dev/null
+++ b/remote_services/topology_manager/src/scope.c
@@ -0,0 +1,326 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements. See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership. The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * scope.c
+ *
+ * \date Sep 29, 2015
+ * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "scope.h"
+#include "tm_scope.h"
+#include "topology_manager.h"
+#include "utils.h"
+
+struct scope_item {
+ properties_pt props;
+};
+
+struct scope {
+ void *manager; // owner of the scope datastructure
+ celix_thread_mutex_t exportScopeLock;
+ hash_map_pt exportScopes; // key is filter, value is scope_item (properties set)
+
+ celix_thread_mutex_t importScopeLock;
+ array_list_pt importScopes; // list of filters
+
+ celix_status_t (*exportScopeChangedHandler)(void* manager, char *filter);
+ celix_status_t (*importScopeChangedHandler)(void* manager, char *filter);
+};
+
+static celix_status_t import_equal(const void *, const void *, bool *equals);
+
+/*
+ * SERVICES
+ */
+
+celix_status_t tm_addExportScope(void *handle, char *filter, properties_pt props) {
+ celix_status_t status = CELIX_SUCCESS;
+ scope_pt scope = (scope_pt) handle;
+ properties_pt present;
+
+ if (handle == NULL)
+ return CELIX_ILLEGAL_ARGUMENT;
+
+ if (celixThreadMutex_lock(&scope->exportScopeLock) == CELIX_SUCCESS) {
+ // For now we just don't allow two exactly the same filters
+ // TODO: What we actually need is the following
+ // If part of the new filter is already present in any of the filters in exportScopes
+ // we have to assure that the new filter defines other property keys than the property keys
+ // in the already defined filter!
+ present = (properties_pt) hashMap_get(scope->exportScopes, filter);
+ if (present == NULL) {
+ struct scope_item *item = calloc(1, sizeof(*item));
+ if (item == NULL) {
+ status = CELIX_ENOMEM;
+ } else {
+ item->props = props;
+ hashMap_put(scope->exportScopes, (void*) strdup(filter), (void*) item);
+ }
+ } else {
+ // don't allow the same filter twice
+ properties_destroy(props);
+ status = CELIX_ILLEGAL_ARGUMENT;
+ }
+ celixThreadMutex_unlock(&scope->exportScopeLock);
+ }
+
+ if (scope->exportScopeChangedHandler != NULL) {
+ status = CELIX_DO_IF(status, scope->exportScopeChangedHandler(scope->manager, filter));
+ }
+
+ return status;
+}
+
+celix_status_t tm_removeExportScope(void *handle, char *filter) {
+ celix_status_t status = CELIX_SUCCESS;
+ scope_pt scope = (scope_pt) handle;
+
+ if (handle == NULL)
+ return CELIX_ILLEGAL_ARGUMENT;
+
+ if (celixThreadMutex_lock(&scope->exportScopeLock) == CELIX_SUCCESS) {
+ struct scope_item *present = (struct scope_item *) hashMap_get(scope->exportScopes, filter);
+ if (present == NULL) {
+ status = CELIX_ILLEGAL_ARGUMENT;
+ } else {
+ properties_destroy(present->props);
+ hashMap_remove(scope->exportScopes, filter); // frees also the item!
+ }
+ celixThreadMutex_unlock(&scope->exportScopeLock);
+ }
+ if (scope->exportScopeChangedHandler != NULL) {
+ status = CELIX_DO_IF(status, scope->exportScopeChangedHandler(scope->manager, filter));
+ }
+ return status;
+}
+
+celix_status_t tm_addImportScope(void *handle, char *filter) {
+ celix_status_t status = CELIX_SUCCESS;
+ scope_pt scope = (scope_pt) handle;
+
+ filter_pt new;
+
+ if (handle == NULL)
+ return CELIX_ILLEGAL_ARGUMENT;
+ new = filter_create(filter);
+ if (new == NULL) {
+ return CELIX_ILLEGAL_ARGUMENT; // filter not parseble
+ }
+ if (celixThreadMutex_lock(&scope->importScopeLock) == CELIX_SUCCESS) {
+ int index = arrayList_indexOf(scope->importScopes, new);
+ filter_pt present = (filter_pt) arrayList_get(scope->importScopes, index);
+ if (present == NULL) {
+ arrayList_add(scope->importScopes, new);
+ } else {
+ filter_destroy(new);
+ status = CELIX_ILLEGAL_ARGUMENT;
+ }
+
+ celixThreadMutex_unlock(&scope->importScopeLock);
+ }
+ if (scope->importScopeChangedHandler != NULL) {
+ status = CELIX_DO_IF(status, scope->importScopeChangedHandler(scope->manager, filter));
+ }
+ return status;
+}
+
+celix_status_t tm_removeImportScope(void *handle, char *filter) {
+ celix_status_t status = CELIX_SUCCESS;
+ scope_pt scope = (scope_pt) handle;
+ filter_pt new;
+
+ if (handle == NULL)
+ return CELIX_ILLEGAL_ARGUMENT;
+
+ new = filter_create(filter);
+ if (new == NULL) {
+ return CELIX_ILLEGAL_ARGUMENT; // filter not parseble
+ }
+
+ if (celixThreadMutex_lock(&scope->importScopeLock) == CELIX_SUCCESS) {
+ int index = arrayList_indexOf(scope->importScopes, new);
+ filter_pt present = (filter_pt) arrayList_get(scope->importScopes, index);
+ if (present == NULL)
+ status = CELIX_ILLEGAL_ARGUMENT;
+ else {
+ arrayList_removeElement(scope->importScopes, present);
+ filter_destroy(present);
+ }
+ celixThreadMutex_unlock(&scope->importScopeLock);
+ }
+ if (scope->importScopeChangedHandler != NULL) {
+ status = CELIX_DO_IF(status, scope->importScopeChangedHandler(scope->manager, filter));
+ }
+ filter_destroy(new);
+ return status;
+}
+
+/*****************************************************************************
+ * GLOBAL FUNCTIONS
+ *****************************************************************************/
+
+void scope_setExportScopeChangedCallback(scope_pt scope, celix_status_t (*changed)(void *handle, char *servName)) {
+ scope->exportScopeChangedHandler = changed;
+}
+
+void scope_setImportScopeChangedCallback(scope_pt scope, celix_status_t (*changed)(void *handle, char *servName)) {
+ scope->importScopeChangedHandler = changed;
+}
+
+celix_status_t scope_scopeCreate(void *handle, scope_pt *scope) {
+ celix_status_t status = CELIX_SUCCESS;
+
+ *scope = calloc(1, sizeof **scope);
+
+ if (*scope == NULL) {
+ return CELIX_ENOMEM;
+ }
+
+ (*scope)->manager = handle;
+ celixThreadMutex_create(&(*scope)->exportScopeLock, NULL);
+ celixThreadMutex_create(&(*scope)->importScopeLock, NULL);
+
+ (*scope)->exportScopes = hashMap_create(utils_stringHash, NULL, utils_stringEquals, NULL);
+ arrayList_createWithEquals(import_equal, &((*scope)->importScopes));
+ (*scope)->exportScopeChangedHandler = NULL;
+
+ return status;
+}
+
+celix_status_t scope_scopeDestroy(scope_pt scope) {
+ celix_status_t status = CELIX_SUCCESS;
+
+ if (celixThreadMutex_lock(&scope->exportScopeLock) == CELIX_SUCCESS) {
+ hash_map_iterator_pt iter = hashMapIterator_create(scope->exportScopes);
+ while (hashMapIterator_hasNext(iter)) {
+ hash_map_entry_pt scopedEntry = hashMapIterator_nextEntry(iter);
+ struct scope_item *item = (struct scope_item*) hashMapEntry_getValue(scopedEntry);
+ properties_destroy(item->props);
+ }
+ hashMapIterator_destroy(iter);
+ hashMap_destroy(scope->exportScopes, true, true); // free keys, free values
+ celixThreadMutex_unlock(&scope->exportScopeLock);
+ }
+
+ if (celixThreadMutex_lock(&scope->importScopeLock) == CELIX_SUCCESS) {
+ array_list_iterator_pt imp_iter = arrayListIterator_create(scope->importScopes);
+ while (arrayListIterator_hasNext(imp_iter)) {
+ filter_pt element = (filter_pt) arrayListIterator_next(imp_iter);
+ filter_destroy(element);
+ // no need to call arrayList_removeElement(element) because complete list is destroyed
+ }
+ arrayListIterator_destroy(imp_iter);
+ arrayList_destroy(scope->importScopes);
+ celixThreadMutex_unlock(&scope->importScopeLock);
+ }
+
+ celixThreadMutex_destroy(&scope->exportScopeLock);
+ celixThreadMutex_destroy(&scope->importScopeLock);
+ free(scope);
+ return status;
+}
+
+/*****************************************************************************
+ * STATIC FUNCTIONS
+ *****************************************************************************/
+static celix_status_t import_equal(const void *src, const void *dest, bool *equals) {
+ celix_status_t status;
+
+ filter_pt src_filter = (filter_pt) src;
+ filter_pt dest_filter = (filter_pt) dest;
+ status = filter_match_filter(src_filter, dest_filter, equals);
+ return status;
+}
+
+bool scope_allowImport(scope_pt scope, endpoint_description_pt endpoint) {
+ bool allowImport = false;
+ array_list_iterator_pt iter;
+
+ if (celixThreadMutex_lock(&(scope->importScopeLock)) == CELIX_SUCCESS) {
+ if (arrayList_size(scope->importScopes) == 0) {
+ allowImport = true;
+ } else {
+ iter = arrayListIterator_create(scope->importScopes);
+ while ((allowImport == false) && arrayListIterator_hasNext(iter)) {
+ filter_pt element = (filter_pt) arrayListIterator_next(iter);
+ filter_match(element, endpoint->properties, &allowImport);
+ }
+ arrayListIterator_destroy(iter);
+ }
+ celixThreadMutex_unlock(&scope->importScopeLock);
+ }
+ return allowImport;
+}
+
+celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt reference, properties_pt *props) {
+ celix_status_t status = CELIX_SUCCESS;
+ unsigned int size = 0;
+ char **keys;
+ bool found = false;
+
+ *props = NULL;
+ properties_pt serviceProperties = properties_create(); // GB: not sure if a copy is needed
+ // or serviceReference_getProperties() is
+ // is acceptable
+
+ serviceReference_getPropertyKeys(reference, &keys, &size);
+ for (int i = 0; i < size; i++) {
+ char *key = keys[i];
+ const char* value = NULL;
+
+ if (serviceReference_getProperty(reference, key, &value) == CELIX_SUCCESS) {
+// && strcmp(key, (char*) OSGI_RSA_SERVICE_EXPORTED_INTERFACES) != 0
+// && strcmp(key, (char*) OSGI_FRAMEWORK_OBJECTCLASS) != 0) {
+ properties_set(serviceProperties, key, value);
+ }
+
+ }
+
+ free(keys);
+
+ if (celixThreadMutex_lock(&(scope->exportScopeLock)) == CELIX_SUCCESS) {
+ hash_map_iterator_pt scopedPropIter = hashMapIterator_create(scope->exportScopes);
+ // TODO: now stopping if first filter matches, alternatively we could build up
+ // the additional output properties for each filter that matches?
+ while ((!found) && hashMapIterator_hasNext(scopedPropIter)) {
+ hash_map_entry_pt scopedEntry = hashMapIterator_nextEntry(scopedPropIter);
+ char *filterStr = (char *) hashMapEntry_getKey(scopedEntry);
+ filter_pt filter = filter_create(filterStr);
+ if (filter != NULL) {
+ // test if the scope filter matches the exported service properties
+ status = filter_match(filter, serviceProperties, &found);
+ if (found) {
+ struct scope_item *item = (struct scope_item *) hashMapEntry_getValue(scopedEntry);
+ *props = item->props;
+ }
+ }
+ filter_destroy(filter);
+ }
+ hashMapIterator_destroy(scopedPropIter);
+ properties_destroy(serviceProperties);
+
+ celixThreadMutex_unlock(&(scope->exportScopeLock));
+ }
+
+ return status;
+}
http://git-wip-us.apache.org/repos/asf/celix/blob/2a670f26/remote_services/topology_manager/src/scope.h
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/src/scope.h b/remote_services/topology_manager/src/scope.h
new file mode 100644
index 0000000..4035e2c
--- /dev/null
+++ b/remote_services/topology_manager/src/scope.h
@@ -0,0 +1,150 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements. See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership. The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * scope.h
+ *
+ * \date Sep 29, 2015
+ * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
+
+#ifndef TOPOLOGY_SCOPE_H_
+#define TOPOLOGY_SCOPE_H_
+
+#include "celixbool.h"
+#include "celix_errno.h"
+#include "celix_threads.h"
+#include "hash_map.h"
+#include "endpoint_description.h"
+#include "properties.h"
+#include "service_reference.h"
+#include "tm_scope.h"
+
+typedef struct scope *scope_pt;
+
+
+
+/* \brief create scope structure
+ *
+ * \param owning component pointer
+ * \param scope to be created
+ *
+ * \return CELIX_SUCCESS
+ * CELIX_ENOMEM
+ */
+celix_status_t scope_scopeCreate(void *handle, scope_pt *scope);
+
+/* \brief destroy scope structure
+ *
+ * \param scope to be destroyed
+ *
+ * \return CELIX_SUCCESS
+ */
+celix_status_t scope_scopeDestroy(scope_pt scope);
+
+/* \brief register export scope change callback of topology manager
+ *
+ * \param scope structure
+ * \param changed function pointer
+ *
+ * \return -
+ */
+void scope_setExportScopeChangedCallback(scope_pt scope, celix_status_t (*changed)(void *handle, char *servName));
+
+/* \brief register import scope change callback of topology manager
+ *
+ * \param scope structure
+ * \param changed function pointer
+ *
+ * \return -
+ */
+void scope_setImportScopeChangedCallback(scope_pt scope, celix_status_t (*changed)(void *handle, char *servName));
+
+
+/* \brief Test if scope allows import of service
+ *
+ * \param scope containing import rules
+ * \param endpoint import service endpoint description
+ *
+ * \return true import allowed
+ * false import not allowed
+ */
+bool scope_allowImport(scope_pt scope, endpoint_description_pt endpoint);
+
+/* \brief Test if scope allows import of service
+ *
+ * \param scope containing export rules
+ * \param reference to service
+ * \param props, additional properties defining restrictions for the exported service
+ * NULL if no additional restrictions found
+ *
+ * \return CELIX_SUCCESS
+ *
+ */
+celix_status_t scope_getExportProperties(scope_pt scope, service_reference_pt reference, properties_pt *props);
+
+/* \brief add restricted scope for specified exported service
+ *
+ * \param handle pointer to scope
+ * \param filter, filter string
+ * \param props additional properties defining restrictions for the exported service
+ *
+ * \return CELIX_SUCCESS if added to scope
+ * CELIX_ILLEGAL_ARGUMENT if service scope is already restricted before
+ *
+ */
+celix_status_t tm_addExportScope(void *handle, char *filter, properties_pt props);
+
+/* \brief remove restricted scope for specified exported service
+ *
+ * \param handle pointer to scope
+ * \param filter, filter string
+ *
+ * \return CELIX_SUCCESS if removed
+ * CELIX_ILLEGAL_ARGUMENT if service not found in scope
+ *
+ */
+celix_status_t tm_removeExportScope(void *handle, char *filter);
+
+/* \brief add restricted scope for specified imported service
+ *
+ * \param handle pointer to scope
+ * \param filter, filter string
+ * \param props additional properties defining restrictions for the imported service
+ *
+ * \return CELIX_SUCCESS if added to scope
+ * CELIX_ILLEGAL_ARGUMENT if service scope is already restricted before
+ *
+ */
+celix_status_t tm_addImportScope(void *handle, char *filter);
+
+
+/* \brief remove restricted scope for specified imported service
+ *
+ * \param handle pointer to scope
+ * \param filter, filter string
+ *
+ * \return CELIX_SUCCESS if removed
+ * CELIX_ILLEGAL_ARGUMENT if service not found in scope
+ *
+ */
+celix_status_t tm_removeImportScope(void *handle, char *filter);
+
+
+#endif // TOPOLOGY_SCOPE_H_