Changeset 4421

Timestamp:

07/07/10 08:34:02 (15 years ago)

Author:

seroussi

Message:

marshall/demarshall hook if NULL in Tria

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (5 diffs)

issm/trunk/src/c/objects/Elements/Tria.cpp ¶

@@ -145 +145 @@
         char* marshalled_dataset=NULL;
         int i;
+        int flaghook;
 
         /*recover marshalled_dataset: */
@@ -159 +160 @@
         /*demarshall hooks: */
         for(i=0;i<numanalyses;i++){
-                hnodes[i]=new Hook();
-                hnodes[i]->Demarshall(&marshalled_dataset);
+                memcpy(&flaghook,marshalled_dataset,sizeof(flaghook));marshalled_dataset+=sizeof(flaghook);
+                if(flaghook){ // there is a hook so demarshall it
+                        hnodes[i]=new Hook();
+                        hnodes[i]->Demarshall(&marshalled_dataset);
+                }
+                else hnodes[i]=NULL; //There is no hook so it is NULL
         }
         hmatice=new Hook(); hmatice->Demarshall(&marshalled_dataset);
@@ -231 +236 @@
         char* marshalled_results=NULL;
         int   marshalled_results_size;
+        int   flaghook; //to indicate if hook is NULL or exists
 
         /*recover marshalled_dataset: */
@@ -246 +252 @@
         memcpy(marshalled_dataset,&numanalyses,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses);
 
-        /*Marshall hooks: */
-        for(i=0;i<numanalyses;i++)hnodes[i]->Marshall(&marshalled_dataset);
+ /*Marshall hooks: */
+        for(i=0;i<numanalyses;i++){
+                if(hnodes[i]){
+                        /*Set flag to 1 as there is a hook */
+                        flaghook=1;
+                        memcpy(marshalled_dataset,&flaghook,sizeof(flaghook));marshalled_dataset+=sizeof(flaghook);
+                        hnodes[i]->Marshall(&marshalled_dataset);
+                }
+                else{
+                        /*Set flag to 0 and do not marshall flag as there is no Hook */
+                        flaghook=0;
+                        memcpy(marshalled_dataset,&flaghook,sizeof(flaghook));marshalled_dataset+=sizeof(flaghook);
+                }
+        }
         hmatice->Marshall(&marshalled_dataset);
         hmatpar->Marshall(&marshalled_dataset);
@@ -278 +296 @@
         int hnodes_size=0;;
 
-        for(i=0;i<numanalyses;i++)hnodes_size+=hnodes[i]->MarshallSize();
+        for(i=0;i<numanalyses;i++){
+                hnodes_size+=sizeof(int); //Flag 0 or 1
+                if (hnodes[i]) hnodes_size+=hnodes[i]->MarshallSize();
+        }
 
         return sizeof(id)