Changeset 2473 for source/ariba/overlay

Timestamp:

Feb 23, 2009, 2:21:49 PM (16 years ago)

Author:

Christoph Mayer

Message:

-einige fixes im ablauf des neuen interface
-einige fehlende funktionalität implementiert

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (2 diffs)
• BaseOverlay.h (modified) (2 diffs)
• modules/OverlayInterface.cpp (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -273 +273 @@
 bool BaseOverlay::bind(ServiceInterface* service, const ServiceID& sid) {
 
-        logging_debug( "binding service on serviceid " << sid.toString() );
+        logging_debug( "binding service " << service << " on serviceid " << sid.toString() );
 
         if( listenerMux.contains( sid ) ){
@@ -284 +284 @@
 }
 
-bool BaseOverlay::unbind(ServiceInterface* service, const ServiceID& sid){
-
-        logging_debug( "unbinding service on serviceid " << sid.toString() );
+ServiceInterface* BaseOverlay::unbind(const ServiceID& sid){
+
+        logging_debug( "unbinding service from serviceid " << sid.toString() );
 
         if( !listenerMux.contains( sid ) ){
                 logging_warn( "cannot unbind service. no service registered on service id " << sid.toString() );
-                return false;
-        }
-
-        listenerMux.unregisterItem( service );
-        return true;
+                return NULL;
+        }
+
+        ServiceInterface* iface = listenerMux.get( sid );
+        listenerMux.unregisterItem( sid );
+        
+        return NULL; //iface;
 }
 

source/ariba/overlay/BaseOverlay.h

@@ -185 +185 @@
          * Unregister a receiver.
          *
-         * @param receiver An implementation of the receiver interface
-         */
-        bool unbind( ServiceInterface* service, const ServiceID& sid );
+         * @param sid The service id to unregister
+         */
+        ServiceInterface* unbind( const ServiceID& sid );
 
         /**
@@ -271 +271 @@
          * to deliver upcoming messages to the correct service.
          */
-        Demultiplexer<ServiceInterface*, const ServiceID> listenerMux;
+        Demultiplexer<ServiceInterface*, ServiceID> listenerMux;
 
         /**

source/ariba/overlay/modules/OverlayInterface.cpp

@@ -53 +53 @@
                 eventsReceiver( _eventsReceiver ) {
 
-        ServiceInterface::initialize( &_baseoverlay, OVERLAY_SERVICE_ID );
+        _baseoverlay.bind( this, OVERLAY_SERVICE_ID );
 }
 
 OverlayInterface::~OverlayInterface(){
+        baseoverlay.unbind( OVERLAY_SERVICE_ID );
 }