Revision 27:67c37f97fc66, committed 2013-04-03

Comitter:

IngesupMbed01

Date:

Wed Apr 03 12:45:19 2013 +0000

Parent:

25:b447351dcbc7

Parent:

26:814d9b08aa68

Child:

28:8b5ccd2f837e

Commit message:

Ajout des modifications pour les buffers de trame.

Changed in this revision

--- a/Service/Buffer_Trame.cpp	Wed Apr 03 12:41:13 2013 +0000
+++ b/Service/Buffer_Trame.cpp	Wed Apr 03 12:45:19 2013 +0000
@@ -26,6 +26,7 @@
     m_maxSize = default_size;
     m_currentReadIndex = 0;
     m_currentWriteIndex = 0;
+    m_numberMessage = 0;
  }
  
  C_FrameBuffer::C_FrameBuffer(unsigned int size)
@@ -34,6 +35,7 @@
     m_frameBuffer = new frame[m_maxSize];
     m_currentReadIndex = 0;
     m_currentWriteIndex = 0;
+    m_numberMessage = 0;
  }
  
  /* DESTRUCTEUR */
@@ -43,6 +45,7 @@
     m_maxSize = 0;
     m_currentReadIndex = 0;
     m_currentWriteIndex = 0;
+    m_numberMessage = 0;
  }
  
  /* Propriétés */
@@ -50,6 +53,7 @@
  {
     m_frameBuffer[m_currentWriteIndex] = newFrame;
     m_currentWriteIndex++;
+    m_numberMessage++;
     
     if(m_currentWriteIndex >= m_maxSize) m_currentWriteIndex = 0;
  }
@@ -58,6 +62,7 @@
  {
     frame newFrame = m_frameBuffer[m_currentReadIndex];
     m_currentReadIndex++;
+    m_numberMessage--;
     
     if(m_currentReadIndex >= m_maxSize) m_currentReadIndex = 0;
     
@@ -81,21 +86,12 @@
     return m_currentReadIndex;
  }
  
- void C_FrameBuffer::currentReadIndex(unsigned int newIndex)
- {
-    if(newIndex >= m_maxSize) newIndex = m_maxSize;
-    
-    m_currentReadIndex = newIndex;
- }
- 
  unsigned int C_FrameBuffer::currentWriteIndex(void)
  {
     return m_currentWriteIndex;
  }
  
- void C_FrameBuffer::currentWriteIndex(unsigned int newIndex)
+ unsigned int C_FrameBuffer::numberMessage(void)
  {
-    if(newIndex >= m_maxSize) newIndex = m_maxSize;
-    
-    m_currentWriteIndex = newIndex;
+    return m_numberMessage;
  }
\ No newline at end of file

--- a/Service/Buffer_Trame.h	Wed Apr 03 12:41:13 2013 +0000
+++ b/Service/Buffer_Trame.h	Wed Apr 03 12:45:19 2013 +0000
@@ -37,6 +37,7 @@
     frame * m_frameBuffer;
     unsigned int m_currentReadIndex;
     unsigned int m_currentWriteIndex;
+    unsigned int m_numberMessage;
     unsigned int m_maxSize;
     
  public :
@@ -53,9 +54,8 @@
     frame frameBuffer(unsigned int index);
     unsigned int maxSize(void);
     unsigned int currentReadIndex(void);
-    void currentReadIndex(unsigned int newIndex);
     unsigned int currentWriteIndex(void);
-    void currentWriteIndex(unsigned int newIndex);
+    unsigned int numberMessage(void);
  };
  
  #endif
\ No newline at end of file