Repository: celix Updated Branches: refs/heads/develop e57818bb7 -> e9f2baa43
http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/framework/public/include/service_registration.h ---------------------------------------------------------------------- diff --git a/framework/public/include/service_registration.h b/framework/public/include/service_registration.h index d2e2c11..5775154 100644 --- a/framework/public/include/service_registration.h +++ b/framework/public/include/service_registration.h @@ -38,7 +38,7 @@ typedef struct serviceRegistration * service_registration_pt; FRAMEWORK_EXPORT celix_status_t serviceRegistration_unregister(service_registration_pt registration); - +FRAMEWORK_EXPORT celix_status_t serviceRegistration_getProperties(service_registration_pt registration, properties_pt *properties); FRAMEWORK_EXPORT celix_status_t serviceRegistration_setProperties(service_registration_pt registration, properties_pt properties); FRAMEWORK_EXPORT celix_status_t serviceRegistration_getServiceReferences(service_registration_pt registration, array_list_pt *references); http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/framework/tst/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/framework/tst/CMakeLists.txt b/framework/tst/CMakeLists.txt index a786b41..98cfb34 100644 --- a/framework/tst/CMakeLists.txt +++ b/framework/tst/CMakeLists.txt @@ -38,5 +38,5 @@ configure_file(framework1.properties.in framework1.properties @ONLY) configure_file(framework2.properties.in framework2.properties @ONLY) add_test(NAME run_test_framework COMMAND test_framework) -SETUP_TARGET_FOR_COVERAGE(test_framework_cov test_framework ${CMAKE_BINARY_DIR}/coverage/framework) +SETUP_TARGET_FOR_COVERAGE(test_framework_cov test_framework ${CMAKE_BINARY_DIR}/coverage/framework/framework) http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/log_service/private/src/log.c ---------------------------------------------------------------------- diff --git a/log_service/private/src/log.c b/log_service/private/src/log.c index a6c3887..201c29d 100644 --- a/log_service/private/src/log.c +++ b/log_service/private/src/log.c @@ -222,7 +222,7 @@ celix_status_t log_bundleChanged(void *listener, bundle_event_pt event) { } celix_status_t log_frameworkEvent(void *listener, framework_event_pt event) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; log_pt logger = ((framework_listener_pt) listener)->handle; log_entry_pt entry = NULL; @@ -235,7 +235,7 @@ celix_status_t log_frameworkEvent(void *listener, framework_event_pt event) { } celix_status_t log_addLogListener(log_pt logger, log_listener_pt listener) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; status = celixThreadMutex_lock(&logger->listenerLock); @@ -280,7 +280,7 @@ celix_status_t log_removeLogListener(log_pt logger, log_listener_pt listener) { } celix_status_t log_removeAllLogListener(log_pt logger) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; status = celixThreadMutex_lock(&logger->listenerLock); @@ -294,7 +294,7 @@ celix_status_t log_removeAllLogListener(log_pt logger) { } static celix_status_t log_startListenerThread(log_pt logger) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; logger->running = true; logger->running = true; @@ -304,7 +304,7 @@ static celix_status_t log_startListenerThread(log_pt logger) { } static celix_status_t log_stopListenerThread(log_pt logger) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; logger->running = false; http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/log_service/public/src/log_helper.c ---------------------------------------------------------------------- diff --git a/log_service/public/src/log_helper.c b/log_service/public/src/log_helper.c index 69ea3eb..0b17a36 100644 --- a/log_service/public/src/log_helper.c +++ b/log_service/public/src/log_helper.c @@ -84,7 +84,7 @@ celix_status_t logHelper_create(bundle_context_pt context, log_helper_pt* loghel celix_status_t logHelper_start(log_helper_pt loghelper) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; service_tracker_customizer_pt logTrackerCustomizer = NULL; status = serviceTrackerCustomizer_create(loghelper, NULL, logHelper_logServiceAdded, NULL, logHelper_logServiceRemoved, &logTrackerCustomizer); @@ -126,7 +126,7 @@ celix_status_t logHelper_logServiceRemoved(void *handle, service_reference_pt re celix_status_t logHelper_stop(log_helper_pt loghelper) { - celix_status_t status; + celix_status_t status = CELIX_SUCCESS; status = serviceTracker_close(loghelper->logServiceTracker); http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/remote_services/discovery/private/include/endpoint_discovery_poller.h ---------------------------------------------------------------------- diff --git a/remote_services/discovery/private/include/endpoint_discovery_poller.h b/remote_services/discovery/private/include/endpoint_discovery_poller.h index 1bb6679..d344e55 100644 --- a/remote_services/discovery/private/include/endpoint_discovery_poller.h +++ b/remote_services/discovery/private/include/endpoint_discovery_poller.h @@ -51,5 +51,6 @@ celix_status_t endpointDiscoveryPoller_destroy(endpoint_discovery_poller_pt poll celix_status_t endpointDiscoveryPoller_addDiscoveryEndpoint(endpoint_discovery_poller_pt poller, char *url); celix_status_t endpointDiscoveryPoller_removeDiscoveryEndpoint(endpoint_discovery_poller_pt poller, char *url); +celix_status_t endpointDiscoveryPoller_getDiscoveryEndpoints(endpoint_discovery_poller_pt poller, array_list_pt urls); #endif /* ENDPOINT_DISCOVERY_POLLER_H_ */ http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/remote_services/discovery/private/src/endpoint_discovery_poller.c ---------------------------------------------------------------------- diff --git a/remote_services/discovery/private/src/endpoint_discovery_poller.c b/remote_services/discovery/private/src/endpoint_discovery_poller.c index ec0a1b3..60a9236 100644 --- a/remote_services/discovery/private/src/endpoint_discovery_poller.c +++ b/remote_services/discovery/private/src/endpoint_discovery_poller.c @@ -242,7 +242,7 @@ celix_status_t endpointDiscoveryPoller_removeDiscoveryEndpoint(endpoint_discover celix_status_t endpointDiscoveryPoller_poll(endpoint_discovery_poller_pt poller, char *url, array_list_pt currentEndpoints) { - celix_status_t status; + celix_status_t status = NULL; array_list_pt updatedEndpoints = NULL; // create an arraylist with a custom equality test to ensure we can find endpoints properly... http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/remote_services/discovery_etcd/private/src/etcd_watcher.c ---------------------------------------------------------------------- diff --git a/remote_services/discovery_etcd/private/src/etcd_watcher.c b/remote_services/discovery_etcd/private/src/etcd_watcher.c index b9b3ef8..2166a3e 100644 --- a/remote_services/discovery_etcd/private/src/etcd_watcher.c +++ b/remote_services/discovery_etcd/private/src/etcd_watcher.c @@ -227,7 +227,7 @@ static celix_status_t etcdWatcher_removeEntry(etcd_watcher_pt watcher, char* key hash_map_entry_pt entry = hashMap_getEntry(watcher->entries, key); if (entry != NULL) { - hashMap_removeEntryForKey(watcher->entries, key); + hashMap_remove(watcher->entries, key); free(hashMapEntry_getKey(entry)); free(hashMapEntry_getValue(entry)); http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/remote_services/remote_service_admin_dfi/dynamic_function_interface/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/dynamic_function_interface/CMakeLists.txt b/remote_services/remote_service_admin_dfi/dynamic_function_interface/CMakeLists.txt index ea79768..aed134c 100644 --- a/remote_services/remote_service_admin_dfi/dynamic_function_interface/CMakeLists.txt +++ b/remote_services/remote_service_admin_dfi/dynamic_function_interface/CMakeLists.txt @@ -34,4 +34,8 @@ add_library(dfi STATIC json_rpc.c ${MEMSTREAM_SOURCES} ) -target_link_libraries(dfi ${FFI_LIBRARIES} ${JANSSON_LIBRARY}) \ No newline at end of file +target_link_libraries(dfi ${FFI_LIBRARIES} ${JANSSON_LIBRARY}) + +install(TARGETS dfi DESTINATION lib) +FILE(GLOB files "*.h") +INSTALL(FILES ${files} DESTINATION include/celix/dfi) http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/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 index acc6941..7711d53 100644 --- a/remote_services/topology_manager/private/src/topology_manager.c +++ b/remote_services/topology_manager/private/src/topology_manager.c @@ -287,6 +287,9 @@ celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt re topologyManager_notifyListenersEndpointRemoved(manager, rsa, export); rsa->exportRegistration_close(export); } + + arrayList_destroy(exports_list); + exports_list = NULL; } hashMap_remove(exports, rsa); http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/utils/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 4d4b013..095c9e8 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -80,7 +80,7 @@ if (UTILS) #ADD_TARGET_FOR_TEST(array_list_test) add_test(NAME run_array_list_test COMMAND array_list_test) - SETUP_TARGET_FOR_COVERAGE(array_list array_list_test ${CMAKE_BINARY_DIR}/coverage/array_list_test/array_list_test) + SETUP_TARGET_FOR_COVERAGE(array_list_test array_list_test ${CMAKE_BINARY_DIR}/coverage/array_list_test/array_list_test) #ADD_TARGET_FOR_TEST(hash_map_test) add_test(NAME run_hash_map_test COMMAND hash_map_test) @@ -88,11 +88,11 @@ if (UTILS) #ADD_TARGET_FOR_TEST(celix_threads_test) add_test(NAME run_celix_threads_test COMMAND celix_threads_test) - SETUP_TARGET_FOR_COVERAGE(celix_threads celix_threads_test ${CMAKE_BINARY_DIR}/coverage/celix_threads_test/celix_threads_test) + SETUP_TARGET_FOR_COVERAGE(celix_threads_test celix_threads_test ${CMAKE_BINARY_DIR}/coverage/celix_threads_test/celix_threads_test) #ADD_TARGET_FOR_TEST(linked_list_test) add_test(NAME run_linked_list_test COMMAND linked_list_test) - SETUP_TARGET_FOR_COVERAGE(linked_list linked_list_test ${CMAKE_BINARY_DIR}/coverage/linked_list_test/linked_list_test) + SETUP_TARGET_FOR_COVERAGE(linked_list_test linked_list_test ${CMAKE_BINARY_DIR}/coverage/linked_list_test/linked_list_test) endif(ENABLE_TESTING) endif (UTILS) http://git-wip-us.apache.org/repos/asf/celix/blob/aec12cd9/utils/public/include/celix_threads.h ---------------------------------------------------------------------- diff --git a/utils/public/include/celix_threads.h b/utils/public/include/celix_threads.h index 2eed5df..c59edef 100644 --- a/utils/public/include/celix_threads.h +++ b/utils/public/include/celix_threads.h @@ -52,7 +52,7 @@ void celixThread_exit(void *exitStatus); celix_status_t celixThread_detach(celix_thread_t thread); celix_status_t celixThread_join(celix_thread_t thread, void **status); celix_status_t celixThread_kill(celix_thread_t thread, int sig); -celix_thread_t celixThread_self(); +celix_thread_t celixThread_self(void); int celixThread_equals(celix_thread_t thread1, celix_thread_t thread2); bool celixThread_initalized(celix_thread_t thread);
