Changeset 5806 in orxonox.OLD

Timestamp:

Nov 28, 2005, 6:49:58 PM (18 years ago)

Author:

patrick

Message:

network: made some functions and arguments const, since they musn't change any data.

Location:

branches/network/src

Files:

• lib/network/synchronizeable.cc (modified) (3 diffs)
• lib/network/synchronizeable.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (1 diff)
• subprojects/network/simple_sync.cc (modified) (4 diffs)
• subprojects/network/simple_sync.h (modified) (1 diff)

branches/network/src/lib/network/synchronizeable.cc

@@ -40 +40 @@
                           \brief write data to NetworkStream
  */
- void Synchronizeable::writeBytes(byte* data, int length)
+ void Synchronizeable::writeBytes(const byte* data, int length)
 {
 
@@ -51 +51 @@
                                  \brief read data from NetworkStream
  */
- int Synchronizeable::readBytes(byte* data)
+ int Synchronizeable::readBytes(byte* data) const
 {
 
@@ -59 +59 @@
 }
 
- void Synchronizeable::writeDebug()
+ void Synchronizeable::writeDebug() const
 {
 
 }
 
- void Synchronizeable::readDebug()
+ void Synchronizeable::readDebug() const
 {
 

branches/network/src/lib/network/synchronizeable.h

@@ -17 +17 @@
     ~Synchronizeable();
 
-    virtual void      writeBytes(byte* data, int length);
-    virtual int       readBytes(byte* data);
-    virtual void      writeDebug();
-    virtual void      readDebug();
+    virtual void      writeBytes(const byte* data, int length);
+    virtual int       readBytes(byte* data) const;
+    virtual void      writeDebug() const;
+    virtual void      readDebug() const;
 
-    inline const char* getName() { return this->name; }
+    inline const char* getName() const { return this->name; }
 
   private:

branches/network/src/subprojects/network/network_unit_test.cc

@@ -143 +143 @@
   if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
   nm->establishConnection(ip, *clientSync);
-  SDL_Delay(1000);
+  /* adding some break for connection setup */
+  SDL_Delay(20);
 
   /* synchronize the data 1 time (increment for longer tests) */

branches/network/src/subprojects/network/simple_sync.cc

@@ -60 +60 @@
  *  write data to Synchronizeable
  */
-void SimpleSync::writeBytes(byte* data, int length)
+void SimpleSync::writeBytes(const byte* data, int length)
 {
   PRINTF(0)("SimpleSync: got %i bytes of data\n", length);
@@ -80 +80 @@
  *  read data from Synchronizeable
  */
-int SimpleSync::readBytes(byte* data)
+int SimpleSync::readBytes(byte* data) const
 {
   PRINTF(0)("SimpleSync: sent %i bytes of data\n", this->outLength);
 
+  /* debug msg */
+  this->readDebug();
+
   /* write the test message */
   for( int i = 0; i < this->outLength; i++)
-  {
     data[i] = this->outData[i];
-  }
 
-  /* debug msg */
-  this->readDebug();
   /* return the length of the test */
   return this->outLength;
@@ -97 +96 @@
 
 
-void SimpleSync::writeDebug()
+void SimpleSync::writeDebug() const
 {
   PRINTF(0)("Write in bytes: \t(0 <-) |");
@@ -108 +107 @@
 
 
-void SimpleSync::readDebug()
+void SimpleSync::readDebug() const
 {
   PRINTF(0)("Read out bytes: \t(0 ->) |");

branches/network/src/subprojects/network/simple_sync.h

@@ -16 +16 @@
     ~SimpleSync();
 
-    virtual void writeBytes(byte* data, int length);
-    virtual int readBytes(byte* data);
+    virtual void writeBytes(const byte* data, int length);
+    virtual int readBytes(byte* data) const;
 
 
   private:
-    virtual void writeDebug();
-    virtual void readDebug();
+    virtual void writeDebug() const;
+    virtual void readDebug() const;