Changeset 3712 for source/ariba/communication

Timestamp:

May 26, 2009, 8:03:39 PM (16 years ago)

Author:

Christoph Mayer

Message:

-autolink message buffer von basecomm nach baseoverlay und komplette logik hochgezogen damit mit neuem overlay routing zurecht kommt, damit ist letzer fehler raus

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (5 diffs)
• BaseCommunication.h (modified) (4 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -217 +217 @@
         }
 
-        // warn if this link has some queued messages attached
-        if( descriptor.waitingmsg.size() > 0 ){
-                logging_warn( "dropping link " << link.toString() <<
-                        " that has " << descriptor.waitingmsg.size() << " waiting messages" );
-        }
-
         // create message to drop the link
         logging_debug( "sending out link close request. for us, the link is closed now" );
@@ -266 +260 @@
         msg.encapsulate( const_cast<Message*>(message) );
 
-        if( linkDesc.linkup ){
-
-                // send message
-                transport->sendMessage( &msg );
-                return ++currentSeqnum;
-
-        } else {
-
-                // queue message
-                logging_info( "link " << lid.toString() << " is not up yet, queueing message" );
-                linkDesc.waitingmsg.push_back( new Message(msg) ); // TODO ooooo
-
-                return 0;
-
-        } // if( linkDesc.linkup )
+        if( !linkDesc.linkup ){
+                logging_error("cant send message on link " << lid.toString() << ", link not up");
+                return -1;
+        }
+
+        // send message
+        transport->sendMessage( &msg );
+        return ++currentSeqnum;
 }
 
@@ -466 +453 @@
                 }
 
-                if( linkDesc.waitingmsg.size() > 0 ){
-                        logging_info( "sending out queued messages on link " << linkDesc.localLink.toString() );
-
-                        BOOST_FOREACH( Message* msg, linkDesc.waitingmsg ){
-                                sendMessage( linkDesc.localLink, msg );
-                                delete msg;
-                        }
-
-                        linkDesc.waitingmsg.clear();
-                }
-
         } // LINK_STATE_OPEN_REPLY
 
@@ -503 +479 @@
                         i->onLinkDown( linkDesc.localLink, linkDesc.localLocator, linkDesc.remoteLocator );
                 }
-
-                //
-                // delete all pending messages for the link that has been closed
-                //
-
-                BOOST_FOREACH( Message* msg, linkDesc.waitingmsg ){
-                        delete msg;
-                }
-
-                linkDesc.waitingmsg.clear();
 
                 //
@@ -579 +545 @@
                 if( (*i).localLink != localLink) continue;
 
-                BOOST_FOREACH( Message* msg, i->waitingmsg ){
-                        delete msg;
-                }
-
-                i->waitingmsg.clear();
                 linkSet.erase( i );
-
                 break;
         }

source/ariba/communication/BaseCommunication.h

@@ -46 +46 @@
 #include <vector>
 #include <iostream>
-#include <deque>
 #include <algorithm>
 #include <boost/foreach.hpp>
@@ -78 +77 @@
 using std::map;
 using std::vector;
-using std::deque;
 using std::pair;
 using std::make_pair;
@@ -256 +254 @@
                         remoteEndpoint(desc.remoteEndpoint),
                         linkup(desc.linkup) {
-
-                        BOOST_FOREACH( Message* msg, desc.waitingmsg ){
-                                waitingmsg.push_back( msg );
-                        }
                 }
 
@@ -266 +260 @@
                 }
 
-                LinkID                  localLink;
+                LinkID                                  localLink;
                 const NetworkLocator*   localLocator;
-                LinkID                  remoteLink;
+                LinkID                                  remoteLink;
                 const NetworkLocator*   remoteLocator;
-                EndpointDescriptor      remoteEndpoint;
-
-                bool                    linkup;
-                deque<Message*>         waitingmsg;
+                EndpointDescriptor              remoteEndpoint;
+
+                bool                                    linkup;
         };