summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthrall <thrall@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-05-14 04:29:37 +0000
committerthrall <thrall@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-05-14 04:29:37 +0000
commitfd7f531c8f8cf6b61d609ea44bc37f1a0cf73ebd (patch)
tree6d9274a8e1956d7cab05cf177dafd3fb14c91d6c
parent281b3234e14c80ca77493dab44477f86e3cabbe3 (diff)
downloadATCD-fd7f531c8f8cf6b61d609ea44bc37f1a0cf73ebd.tar.gz
Changed ACE_DEBUG error messages to ACE_ERROR
-rw-r--r--TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp10
-rw-r--r--TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp6
5 files changed, 17 insertions, 17 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp
index 3d484dffef4..8934501c996 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp
@@ -652,7 +652,7 @@ Kokyu_EC::init_gateway(CORBA::ORB_ptr orb,
if (this->gateways.find(consumer_ec_ior) == 0)
{
//Already a gateway for that EC
- ACE_DEBUG((LM_DEBUG,"Node1_EC (%P|%t) init_gateway(): Tried to create already-existing gateway for %s\n",
+ ACE_ERROR((LM_ERROR,"Node1_EC (%P|%t) init_gateway(): Tried to create already-existing gateway for %s\n",
consumer_ec_ior));
return;
}
@@ -677,7 +677,7 @@ Kokyu_EC::init_gateway(CORBA::ORB_ptr orb,
if (CORBA::is_nil(obj.in()))
{
- ACE_DEBUG((LM_DEBUG,"Unable to read IOR file for remote EC; Object_var is nil.\n"));
+ ACE_ERROR((LM_ERROR,"Unable to read IOR file for remote EC; Object_var is nil.\n"));
return;
}
@@ -797,7 +797,7 @@ Reactor_Task::initialize(void)
int err = reactor->open(ACE_Select_Reactor_Impl::DEFAULT_SIZE);
if (err < 0)
{
- ACE_DEBUG((LM_DEBUG,"Reactor_Task could not open ACE_Reactor\n"));
+ ACE_ERROR((LM_ERROR,"Reactor_Task could not open ACE_Reactor\n"));
return -1;
}
ACE_Reactor::instance(reactor);
@@ -834,7 +834,7 @@ Reactor_Task::svc (void)
int err = this->react_->run_reactor_event_loop();
if (err < 0)
{
- ACE_DEBUG((LM_ERROR,"Reactor_Task (%t) error running Reactor event loop\n"));
+ ACE_ERROR((LM_ERROR,"Reactor_Task (%t) error running Reactor event loop\n"));
}
ACE_DEBUG((LM_DEBUG,"Reactor_Task (%P|%t) svc(): LEAVE\n"));
@@ -963,7 +963,7 @@ Gateway_Initializer::handle_timeout (const ACE_Time_Value &,
remote_gateways_connected < this->ec_->remote_ecs()->size();
remote_gateways_connected = this->ec_->remote_gateways_connected())
{
- //while file doesn't exist
+ //while not all other gateways connected
ACE_DEBUG((LM_DEBUG,"Gateway_Initializer (%P|%t): waiting for remote gateway connections (%d left)\n",(this->ec_->remote_ecs()->size()-remote_gateways_connected)));
ACE_OS::sleep(sleeptime);
}
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp
index e1529d36249..ce9a7b41032 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp
@@ -221,7 +221,7 @@ main (int argc, char* argv[])
long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
if (timer_id < 0)
{
- ACE_DEBUG((LM_DEBUG,"Node1_EC (%t) could not schedule Gateway_Initializer timer\n"));
+ ACE_ERROR_RETURN((LM_ERROR,"Node4_EC (%t) could not schedule Gateway_Initializer timer\n"),-1);
}
#ifdef ACE_HAS_DSUI
@@ -233,7 +233,7 @@ main (int argc, char* argv[])
#endif //ACE_HAS_DSUI
rt.activate(); //need thread creation flags? or priority?
- ACE_Time_Value stop_time(340,0); //5min + allowance for gateway init and synchronous EC start
+ ACE_Time_Value stop_time(134,0); //5min + allowance for gateway init and synchronous EC start
orb->run (stop_time ACE_ENV_ARG_PARAMETER);
//orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -241,7 +241,7 @@ main (int argc, char* argv[])
#ifdef ACE_HAS_DSUI
//@BT
//DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
- ACE_DEBUG((LM_DEBUG,"Node1_EC thread %t STOP at %u\n",ACE_OS::gettimeofday().msec()));
+ ACE_OS::printf("Node1_EC STOP at %u\n",ACE_OS::gettimeofday().msec());
DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
#endif //ACE_HAS_DSUI
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp
index 80ae253b89b..24deacb24aa 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp
@@ -257,7 +257,7 @@ main (int argc, char* argv[])
long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
if (timer_id < 0)
{
- ACE_DEBUG((LM_DEBUG,"Node2_EC (%t) could not schedule Gateway_Initializer timer\n"));
+ ACE_ERROR_RETURN((LM_ERROR,"Node4_EC (%t) could not schedule Gateway_Initializer timer\n"),-1);
}
#ifdef ACE_HAS_DSUI
@@ -269,7 +269,7 @@ main (int argc, char* argv[])
#endif //ACE_HAS_DSUI
rt.activate(); //need thread creation flags? or priority?
- ACE_Time_Value stop_time(340,0); //5min + allowance for gateway init and synchronous EC start
+ ACE_Time_Value stop_time(134,0); //5min + allowance for gateway init and synchronous EC start
orb->run (stop_time ACE_ENV_ARG_PARAMETER);
//orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -277,7 +277,7 @@ main (int argc, char* argv[])
#ifdef ACE_HAS_DSUI
//@BT
//DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
- ACE_DEBUG((LM_DEBUG,"Node2_EC thread %t STOP at %u\n",ACE_OS::gettimeofday().msec()));
+ ACE_OS::printf("Node2_EC STOP at %u\n",ACE_OS::gettimeofday().msec());
DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
#endif //ACE_HAS_DSUI
// ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp
index 0a22a849563..d36f7b03001 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp
@@ -247,7 +247,7 @@ main (int argc, char* argv[])
long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
if (timer_id < 0)
{
- ACE_DEBUG((LM_DEBUG,"Node3_EC (%t) could not schedule Gateway_Initializer timer\n"));
+ ACE_ERROR_RETURN((LM_ERROR,"Node4_EC (%t) could not schedule Gateway_Initializer timer\n"),-1);
}
#ifdef ACE_HAS_DSUI
@@ -259,7 +259,7 @@ main (int argc, char* argv[])
#endif //ACE_HAS_DSUI
rt.activate(); //need thread creation flags? or priority?
- ACE_Time_Value stop_time(340,0); //5min + allowance for gateway init and synchronous EC start
+ ACE_Time_Value stop_time(134,0); //5min + allowance for gateway init and synchronous EC start
orb->run (stop_time ACE_ENV_ARG_PARAMETER);
//orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -267,7 +267,7 @@ main (int argc, char* argv[])
#ifdef ACE_HAS_DSUI
//@BT
//DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
- ACE_DEBUG((LM_DEBUG,"Node3_EC thread %t STOP at %u\n",ACE_OS::gettimeofday().msec()));
+ ACE_OS::printf("Node3_EC STOP at %u\n",ACE_OS::gettimeofday().msec());
DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
#endif //ACE_HAS_DSUI
// ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp
index 5968ec86b4b..fb788908b86 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp
@@ -285,7 +285,7 @@ main (int argc, char* argv[])
long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
if (timer_id < 0)
{
- ACE_DEBUG((LM_DEBUG,"Node4_EC (%t) could not schedule Gateway_Initializer timer\n"));
+ ACE_ERROR_RETURN((LM_ERROR,"Node4_EC (%t) could not schedule Gateway_Initializer timer\n"),-1);
}
#ifdef ACE_HAS_DSUI
@@ -297,7 +297,7 @@ main (int argc, char* argv[])
#endif //ACE_HAS_DSUI
rt.activate(); //need thread creation flags? or priority?
- ACE_Time_Value stop_time(340,0); //5min + allowance for gateway init and synchronous EC start
+ ACE_Time_Value stop_time(134,0); //5min + allowance for gateway init and synchronous EC start
orb->run (stop_time ACE_ENV_ARG_PARAMETER);
//orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -305,7 +305,7 @@ main (int argc, char* argv[])
#ifdef ACE_HAS_DSUI
//@BT
//DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
- ACE_DEBUG((LM_DEBUG,"Node4_EC thread %t STOP at %u\n",ACE_OS::gettimeofday().msec()));
+ ACE_OS::printf("Node4_EC STOP at %u\n",ACE_OS::gettimeofday().msec());
DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
#endif //ACE_HAS_DSUI
// ****************************************************************