Changeset 237

Timestamp:

Nov 21, 2007, 6:08:34 PM (16 years ago)

Author:

scheusso

Message:

synchronisable

Location:

code/branches/network/src/network

Files:

• Makefile (modified) (1 diff)
• Makefile.tardis (modified) (2 diffs)
• PacketDecoder.cc (modified) (1 diff)
• Synchronisable.cc (modified) (2 diffs)
• Synchronisable.h (modified) (2 diffs)

code/branches/network/src/network/Makefile

@@ -27 +27 @@
 Server.o: Server.cc
         ${CC} -c Server.cc -g ${INC}
+Synchronisable.o: Synchronisable.cc
+        ${CC} -c Synchronisable.cc -g ${INC}
 
 clean:

code/branches/network/src/network/Makefile.tardis

@@ -1 +1 @@
 all: server client
 
-CC=g++-3.4
+CC=g++-4.1.1
 
-BOOST_INC=/usr/pack/boost-1.33.1-mo/i686-debian-linux3.1/include/
-BOOST_LIB=/usr/pack/boost-1.33.1-mo/i686-debian-linux3.1/lib/
+BOOST_INC=/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1/
+BOOST_LIB=/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib/
 MAIN_INC=..
 ENET_INC=/usr/pack/enet-2007-sd/include/
@@ -12 +12 @@
 
 # Link command:
-server: clean PacketBuffer.o ConnectionManager.o dummyserver.o
-        ${CC} ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread-gcc-mt -g ${INC} ${LIB} -Wl,-rpath,${BOOST_LIB} -Wl,-rpath,${ENET_LIB}
+server: clean PacketBuffer.o ConnectionManager.o dummyserver.o PacketGenerator.o PacketDecoder.o
+        ${CC} ConnectionManager.o dummyserver.o PacketBuffer.o PacketDecoder.o PacketGenerator.o -o server -lenet -lboost_thread-gcc41-mt -g ${INC} ${LIB} -Wl,-rpath,${BOOST_LIB} -Wl,-rpath,${ENET_LIB}
 
 dummyserver.o:
-        ${CC} -c dummyserver.cc -o dummyserver.o -g ${INC} -pthread
+        ${CC} -c dummyserver.cc -o dummyserver.o -g ${INC}
 # Compilation commands:
 
 ConnectionManager.o:
-        ${CC} -c ConnectionManager.cc -o ConnectionManager.o -g ${INC} -pthread
+        ${CC} -c ConnectionManager.cc -o ConnectionManager.o -g ${INC}
 
 PacketBuffer.o: 
-        ${CC} -c PacketBuffer.cc -o PacketBuffer.o -g ${INC} -pthread
+        ${CC} -c PacketBuffer.cc -o PacketBuffer.o -g ${INC}
+PacketGenerator.o: PacketGenerator.cc
+        ${CC} -c PacketGenerator.cc -o PacketGenerator.o -g ${INC}
+PacketDecoder.o: PacketDecoder.cc
+        ${CC} -c PacketDecoder.cc -o PacketDecoder.o -g ${INC}
 
 clean:
         rm -rf *.o
 
-client:
-        ${CC} dummyclient.cc -o client -lenet ${LIB} ${INC} -Wl,-rpath,${BOOST_LIB} -pthread
+client: dummyclient.cc PacketDecoder.o PacketGenerator.o
+        ${CC} PacketGenerator.o PacketDecoder.o dummyclient.cc -o client -lenet ${LIB} ${INC} -Wl,-rpath,${BOOST_LIB}

code/branches/network/src/network/PacketDecoder.cc

@@ -100 +100 @@
 {
         cout << "data id: " << data->id << endl;
+        cout << "blablabla" << endl;
         cout << "data:    " << data->message << endl;
 }

code/branches/network/src/network/Synchronisable.cc

@@ -16 +16 @@
 Synchronisable::Synchronisable()
 {
+  registerAllVariables();
 }
 
@@ -21 +22 @@
 Synchronisable::~Synchronisable()
 {
+  
 }
 
+void Synchronisable::registerVar(const void *var, int size){
+  synchronisableVariable temp={size, var};
+  syncList.push_back(temp);
+}
+syncData Synchronisable::getData(){
+  std::list<synchronisableVariable>::iterator i;
+  int totalsize=0;
+  //figure out size of data to be allocated
+  for(i=syncList.begin(); i!=syncList.end(); i++){
+    // increase size (size of variable and size of size of variable ;)
+    totalsize+=sizeof(int)+i->size;
+  }
+  syncData retVal;
+  retVal.objectID=this->objectID;
+  retVal.classID=this->classID;
+  retVal.length=totalsize;
+  // allocate memory
+  retVal.data = (unsigned char *)malloc(totalsize);
+  // copy to location
+  for(int n=0, i=syncList.begin(); n<totalsize && i!=syncList.end(); i++){
+    std::memcpy(retVal.data+n, i->size, sizeof(int));
+    n+=sizeof(int);
+    std::memcpy(retVal.data+n, *(*i.var), *i.size);
+    n+=i->size;
+  }
+  return retVal;
+}
+bool Synchronisable::updateData(syncData vars){
+  unsigned char *data=vars.data;
+  std::list<synchronisableVariable>::iterator i;
+  for(i=syncList.begin(); i!=syncList.end(); i++){
+    if((int)*data==i->size){
+      data+=sizeof(int);
+      memcpy(i->data, data, i->size);
+      data+=i->size;
+    } else
+      return false; //there was some problem with registerVar
+  }
+}
 
 }

code/branches/network/src/network/Synchronisable.h

@@ -13 +13 @@
 #define NETWORKSYNCHRONISABLE_H
 
+#include <list>
+
 namespace network {
 
+  
+struct syncData{
+  int length;
+  int classID;
+  int objectID;
+  unsigned char *data;
+};
+
+typedef struct synchronisableVariable{
+  int size;
+  const void *var;
+}SYNCVAR;
+
+  
 /**
  * This class is the base class of all the Objects in the universe that need to be synchronised over the network
@@ -22 +38 @@
 class Synchronisable{
 public:
-    Synchronisable();
+  Synchronisable();
 
-    ~Synchronisable();
+  ~Synchronisable();
+  int objectID;
+  int classID;
+    
+  void registerVar(const void *var, int size);
+  syncData getData();
+  bool updateData(syncData vars);
+  virtual void registerAllVariables();
 
+private:
+  std::list<SYNCVAR> syncList;
 };