Changeset 571 for code/branches

Timestamp:

Dec 17, 2007, 1:51:14 PM (17 years ago)

Author:

scheusso

Message:

cmakelists

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (1 diff)
• src/network/GameStateManager.cc (modified) (1 diff)
• src/network/Synchronisable.cc (modified) (3 diffs)
• src/network/Synchronisable.h (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -49 +49 @@
 SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O2 -Wall -g -ggdb")
 #SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O2 -Wall -g -ggdb")
-SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -Wall -g -ggdb")
+SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O2 -Wall -g -ggdb")
 SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
 

code/branches/FICN/src/network/GameStateManager.cc

@@ -164 +164 @@
 
 GameStateCompressed GameStateManager::compress_(GameState *a) {
+  COUT(2) << "compressing gamestate" << std::endl;
   int size = a->size;
   uLongf buffer = (uLongf)((a->size + 12)*1.01)+1;

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

@@ -59 +59 @@
  * @return data containing all variables and their sizes
  */
-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 ;)
-    if(i->type == STRING)
-      totalsize+=sizeof(int)+((std::string *)i->var)->length()+1;
-    else
-      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
-  //CHANGED: REMOVED DECLARATION int n=0 FROM LOOP
-  int n=0;
-  for(i=syncList.begin(); n<totalsize && i!=syncList.end(); i++){
-    std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int));
-    n+=sizeof(int);
-    switch(i->type){
-    case STRING:
-      std::memcpy(retVal.data+n, (const void *)(((std::string *)i->var)->c_str()), ((std::string *)i->var)->length()+1);
-      n+=((std::string *)i->var)->length()+1;
-      break;
-    case DATA:
-      std::memcpy(retVal.data+n, ((const void*)i->var), i->size);
-      n+=i->size;
-      break;
-    }
-  }
-  return retVal;
-}
+// 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 ;)
+//     if(i->type == STRING)
+//       totalsize+=sizeof(int)+((std::string *)i->var)->length()+1;
+//     else
+//       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
+//   //CHANGED: REMOVED DECLARATION int n=0 FROM LOOP
+//   int n=0;
+//   for(i=syncList.begin(); n<totalsize && i!=syncList.end(); i++){
+//     std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int));
+//     n+=sizeof(int);
+//     switch(i->type){
+//     case STRING:
+//       std::memcpy(retVal.data+n, (const void *)(((std::string *)i->var)->c_str()), ((std::string *)i->var)->length()+1);
+//       n+=((std::string *)i->var)->length()+1;
+//       break;
+//     case DATA:
+//       std::memcpy(retVal.data+n, ((const void*)i->var), i->size);
+//       n+=i->size;
+//       break;
+//     }
+//   }
+//   return retVal;
+// }
 /**
  * This function takes all SynchronisableVariables out of the Synchronisable and saves it into a syncData struct
@@ -114 +114 @@
   // copy to location
   int n=0;
-  for(i=syncList.begin(); n<datasize && i!=syncList.end(); i++){
+  for(i=syncList.begin(); n<datasize && i!=syncList.end(); ++i){
     //COUT(2) << "size of variable: " << i->size << std::endl;
     //COUT(2) << "size of variable: " << i->size << std::endl;
-    std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
+    //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
+    *((int *)(retVal.data+n)) = i->size;
     n+=sizeof(int);
     switch(i->type){
@@ -125 +126 @@
         break;
       case STRING:
-        std::memcpy(retVal.data+n, (const void*)(((std::string *)i->var)->c_str()), ((std::string *)i->var)->length()+1);
+        std::memcpy( retVal.data+n, (const void*)( ( (std::string *) i->var)->c_str()), ( (std::string *)i->var )->length()+1);
         n+=((std::string *) i->var)->length()+1;
         break;

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

@@ -54 +54 @@
     
   void registerVar(const void *var, int size, variableType t);
-  syncData getData();
+//  syncData getData();
   syncData getData(unsigned char *mem);
   int getSize();