Changeset 12774 for source/ariba/utility/transport/StreamTransport

Timestamp:

Mar 26, 2014, 6:44:32 PM (11 years ago)

Author:

hock@…

Message:

StreamTransport bug fixed!!

[ Back to normal. :-) ]

Location:

source/ariba/utility/transport/StreamTransport

Files:

• StreamTransport.cpp (modified) (4 diffs)
• StreamTransport.hpp (modified) (2 diffs)

source/ariba/utility/transport/StreamTransport/StreamTransport.cpp

@@ -366 +366 @@
         parent(parent),
         out_queues(8), //TODO How much priorities shall we have?
-        sending(false),
-        MAGIC_NUMBER(424242)
+        sending(false)
 {
         header.length = 0;
@@ -595 +594 @@
     bool restart_sending = false;
     
-        // FIXME Mario DEBUGGING  --  copy !!
-        reboost::shared_buffer_t buff = packet.linearize();
-        reboost::message_t msg;
-        msg.push_back(buff);
-        assert ( msg.MAGIC_NUMBER == 421337 );
-        // [ DEBUGGING ]
+        // debugging --> copy message (instead of zero copy)
+//      reboost::shared_buffer_t buff = packet.linearize();
+//      reboost::message_t msg;
+//      msg.push_back(buff);
+//      assert ( msg.MAGIC_NUMBER == 421337 );
+        // [ debugging ]
         
         
     // enqueue packet  [locked]
     {
-        boost::mutex::scoped_lock lock(out_queues_lock);
-                
-                int debuggingA = out_queues[priority].size();
-//              assert ( debuggingA < 1000 ); // XXX
+        unique_lock lock(out_queues_lock);
                 
                 assert ( this->valid );
-        
-        assert( priority < out_queues.size() );  // NOTE: actual assert, not in context with the extended debugging..
-//         out_queues[priority].push(packet);  // FIXME Mario
-                out_queues[priority].push(msg);            // FIXME Mario
-                
-                // XXX
-                int debuggingB = out_queues[priority].size();
-                int magic = out_queues[priority].back().MAGIC_NUMBER;
-                assert ( debuggingB == debuggingA + 1 );
-                assert ( magic == 421337 );
-        
+        assert( priority < out_queues.size() );
+
+                // * enqueue *
+                out_queues[priority].push(packet);
+                        
         if ( ! sending )
         {
@@ -643 +633 @@
     bool found = false;
 
-        // XXX Mario: Debugging
+        // I'm not sure if this can actually happen.. But let's be on the save side, here.
         if ( ! this->valid )
         {
                 this->sending = false;
-                cout << "/// StreamConnection::send_next_package() on INVALID STREAM" << endl;
                 return;
         }
@@ -653 +642 @@
     // find packet with highest priority  [locked]
     {
-        boost::mutex::scoped_lock lock(out_queues_lock);
+        unique_lock lock(out_queues_lock);
                 
-                assert ( this->valid ); // XXX TODO ggf. in if (valid) Àndern...
-                assert ( this->sending );
-                assert ( this->MAGIC_NUMBER == 424242 );
-                assert ( this->out_queues.size() == 8 );
-        
         for ( vector<OutQueue>::iterator it = out_queues.begin();
                 it != out_queues.end(); it++ )
         {
-                        int debugging = it->size();  // XXX debugging
-//                      assert ( debugging < 1000 );
-                        
             if ( !it->empty() )
             {

source/ariba/utility/transport/StreamTransport/StreamTransport.hpp

@@ -66 +66 @@
         virtual ~StreamConnection()
                 {
-                        // XXX MARIO Debugging
-                        std::cout << "/// ~StreamConnection(): " << this << ", SENDING: " << this->sending << ", VALID: " << this->valid << std::endl;
-                        
                         assert ( this->valid == false );
                 }
@@ -133 +130 @@
         shared_buffer_t buffy;
         
-                
-                // XXX Mario: Debugging
-                const int MAGIC_NUMBER;
     private:
         std::vector<ariba::utility::LinkID*> communication_links;