[certi-cvs] certi/RTIA FederationManagement.cc main.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/03/12 15:00:46

Modified files:
        RTIA           : FederationManagement.cc main.cc 

Log message:
        #22509 bug correction (I hope) Please test it !!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.49&r2=3.50
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/main.cc?cvsroot=certi&r1=3.17&r2=3.18

Patches:
Index: FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.49
retrieving revision 3.50
diff -u -b -r3.49 -r3.50
--- FederationManagement.cc     10 Mar 2008 10:55:54 -0000      3.49
+++ FederationManagement.cc     12 Mar 2008 15:00:45 -0000      3.50
@@ -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.49 2008/03/10 10:55:54 rousse Exp $
+// $Id: FederationManagement.cc,v 3.50 2008/03/12 15:00:45 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -63,7 +63,7 @@
 
     _fin_execution = false ;
 
-    _est_createur_federation = false ;
+    //_est_createur_federation = false ;
     _est_membre_federation = false ;
 
     _nom_federation = NULL ;
@@ -158,7 +158,7 @@
             _nom_federation = new char[strlen(theName)+1] ;
             strcpy(_nom_federation, theName);
             _numero_federation = reponse.federation ;
-            _est_createur_federation = true ;
+            //_est_createur_federation = true ;
             D.Out(pdInit, "est createur");
             }
         else if (reponse.exception == e_CouldNotOpenFED)
@@ -234,7 +234,7 @@
         if (reponse.exception == e_NO_EXCEPTION) {
             _nom_federation = NULL ;
             _numero_federation = 0 ;
-            _est_createur_federation = false ;
+            //_est_createur_federation = false ;
             _fin_execution = true ;
             // Now, remove temporary file (if not yet done)
             if ( _FEDid != NULL )
@@ -270,9 +270,6 @@
 
     e = e_NO_EXCEPTION ;
 
-    if (_est_createur_federation && strcmp(Federation, _nom_federation))
-        e = e_RTIinternalError ;
-
     if (_est_membre_federation)
         e = e_FederateAlreadyExecutionMember ;
 
@@ -435,6 +432,8 @@
     NetworkMessage msg ;
     TypeException exception = e_NO_EXCEPTION ;
 
+    G.Out(pdGendoc,"enter FederationManagement::resignFederationExecution");
+
     e = e_NO_EXCEPTION ;
 
     D.Out(pdInit, "Resign Federation.");
@@ -452,6 +451,7 @@
         msg.federation = _numero_federation ;
         msg.federate = federate ;
 
+        G.Out(pdGendoc,"      resignFederationExecution ===> send NMessage RFE 
to RTIG");
         comm->sendMessage(&msg);
 
         _est_membre_federation = false ;
@@ -468,9 +468,10 @@
             }
 
         // BUG: Voir DestroyFederation ou ~GF.
-        if (!_est_createur_federation)
-            _fin_execution = true ;
+       // if (!_est_createur_federation)
+          //_fin_execution = true ;
     }
+    G.Out(pdGendoc,"exit  FederationManagement::resignFederationExecution");
 }
 
 // ----------------------------------------------------------------------------
@@ -1011,4 +1012,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: FederationManagement.cc,v 3.49 2008/03/10 10:55:54 rousse Exp $
+// $Id: FederationManagement.cc,v 3.50 2008/03/12 15:00:45 rousse Exp $

Index: main.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/main.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- main.cc     22 Oct 2007 14:24:23 -0000      3.17
+++ main.cc     12 Mar 2008 15:00:46 -0000      3.18
@@ -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: main.cc,v 3.17 2007/10/22 14:24:23 erk Exp $
+// $Id: main.cc,v 3.18 2008/03/12 15:00:46 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -60,6 +60,7 @@
                        cerr << "RTIA:: RTIA has thrown " << e._name << " 
exception." << endl;
                        if (e._reason) {
                                cerr << "RTIA:: Reason: " << e._reason << endl;
+                        rtia.displayStatistics();
                        }
 
                        return (EXIT_FAILURE);
@@ -79,12 +80,9 @@
 
 // ----------------------------------------------------------------------------
 void SignalHandler(int Signal) {
-       int pid = getpid();
 
        printf("\nRTIA: Received signal %d. Exiting peacefully.\n", Signal);
        //exit(0);
-       //If you want to KILL yourself exit is enough :))
-       //kill(SIGKILL, pid);
 }
 
 // ----------------------------------------------------------------------------
@@ -92,4 +90,4 @@
        throw MemoryExhausted("RTIA has exhausted memory error");
 }
 
-// EOF $Id: main.cc,v 3.17 2007/10/22 14:24:23 erk Exp $
+// EOF $Id: main.cc,v 3.18 2008/03/12 15:00:46 rousse Exp $