Changeset 198 for XMLIO_V2/dev/dev_rv/src/xmlio/circular_buffer.cpp

Timestamp:

05/19/11 19:06:32 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/circular_buffer.cpp (modified) (4 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/circular_buffer.cpp

@@ -50 +50 @@
          nbargs    = SuperClass::getInt(startpos + currsize);
          currsize += SuperClass::getRequestedSize(nbargs);
-
+         
          for (long int i = 0; i < nbargs; i++)
          {
             CBufferData bufdata;
-            SuperClass::getBufferData(bufdata, currsize);
+            SuperClass::getBufferData(bufdata, startpos + currsize);
             currsize += (bufdata.size + DATA_HEADER_SIZE);
          }
@@ -66 +66 @@
          StdSize startpos = this-> p_read;
          StdSize currsize = this->getNextRequestSize();
+        
          this->movePRead(currsize);
          this->nbrequest--;
+         std::cout <<  this->nbrequest << std::endl;
+        
          return (CLinearBuffer(SuperClass::getData(startpos), currsize));
       }
@@ -111 +114 @@
       {
          this-> p_read += data_size;
+         if ((this-> p_read == this-> p_unused) &&
+             (this-> p_read == this-> p_write))
+         {
+            this->clear();
+         }
+         
          if (this-> p_read == this-> p_unused)
          {
             this-> p_unused = this-> p_write;
             this-> p_read   = 0;
+            return;
          }
          if (this-> p_read == this-> p_write)
+         {
             this->clear();
+         }
       }
       
@@ -209 +221 @@
       void CCircularBuffer::updateNbRequests(StdSize data_begin, StdSize data_end)
       {
-         StdSize position = data_begin, i = 0;
+         StdSize position = data_begin;        
          while (position != data_end)
          {
-            i++;
             this->nbrequest++;
-            position = SuperClass::getNextDataPosition(position); // manager id
-            position = SuperClass::getNextDataPosition(position); // method id
+            position = SuperClass::getNextDataPosition(position); // manager id           
+            position = SuperClass::getNextDataPosition(position); // method id           
+            SuperClass::updateBufferData(position);
             long int nbarg = SuperClass::getInt(position);
             position = SuperClass::getNextDataPosition(position);
             for (long int i = 0; i < nbarg; i++)
                position = SuperClass::getNextDataPosition(position);
+               
+            if (position > data_end)
+              ERROR("CCircularBuffer::updateNbRequests(StdSize data_begin, StdSize data_end)",
+                     << "[ position courante" << position
+                     << ", fin de traitement" << data_end << " ] "
+                     << "Impossible de mettre à jour la liste des requêtes !");
          }
       }