Changeset 25507 for issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

Timestamp:

09/01/20 14:46:34 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleanup

File:

• issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h (modified) (9 diffs)

issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

@@ -53 +53 @@
                         fwrite(&step,sizeof(int),1,fid);
                 } /*}}}*/
-                void GenericMarshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-
-                        MARSHALLING_ENUM(this->ObjectEnum());
-                        MARSHALLING(id);
-                        MARSHALLING(step);
-                        MARSHALLING(time);
+                void GenericMarshall(MarshallHandle* marshallhandle){/*{{{*/
+
+                        int object_enum = this->ObjectEnum();
+                        marshallhandle->call(object_enum);
+                        marshallhandle->call(this->id);
+                        marshallhandle->call(this->step);
+                        marshallhandle->call(this->time);
 
                         /*Marshal result name*/
                         int size = 0;
-                        if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE) size=strlen(result_name)+1;
-                        MARSHALLING(size);
-                        MARSHALLING_DYNAMIC(result_name,char,size);
+                        if(marshallhandle->OperationNumber()==MARSHALLING_WRITE || marshallhandle->OperationNumber() == MARSHALLING_SIZE) size=strlen(result_name)+1;
+                        marshallhandle->call(size);
+                        marshallhandle->call(this->result_name,size);
 
                         /*Marshall value*/
                         this->value=0;
                         bool isnull=true;
-                        if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE){
+                        if(marshallhandle->OperationNumber()==MARSHALLING_WRITE || marshallhandle->OperationNumber() == MARSHALLING_SIZE){
                                 if(value) isnull=false;
                         }
-                        MARSHALLING(isnull);
-                        if(!isnull){MARSHALLING(value);}
+                        marshallhandle->call(isnull);
+                        if(!isnull){
+                                marshallhandle->call(this->value);
+                        }
                 }  /*}}}*/
 
@@ -167 +170 @@
                         _error_("template ObjectEnum not implemented for this ResultType\n");
                 } /*}}}*/
-                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-                        _error_("not implemented yet!"); 
-                } 
-                /*}}}*/
                 void Marshall2(MarshallHandle* marshallhandle){/*{{{*/
                         _error_("not implemented yet!"); 
@@ -239 +238 @@
         return BoolExternalResultEnum;
 } /*}}}*/
-template <> inline void GenericExternalResult<bool>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-
-        this->GenericMarshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+template <> inline void GenericExternalResult<bool>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
+
+        this->GenericMarshall(marshallhandle);
 
 }  /*}}}*/
@@ -256 +255 @@
         return IntExternalResultEnum;
 } /*}}}*/
-template <> inline void GenericExternalResult<int>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-
-        this->GenericMarshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-
+template <> inline void GenericExternalResult<int>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
+        this->GenericMarshall(marshallhandle);
 }  /*}}}*/
 
@@ -276 +273 @@
         return value;
 } /*}}}*/
-template <> inline void GenericExternalResult<double>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-
-        this->GenericMarshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-
+template <> inline void GenericExternalResult<double>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
+        this->GenericMarshall(marshallhandle);
 }  /*}}}*/
 
@@ -347 +342 @@
         return StringExternalResultEnum;
 } /*}}}*/
-template <> inline void GenericExternalResult<char*>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
+template <> inline void GenericExternalResult<char*>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
 
         int size = 0;
 
-        if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;
-
-        MARSHALLING(id);
-        MARSHALLING(result_name);
-        MARSHALLING(size);
-        MARSHALLING_DYNAMIC(value,char,size);
-        MARSHALLING(step);
-        MARSHALLING(time);
+        if(marshallhandle->OperationNumber()==MARSHALLING_WRITE || marshallhandle->OperationNumber() == MARSHALLING_SIZE)size=strlen(value)+1;
+
+        marshallhandle->call(this->id);
+        marshallhandle->call(this->result_name);
+        marshallhandle->call(size);
+        marshallhandle->call(this->value,size);
+        marshallhandle->call(this->step);
+        marshallhandle->call(this->time);
 
 }  /*}}}*/
@@ -477 +472 @@
         return IntMatExternalResultEnum;
 } /*}}}*/
-template <> inline void GenericExternalResult<int*>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-
-        MARSHALLING_ENUM(this->ObjectEnum());
-
-        MARSHALLING(id);
-        MARSHALLING(result_name);
-        MARSHALLING(M);
-        MARSHALLING(N);
-        MARSHALLING_DYNAMIC(value,int,M*N);
-        MARSHALLING(step);
-        MARSHALLING(time);
+template <> inline void GenericExternalResult<int*>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
+
+        int object_enum = this->ObjectEnum();
+        marshallhandle->call(object_enum);
+
+        marshallhandle->call(this->id);
+        marshallhandle->call(this->result_name);
+        marshallhandle->call(this->M);
+        marshallhandle->call(this->N);
+        marshallhandle->call(this->value,M*N);
+        marshallhandle->call(this->step);
+        marshallhandle->call(this->time);
 
 }  /*}}}*/
@@ -609 +605 @@
         return value;
 } /*}}}*/
-template <> inline void GenericExternalResult<IssmPDouble*>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
-
-        MARSHALLING_ENUM(this->ObjectEnum());
-
-        MARSHALLING(id);
-        MARSHALLING(result_name);
-        MARSHALLING(M);
-        MARSHALLING(N);
-        MARSHALLING_DYNAMIC(value,IssmPDouble,M*N);
-        MARSHALLING(step);
-        MARSHALLING(time);
+template <> inline void GenericExternalResult<IssmPDouble*>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
+
+        int object_enum = this->ObjectEnum();
+        marshallhandle->call(object_enum);
+
+        marshallhandle->call(this->id);
+        marshallhandle->call(this->result_name);
+        marshallhandle->call(this->M);
+        marshallhandle->call(this->N);
+        marshallhandle->call(this->value,M*N);
+        marshallhandle->call(this->step);
+        marshallhandle->call(this->time);
 
 }  /*}}}*/
@@ -831 +828 @@
         }
         /*}}}*/
-        template <> inline void GenericExternalResult<Vector<IssmDouble>*>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
+        template <> inline void GenericExternalResult<Vector<IssmDouble>*>::Marshall2(MarshallHandle* marshallhandle){/*{{{*/
 
                 _error_("GenericExternalResult instantiated for type Vector<IssmDouble>* called " << result_name << " not implemented yet");