summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp')
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp58
1 files changed, 27 insertions, 31 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 6e9f4515a11..5c763c89df3 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -449,7 +449,7 @@ Supplier_Main::save_ids()
if (idf != 0)
{
int endflag = 12345;
- int imode = static_cast<int> (this->mode_);
+ int imode = ACE_static_cast (int, this->mode_);
ACE_OS::fprintf (idf,
"%d,%d,%d,%d,%d,%d,%d,\n",
static_cast<int> (imode),
@@ -643,7 +643,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Reconnect to event channel %d\n"),
- static_cast<int> (this->ec_id_)
+ ACE_static_cast (int, this->ec_id_)
));
}
}
@@ -679,7 +679,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Connect to Existing event channel %d\n"),
- static_cast<int> (this->ec_id_)
+ ACE_static_cast (int, this->ec_id_)
));
}
// kill the channel filename so we don't overwrite the file
@@ -752,13 +752,13 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w");
if (chf != 0)
{
- fprintf (chf, "%d\n", static_cast<int> (this->ec_id_));
+ ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_));
fclose (chf);
}
}
}
-CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID> (-1);
+CosNotifyChannelAdmin::AdminID default_admin_id = ACE_static_cast (CosNotifyChannelAdmin::AdminID, -1);
void
Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
@@ -777,7 +777,7 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Reconnect to supplier admin %d\n"),
- static_cast<int> (this->sa_id_)
+ ACE_static_cast (int, this->sa_id_)
));
}
}
@@ -826,7 +826,7 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Create new supplier admin %d\n"),
- static_cast<int> (this->sa_id_)
+ ACE_static_cast (int, this->sa_id_)
));
}
}
@@ -851,7 +851,7 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Reconnect to proxy supplier %d\n"),
- static_cast<int> (this->structured_proxy_id_)
+ ACE_static_cast (int, this->structured_proxy_id_)
));
}
}
@@ -873,7 +873,7 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Create new proxy %d\n"),
- static_cast<int> (this->structured_proxy_id_)
+ ACE_static_cast (int, this->structured_proxy_id_)
));
}
}
@@ -907,7 +907,7 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
- static_cast<int> (this->structured_proxy_id_)
+ ACE_static_cast (int, this->structured_proxy_id_)
));
ACE_THROW (CORBA::UNKNOWN());
@@ -937,7 +937,7 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Reconnect to proxy %d\n"),
- static_cast<int> (this->sequence_proxy_id_)
+ ACE_static_cast (int, this->sequence_proxy_id_)
));
}
}
@@ -959,7 +959,7 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Create new proxy %d\n"),
- static_cast<int> (this->sequence_proxy_id_)
+ ACE_static_cast (int, this->sequence_proxy_id_)
));
}
}
@@ -971,7 +971,7 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
- static_cast<int> (this->sequence_proxy_id_)
+ ACE_static_cast (int, this->sequence_proxy_id_)
));
ACE_THROW (CORBA::UNKNOWN());
}
@@ -995,7 +995,7 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
- static_cast<int> (this->sequence_proxy_id_)
+ ACE_static_cast (int, this->sequence_proxy_id_)
));
ACE_THROW (CORBA::UNKNOWN());
}
@@ -1024,7 +1024,7 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Reconnect to proxy %d\n"),
- static_cast<int> (this->any_proxy_id_)
+ ACE_static_cast (int, this->any_proxy_id_)
));
}
}
@@ -1046,7 +1046,7 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier: Create new proxy %d\n"),
- static_cast<int> (this->any_proxy_id_)
+ ACE_static_cast (int, this->any_proxy_id_)
));
}
}
@@ -1058,7 +1058,7 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
- static_cast<int> (this->any_proxy_id_)
+ ACE_static_cast (int, this->any_proxy_id_)
));
ACE_THROW (CORBA::UNKNOWN());
}
@@ -1082,7 +1082,7 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
- static_cast<int> (this->sequence_proxy_id_)
+ ACE_static_cast (int, this->sequence_proxy_id_)
));
ACE_THROW (CORBA::UNKNOWN());
}
@@ -1137,7 +1137,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) destroy admin %d\n"),
- static_cast<int> (this->sa_id_)
+ ACE_static_cast(int, this->sa_id_)
));
}
this->sa_->destroy();
@@ -1186,7 +1186,7 @@ void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P,%t) Supplier push structured event %d\n"),
- static_cast<int> (serial_number_)
+ ACE_static_cast (int, serial_number_)
));
}
@@ -1236,7 +1236,7 @@ void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P,%t) Supplier push sequence events %d\n"),
- static_cast<int> (this->serial_number_)
+ ACE_static_cast (int, this->serial_number_)
));
}
@@ -1254,7 +1254,7 @@ void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P,%t) Supplier push any event %d\n"),
- static_cast<int> (this->serial_number_)
+ ACE_static_cast (int, this->serial_number_)
));
}
@@ -1272,11 +1272,8 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
size_t send = 0;
while ( send < this->send_)
{
- // keep the orb alive -- listenting for reconnect
- if (this->orb_->work_pending ())
- {
- this->orb_->perform_work ();
- }
+ ACE_Time_Value tv(0, 100 * 1000);
+ orb_->run(tv);
if (this->pause_ != 0 && send == this->pause_)
{
@@ -1284,7 +1281,7 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier paused after %d events\n"),
- static_cast<int> (this->pause_)
+ ACE_static_cast (int, this->pause_)
));
}
reconnections = this->reconnection_callback_.reconnect_count ();
@@ -1305,7 +1302,7 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier no longer paused. Next s# %d\n"),
- static_cast<int> (this->serial_number_)
+ ACE_static_cast (int, this->serial_number_)
));
}
paused = false;
@@ -1366,8 +1363,7 @@ main (int argc, char *argv[])
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Supplier::main\t\n");
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Supplier::main\t\n");
result = -1;
}
ACE_ENDTRY;
View Lorry Controller Status