Changeset 25524

Timestamp:

09/03/20 10:51:58 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on better marshalling for AD

Location:

issm/trunk-jpl/src/c/classes

Files:

• DependentObject.cpp (modified) (1 diff)
• DependentObject.h (modified) (1 diff)
• Params/Parameters.cpp (modified) (1 diff)
• Params/StringArrayParam.cpp (modified) (2 diffs)
• Params/StringParam.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/DependentObject.cpp

@@ -77 +77 @@
 }
 /*}}}*/
+void    DependentObject::Marshall(MarshallHandle* marshallhandle){/*{{{*/
+
+        int object_enum = DependentObjectEnum;
+        marshallhandle->call(object_enum);
+
+        /*Marshall name (tricky)*/
+        marshallhandle->call(this->name);
+
+        marshallhandle->call(this->type);
+        marshallhandle->call(this->index);
+        marshallhandle->call(this->response_value);
+}
+/*}}}*/
 
 /*DependentObject methods: */

issm/trunk-jpl/src/c/classes/DependentObject.h

@@ -34 +34 @@
                 int   Id(); 
                 int   ObjectEnum();
-                void  Marshall(MarshallHandle* marshallhandle){_error_("not implemented yet!"); };
+                void  Marshall(MarshallHandle* marshallhandle);
 
                 /*DependentObject methods: */

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -117 +117 @@
         marshallhandle->call(obj_enum);
 
-        if(marshallhandle->OperationNumber()==MARSHALLING_WRITE || marshallhandle->OperationNumber()==MARSHALLING_SIZE){
+        if(marshallhandle->OperationNumber()!=MARSHALLING_LOAD){
 
                 /*Marshall num_params first*/

issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp

@@ -75 +75 @@
 void StringArrayParam::Marshall(MarshallHandle* marshallhandle){ /*{{{*/
 
-        int* sizes=NULL;
-
-        if(marshallhandle->OperationNumber()==MARSHALLING_WRITE || marshallhandle->OperationNumber()==MARSHALLING_SIZE){
-                if(this->numstrings)sizes=xNew<int>(this->numstrings);
-                for(int i=0;i<numstrings;i++)sizes[i]=strlen(this->value[i])+1;
-        }       
-
         int object_enum = StringArrayParamEnum;
    marshallhandle->call(object_enum);
@@ -89 +82 @@
 
         if(this->numstrings){
-                marshallhandle->call(sizes,this->numstrings);
                 if(marshallhandle->OperationNumber()==MARSHALLING_LOAD){
                         this->value=xNew<char*>(this->numstrings);
                 }
                 for(int i=0;i<numstrings;i++){
-                        marshallhandle->call(this->value[i],sizes[i]);
+                        marshallhandle->call(this->value[i]);
                 }
         }
         else{
-                value=NULL;
+                this->value=NULL;
         }
-
-        //cleanup sizes array
-        if(sizes) xDelete<int>(sizes);
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/StringParam.cpp

@@ -52 +52 @@
 void StringParam::Marshall(MarshallHandle* marshallhandle){ /*{{{*/
 
-        int size = 0;
-        if(marshallhandle->OperationNumber()==MARSHALLING_WRITE || marshallhandle->OperationNumber() == MARSHALLING_SIZE){
-                size=strlen(value)+1;
-        }
-
         int object_enum = StringParamEnum;
    marshallhandle->call(object_enum);
-
         marshallhandle->call(this->enum_type);
-        marshallhandle->call(size);
-        marshallhandle->call(this->value,size);
+        marshallhandle->call(this->value);
 }
 /*}}}*/