[certi-cvs] certi RTIA/RTIA_federate.cc RTIA/Statistics.cc ...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       08/10/10 15:18:23

Modified files:
        RTIA           : RTIA_federate.cc Statistics.cc 
        libCERTI       : Message.hh Message_R.cc Message_W.cc 
                         PrettyDebEx.cc 
        libRTI         : RTIambassador.cc 

Log message:
        Bug #24279: Using CLOSE_CONNEXION to terminate the RTIA connection.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.89&r2=3.90
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Statistics.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.50&r2=3.51
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.32&r2=3.33
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/PrettyDebEx.cc?cvsroot=certi&r1=4.4&r2=4.5
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.94&r2=3.95

Patches:
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.89
retrieving revision 3.90
diff -u -b -r3.89 -r3.90
--- RTIA/RTIA_federate.cc       10 Oct 2008 14:04:48 -0000      3.89
+++ RTIA/RTIA_federate.cc       10 Oct 2008 15:18:22 -0000      3.90
@@ -67,6 +67,7 @@
 //D.Mes(pdMessage, 'N', type);
 
     switch (type) {
+      case Message::CLOSE_CONNEXION:
       case Message::RESIGN_FEDERATION_EXECUTION:
       case Message::TICK_REQUEST:
       case Message::TICK_REQUEST_NEXT:
@@ -123,6 +124,13 @@
 
     switch(req->type) {
 
+      case Message::CLOSE_CONNEXION:
+        D.Out(pdTrace,
+              "Receiving Message from Federate, type CloseConnexion.");
+        fm->_fin_execution = true;
+        // the this->comm can now be used only to sent the CLOSE_CONNEXION 
response
+        break ;
+
       case Message::CREATE_FEDERATION_EXECUTION:
         D.Out(pdTrace,
               "Receiving Message from Federate, type CreateFederation.");

Index: RTIA/Statistics.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Statistics.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- RTIA/Statistics.cc  15 May 2008 12:41:44 -0000      3.16
+++ RTIA/Statistics.cc  10 Oct 2008 15:18:22 -0000      3.17
@@ -56,6 +56,9 @@
        myDisplay = false ;
 
     if (!initialized) {
+        FED_MSG_NAME(Message::CLOSE_CONNEXION);
+
+        // Federation
        FED_MSG_NAME(Message::CREATE_FEDERATION_EXECUTION);
        FED_MSG_NAME(Message::DESTROY_FEDERATION_EXECUTION);
        FED_MSG_NAME(Message::JOIN_FEDERATION_EXECUTION);
@@ -364,4 +367,4 @@
 #undef FED_MSG_NAME
 #undef RTI_MSG_NAME
 
-// $Id: Statistics.cc,v 3.16 2008/05/15 12:41:44 erk Exp $
+// $Id: Statistics.cc,v 3.17 2008/10/10 15:18:22 gotthardp Exp $

Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.50
retrieving revision 3.51
diff -u -b -r3.50 -r3.51
--- libCERTI/Message.hh 18 Sep 2008 14:41:28 -0000      3.50
+++ libCERTI/Message.hh 10 Oct 2008 15:18:22 -0000      3.51
@@ -80,6 +80,7 @@
 
     enum Type {
         NOT_USED = 0,
+        CLOSE_CONNEXION,
 
         // gestion federation
         CREATE_FEDERATION_EXECUTION,

Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -b -r3.32 -r3.33
--- libCERTI/Message_R.cc       10 Oct 2008 13:37:36 -0000      3.32
+++ libCERTI/Message_R.cc       10 Oct 2008 15:18:22 -0000      3.33
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Message_R.cc,v 3.32 2008/10/10 13:37:36 gotthardp Exp $
+// $Id: Message_R.cc,v 3.33 2008/10/10 15:18:22 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -95,6 +95,10 @@
 
         switch(type) {
 
+          // Empty body
+          case CLOSE_CONNEXION:
+            break;
+
           // Body contains federationName, FEDid
           // Note : relevant only on federate request
           case CREATE_FEDERATION_EXECUTION:
@@ -646,4 +650,4 @@
 
 } // namespace certi
 
-// $Id: Message_R.cc,v 3.32 2008/10/10 13:37:36 gotthardp Exp $
+// $Id: Message_R.cc,v 3.33 2008/10/10 15:18:22 gotthardp Exp $

Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- libCERTI/Message_W.cc       10 Oct 2008 13:37:36 -0000      3.37
+++ libCERTI/Message_W.cc       10 Oct 2008 15:18:22 -0000      3.38
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Message_W.cc,v 3.37 2008/10/10 13:37:36 gotthardp Exp $
+// $Id: Message_W.cc,v 3.38 2008/10/10 15:18:22 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -95,6 +95,10 @@
         // 1- Prepare Body Structure according to Message type
         switch(type) {
 
+          // Empty body
+          case CLOSE_CONNEXION:
+            break;
+
           // Body contains federationName,FEDid
           case CREATE_FEDERATION_EXECUTION:
             writeFederationName(msgBuffer);
@@ -606,4 +610,4 @@
 
 } // namespace certi
 
-// $Id: Message_W.cc,v 3.37 2008/10/10 13:37:36 gotthardp Exp $
+// $Id: Message_W.cc,v 3.38 2008/10/10 15:18:22 gotthardp Exp $

Index: libCERTI/PrettyDebEx.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/PrettyDebEx.cc,v
retrieving revision 4.4
retrieving revision 4.5
diff -u -b -r4.4 -r4.5
--- libCERTI/PrettyDebEx.cc     12 May 2008 12:17:00 -0000      4.4
+++ libCERTI/PrettyDebEx.cc     10 Oct 2008 15:18:23 -0000      4.5
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: PrettyDebEx.cc,v 4.4 2008/05/12 12:17:00 erk Exp $
+// $Id: PrettyDebEx.cc,v 4.5 2008/10/10 15:18:23 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -63,6 +63,7 @@
        
        switch (testMess)
                {
+               case certi::Message::CLOSE_CONNEXION : 
strcat(theMessage,"CLOSE_CONNEXION"); break;
                case certi::Message::CREATE_FEDERATION_EXECUTION :              
                                        
strcat(theMessage,"CREATE_FEDERATION_EXECUTION"); break;
                case certi::Message::DESTROY_FEDERATION_EXECUTION :             
                                
strcat(theMessage,"DESTROY_FEDERATION_EXECUTION"); break;
                case certi::Message::JOIN_FEDERATION_EXECUTION :                
                                        
strcat(theMessage,"JOIN_FEDERATION_EXECUTION"); break;
@@ -307,4 +308,4 @@
 }
 #endif // NDEBUG
 
-// $Id: PrettyDebEx.cc,v 4.4 2008/05/12 12:17:00 erk Exp $
+// $Id: PrettyDebEx.cc,v 4.5 2008/10/10 15:18:23 gotthardp Exp $

Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.94
retrieving revision 3.95
diff -u -b -r3.94 -r3.95
--- libRTI/RTIambassador.cc     10 Oct 2008 13:42:58 -0000      3.94
+++ libRTI/RTIambassador.cc     10 Oct 2008 15:18:23 -0000      3.95
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambassador.cc,v 3.94 2008/10/10 13:42:58 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.95 2008/10/10 15:18:23 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -197,12 +197,14 @@
 RTI::RTIambassador::~RTIambassador()
     throw (RTIinternalError)
 {
-#ifdef _WIN32
-       TerminateProcess(privateRefs->handle_RTIA, 1);
-#else
-       kill(privateRefs->pid_RTIA, SIGINT);
-#endif
-delete privateRefs ;
+    Message req, rep ;
+
+    req.type = Message::CLOSE_CONNEXION;
+    G.Out(pdGendoc,"        ====>executeService CLOSE_CONNEXION");
+    privateRefs->executeService(&req, &rep);
+    // after the response is received, the privateRefs->socketUn must not be 
used
+
+    delete privateRefs;
 }
 
 // ----------------------------------------------------------------------------
@@ -3043,4 +3045,4 @@
     privateRefs->executeService(&req, &rep);
 }
 
-// $Id: RTIambassador.cc,v 3.94 2008/10/10 13:42:58 gotthardp Exp $
+// $Id: RTIambassador.cc,v 3.95 2008/10/10 15:18:23 gotthardp Exp $