[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/RTIA FederationManagement.cc main.cc
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/RTIA FederationManagement.cc main.cc |
Date: |
Mon, 09 Jun 2008 11:17:12 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Pierre Siron <siron> 08/06/09 11:17:12
Modified files:
RTIA : FederationManagement.cc main.cc
Log message:
Remove the message "NetworkError Exception" in the case
of a normal end.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/main.cc?cvsroot=certi&r1=3.19&r2=3.20
Patches:
Index: FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- FederationManagement.cc 3 Jun 2008 08:45:49 -0000 3.64
+++ FederationManagement.cc 9 Jun 2008 11:17:11 -0000 3.65
@@ -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.64 2008/06/03 08:45:49 rousse Exp $
+// $Id: FederationManagement.cc,v 3.65 2008/06/09 11:17:11 siron Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -97,7 +97,7 @@
// sleep(1);
// destroyFederationExecution(_nom_federation, e);
// }
- cout << "RTIA: Federation destroyed" << endl ;
+ cout << "RTIA: Federate destroyed" << endl ;
//}
//delete[] _FEDid ;
Index: main.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/main.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- main.cc 26 Apr 2008 14:59:41 -0000 3.19
+++ main.cc 9 Jun 2008 11:17:12 -0000 3.20
@@ -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.19 2008/04/26 14:59:41 erk Exp $
+// $Id: main.cc,v 3.20 2008/06/09 11:17:12 siron Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -34,6 +34,7 @@
extern "C"void SignalHandler(int Signal);
void NewHandler();
+int normal_end;
// ----------------------------------------------------------------------------
int main() {
@@ -43,6 +44,7 @@
#endif
set_new_handler(NewHandler);
+ normal_end = 0;
if (NULL!=getenv("RTIA_DEBUG")) {
cerr << "RTIA:: RTIA_DEBUG is set: Waiting <"<<
getenv("RTIA_DEBUG")
@@ -57,11 +59,15 @@
rtia.execute();
}
catch (Exception &e) {
+ if (! normal_end) {
cerr << "RTIA:: RTIA has thrown " << e._name << "
exception." << endl;
cerr.flush();
+ }
if (e._reason) {
+ if (! normal_end) {
cerr << "RTIA:: Reason: " << e._reason << endl;
cerr.flush();
+ }
rtia.displayStatistics();
}
@@ -70,11 +76,13 @@
rtia.displayStatistics();
} catch (Exception &e) {
+ if (! normal_end) {
cerr << "RTIA:: RTIA has thrown " << e._name << " exception."
<< endl;
if (e._reason) {
cerr << "RTIA:: Reason: " << e._reason << endl;
}
}
+ }
cout << "RTIA:: End execution."<< endl ;
return (EXIT_SUCCESS);
@@ -84,6 +92,7 @@
void SignalHandler(int Signal) {
printf("\nRTIA: Received signal %d. Exiting peacefully.\n", Signal);
+ normal_end = 1;
//exit(0);
}
@@ -92,4 +101,4 @@
throw MemoryExhausted("RTIA has exhausted memory error");
}
-// EOF $Id: main.cc,v 3.19 2008/04/26 14:59:41 erk Exp $
+// EOF $Id: main.cc,v 3.20 2008/06/09 11:17:12 siron Exp $
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/RTIA FederationManagement.cc main.cc,
certi-cvs <=