celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject svn commit: r1647390 - in /celix/trunk/remote_services/remote_service_admin_shm/private/src: export_registration_impl.c import_registration_impl.c remote_service_admin_impl.c
Date Mon, 22 Dec 2014 19:59:11 GMT
Author: bpetri
Date: Mon Dec 22 19:59:10 2014
New Revision: 1647390

URL: http://svn.apache.org/r1647390
Log:
CELIX-182: Adapted RSA_SHM interfaces 


Modified:
    celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
    celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
    celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c?rev=1647390&r1=1647389&r2=1647390&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/export_registration_impl.c
Mon Dec 22 19:59:10 2014
@@ -43,7 +43,8 @@ celix_status_t exportRegistration_endpoi
 
 celix_status_t exportRegistration_createEndpointTracker(export_registration_pt registration,
service_tracker_pt *tracker);
 
-celix_status_t exportRegistration_create(apr_pool_t *pool, service_reference_pt reference,
endpoint_description_pt endpoint, remote_service_admin_pt rsa, bundle_context_pt context,
export_registration_pt *registration) {
+celix_status_t exportRegistration_create(apr_pool_t *pool, log_helper_pt helper, service_reference_pt
reference, endpoint_description_pt endpoint, remote_service_admin_pt rsa, bundle_context_pt
context, export_registration_pt *registration) {
+
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c?rev=1647390&r1=1647389&r2=1647390&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/import_registration_impl.c
Mon Dec 22 19:59:10 2014
@@ -73,7 +73,7 @@ celix_status_t importRegistration_destro
 }
 
 
-celix_status_t importRegistrationFactory_create(apr_pool_t *pool, char* serviceName, bundle_context_pt
context, import_registration_factory_pt *registration_factory) {
+celix_status_t importRegistrationFactory_create(apr_pool_t *pool, log_helper_pt helper, char*
serviceName, bundle_context_pt context, import_registration_factory_pt *registration_factory)
{
 	celix_status_t status = CELIX_SUCCESS;
 	apr_pool_t *mypool = NULL;
 	apr_pool_create(&mypool, pool);
@@ -204,11 +204,12 @@ celix_status_t importRegistration_proxyF
 }
 
 
-celix_status_t importRegistrationFactory_install(apr_pool_t *pool, char* serviceName, bundle_context_pt
context, import_registration_factory_pt *registration_factory)
+celix_status_t importRegistrationFactory_install(apr_pool_t *pool, log_helper_pt helper,
char* serviceName, bundle_context_pt context, import_registration_factory_pt *registration_factory)
 {
 	celix_status_t status = CELIX_SUCCESS;
 
-	if ( (status = importRegistrationFactory_create(pool, serviceName, context, registration_factory))
!= CELIX_SUCCESS)
+	// TODO: add logHelper
+	if ( (status = importRegistrationFactory_create(pool, NULL, serviceName, context, registration_factory))
!= CELIX_SUCCESS)
 	{
 		fw_log(logger, OSGI_FRAMEWORK_LOG_ERROR, "remoteServiceAdmin_importService: error while
creating importRegistrationFactory.");
 	}

Modified: celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c?rev=1647390&r1=1647389&r2=1647390&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
(original)
+++ celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
Mon Dec 22 19:59:10 2014
@@ -123,7 +123,7 @@ celix_status_t remoteServiceAdmin_stop(r
 
 			if (importFactory->trackedFactory != NULL)
 			{
-				importFactory->trackedFactory->unregisterProxyService(importFactory->trackedFactory,
importRegistration->endpointDescription);
+				importFactory->trackedFactory->unregisterProxyService(importFactory->trackedFactory->factory,
importRegistration->endpointDescription);
 			}
         }
 
@@ -632,7 +632,8 @@ celix_status_t remoteServiceAdmin_export
                 char *interface = arrayList_get(interfaces, iter);
                 export_registration_pt registration = NULL;
 
-                exportRegistration_create(admin->pool, reference, NULL, admin, admin->context,
&registration);
+                // TODO: add logHelper reference
+                exportRegistration_create(admin->pool, NULL, reference, NULL, admin, admin->context,
&registration);
 
                 arrayList_add(*registrations, registration);
 
@@ -969,7 +970,8 @@ celix_status_t remoteServiceAdmin_import
 	// check whether we already have a registration_factory
 	if (registration_factory == NULL)
 	{
-		importRegistrationFactory_install(admin->pool, endpointDescription->service, admin->context,
&registration_factory);
+	    // TODO: Add logHelper
+		importRegistrationFactory_install(admin->pool, NULL, endpointDescription->service,
admin->context, &registration_factory);
 		hashMap_put(admin->importedServices, endpointDescription->service, registration_factory);
 	}
 
@@ -982,7 +984,7 @@ celix_status_t remoteServiceAdmin_import
 	{
 		// we create an importRegistration per imported service
 		importRegistration_create(admin->pool, endpointDescription, admin, (sendToHandle) &remoteServiceAdmin_send,
admin->context, registration);
-		registration_factory->trackedFactory->registerProxyService(registration_factory->trackedFactory,
 endpointDescription, admin, (sendToHandle) &remoteServiceAdmin_send);
+		registration_factory->trackedFactory->registerProxyService(registration_factory->trackedFactory->factory,
 endpointDescription, admin, (sendToHandle) &remoteServiceAdmin_send);
 
 		arrayList_add(registration_factory->registrations, *registration);
 		remoteServiceAdmin_createOrAttachShm(admin->importedIpcSegment, admin, endpointDescription,
false);
@@ -1020,7 +1022,7 @@ celix_status_t remoteServiceAdmin_remove
 		}
 		else
 		{
-			registration_factory->trackedFactory->unregisterProxyService(registration_factory->trackedFactory,
endpointDescription);
+			registration_factory->trackedFactory->unregisterProxyService(registration_factory->trackedFactory->factory,
endpointDescription);
 			arrayList_removeElement(registration_factory->registrations, registration);
 			importRegistration_destroy(registration);
 



Mime
View raw message