certi RTIA/FederationManagement.cc RTIG/RTIG_pr...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/02/15 14:16:20

Modified files:
        RTIA           : FederationManagement.cc 
        RTIG           : RTIG_processing.cc 
        libCERTI       : Message.cc NetworkMessage.cc 

Log message:
        Request Federation Restore implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.45&r2=3.46
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.51&r2=3.52
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.cc?cvsroot=certi&r1=3.47&r2=3.48
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.27&r2=3.28

Patches:
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.45
retrieving revision 3.46
diff -u -b -r3.45 -r3.46
--- RTIA/FederationManagement.cc        14 Feb 2008 09:43:23 -0000      3.45
+++ RTIA/FederationManagement.cc        15 Feb 2008 14:16:19 -0000      3.46
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: FederationManagement.cc,v 3.45 2008/02/14 09:43:23 rousse Exp $
+// $Id: FederationManagement.cc,v 3.46 2008/02/15 14:16:19 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -894,7 +894,8 @@
         throw RestoreNotRequested("Federation did not initiate restoring.");
 
     NetworkMessage req ;
-
+    req.federate = federate ;
+    req.federation = _numero_federation ;
     if (status)
         req.type = NetworkMessage::FEDERATE_RESTORE_COMPLETE ;
     else
@@ -1003,4 +1004,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: FederationManagement.cc,v 3.45 2008/02/14 09:43:23 rousse Exp $
+// $Id: FederationManagement.cc,v 3.46 2008/02/15 14:16:19 rousse Exp $

Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.51
retrieving revision 3.52
diff -u -b -r3.51 -r3.52
--- RTIG/RTIG_processing.cc     13 Feb 2008 16:28:30 -0000      3.51
+++ RTIG/RTIG_processing.cc     15 Feb 2008 14:16:19 -0000      3.52
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG_processing.cc,v 3.51 2008/02/13 16:28:30 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.52 2008/02/15 14:16:19 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -503,17 +503,16 @@
 void
 RTIG::processFederateSaveBegun(Socket *, NetworkMessage *req)
 {
-    G.Out(pdGendoc,"BEGIN ** FEDERATE SAVE BEGUN SERVICE **");
     G.Out(pdGendoc,"enter RTIG::processFederateSaveBegun");
-
+    G.Out(pdGendoc,"BEGIN ** FEDERATE SAVE BEGUN SERVICE **");
     G.Out(pdGendoc,"processFederateSaveBegun federation = %d",req->federation);
 
     auditServer << "Federate " << req->federate << " save begun." ;
 
     federations.federateSaveBegun(req->federation, req->federate);
 
-    G.Out(pdGendoc,"exit  RTIG::processFederateSaveBegun");
     G.Out(pdGendoc,"END   ** FEDERATE SAVE BEGUN SERVICE **");
+    G.Out(pdGendoc,"exit  RTIG::processFederateSaveBegun");
 }
 
 // ----------------------------------------------------------------------------
@@ -521,12 +520,17 @@
 RTIG::processFederateSaveStatus(Socket *, NetworkMessage *req)
 {
     G.Out(pdGendoc,"enter RTIG::processFederateSaveStatus");
+    if (req->type == NetworkMessage::FEDERATE_SAVE_COMPLETE)
+        G.Out(pdGendoc,"BEGIN ** FEDERATE SAVE COMPLETE SERVICE **");
+    else
+        G.Out(pdGendoc,"BEGIN ** FEDERATE SAVE NOT COMPLETE SERVICE **");
 
     auditServer << "Federate " << req->federate << " save ended." ;
 
     bool status = req->type == NetworkMessage::FEDERATE_SAVE_COMPLETE ;
     federations.federateSaveStatus(req->federation, req->federate, status);
 
+    G.Out(pdGendoc,"exit  END   ** FEDERATE SAVE (NOT) COMPLETE SERVICE **");
     G.Out(pdGendoc,"exit  RTIG::processFederateSaveStatus");
 }
 
@@ -553,7 +557,9 @@
     auditServer << "Federate " << req->federate << " restore ended." ;
 
     bool status = req->type == NetworkMessage::FEDERATE_RESTORE_COMPLETE ;
+
     federations.federateRestoreStatus(req->federation, req->federate, status);
+
     G.Out(pdGendoc,"exit  RTIG::processRequestFederateRestoreStatus");
     G.Out(pdGendoc,"END   ** FEDERATE RESTORE (NOT)COMPLETE **");
 }
@@ -1344,4 +1350,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.51 2008/02/13 16:28:30 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.52 2008/02/15 14:16:19 rousse Exp $

Index: libCERTI/Message.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.cc,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -b -r3.47 -r3.48
--- libCERTI/Message.cc 13 Feb 2008 16:28:30 -0000      3.47
+++ libCERTI/Message.cc 15 Feb 2008 14:16:19 -0000      3.48
@@ -649,6 +649,10 @@
     else if ( type == JOIN_FEDERATION_EXECUTION )
       printf("JOIN_FEDERATION_EXECUTION : federate number %d federation name 
%s federate name %s\n",
              
federate,((federationName==NULL)?"empty":federationName),federateName) ;
+    else if (type == FEDERATE_RESTORE_COMPLETE )
+        printf("FEDERATE_RESTORE_COMPLETE : federationName %s : federatehandle 
%d \n",federationName,federate);
+    else if (type == FEDERATE_SAVE_COMPLETE )
+        printf("FEDERATE_SAVE_COMPLETE : federationName %s : federatehandle %d 
\n",federationName,federate);
     else
         printf(" type=%d :", type);
     printf(" date=%f: ", fed_time.getTime());

Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- libCERTI/NetworkMessage.cc  13 Feb 2008 16:28:30 -0000      3.27
+++ libCERTI/NetworkMessage.cc  15 Feb 2008 14:16:20 -0000      3.28
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: NetworkMessage.cc,v 3.27 2008/02/13 16:28:30 rousse Exp $
+// $Id: NetworkMessage.cc,v 3.28 2008/02/15 14:16:20 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -45,6 +45,10 @@
              
((federationName==NULL)?"empty":federationName),federate,federation) ;
     else if (type == JOIN_FEDERATION_EXECUTION )
         printf("JOIN_FEDERATION_EXECUTION : federation %s : federate %s 
\n",federationName,federateName);
+    else if (type == FEDERATE_RESTORE_COMPLETE )
+        printf("FEDERATE_RESTORE_COMPLETE : federationHandle %d : 
federatehandle %d \n",federation,federate);
+    else if (type == FEDERATE_SAVE_COMPLETE )
+        printf("FEDERATE_SAVE_COMPLETE : federationHandle %d : federatehandle 
%d \n",federation,federate);
     else if (type == GET_FED_FILE ) 
         printf("GET_FED_FILE : number %ld\n",number) ;
     else
@@ -361,4 +365,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage.cc,v 3.27 2008/02/13 16:28:30 rousse Exp $
+// $Id: NetworkMessage.cc,v 3.28 2008/02/15 14:16:20 rousse Exp $