ChangeLogTag:Tue Dec 2 10:25:47 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu>

17 files changed, 504 insertions, 163 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 0d94b5367c1..86cd268f416 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,32 @@
+Tue Dec  2 10:25:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
+
+	* tao/corba.h: 
+	  Fixed some problems with the ACE_RETHROW macros.
+
+	* orbsvcs/lib/Makefile: 
+	* orbsvcs/lib/Timeprobe.h: 
+	* orbsvcs/lib/Timeprobe.i: 
+	* orbsvcs/lib/Timeprobe.cpp: 
+	  Added a high resolution timer facility, to measure the delays in
+	  the Event Channel and in its client.
+
+	* orbsvcs/lib/RtecEventComm.idl: 
+	  Changed the time_ field of Event to a double. It should be an
+	  structure or a long long, but double is big enough to store 
+
+	* orbsvcs/lib/RtecEventChannelAdminC.cpp: 
+	* orbsvcs/lib/RtecEventChannelAdminS.cpp: 
+	* orbsvcs/lib/RtecEventCommC.cpp: 
+	* orbsvcs/lib/RtecEventCommC.h: 
+	* orbsvcs/lib/RtecEventCommS.cpp: 
+	* orbsvcs/lib/RtecSchedulerC.cpp: 
+	* orbsvcs/lib/RtecSchedulerC.h: 
+	* orbsvcs/lib/RtecSchedulerC.i: 
+	* orbsvcs/lib/RtecSchedulerS.cpp: 
+	* orbsvcs/lib/RtecSchedulerS.h: 
+	  Regenerated the files using the newest IDL compiler; still some
+	  hand crafting due to inherited classes.
+
 Tue Dec  2 03:12:50 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
 
 	* tao/orbobj.cpp (resolve_name_service): Check for errors when
diff --git a/TAO/orbsvcs/lib/Makefile b/TAO/orbsvcs/lib/Makefile
index edeef9c07f1..7709e57a973 100644
--- a/TAO/orbsvcs/lib/Makefile
+++ b/TAO/orbsvcs/lib/Makefile
@@ -24,6 +24,7 @@ FILES= $(IDL_FILES) \
 	Scheduler_Factory \
 	Runtime_Scheduler \
 	Scheduler_Utilities \
+	Timeprobe \
 
 DEFS    = $(addsuffix .h,$(FILES))
 LSRC	= $(addsuffix .cpp,$(FILES))
@@ -195,7 +196,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -216,6 +216,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -225,15 +226,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -358,7 +360,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -379,6 +380,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -388,15 +390,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -521,7 +524,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -542,6 +544,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -551,15 +554,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -684,7 +688,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -705,6 +708,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -714,15 +718,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -847,7 +852,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -868,6 +872,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -877,15 +882,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -1010,7 +1016,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -1031,6 +1036,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -1040,15 +1046,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -1174,7 +1181,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -1195,6 +1201,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -1204,15 +1211,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -1222,7 +1230,7 @@ realclean: clean
  RtecEventCommC.h RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
  RtecEventChannelAdminC.i
 .obj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \
- RtecEventChannelAdminS.h RtecEventChannelAdminC.h \
+ RtecEventChannelAdminS.h RtecEventCommS.h RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/config.h \
@@ -1339,7 +1347,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -1360,6 +1367,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -1369,24 +1377,25 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
  $(TAO_ROOT)/tao/default_server.i \
  $(TAO_ROOT)/tao/connect.i \
  $(TAO_ROOT)/tao/singletons.h \
- RtecEventCommC.h RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecEventChannelAdminC.i RtecEventCommS.h RtecEventCommS.i \
- RtecSchedulerS.h RtecSchedulerS.i RtecEventChannelAdminS.i
+ RtecEventCommC.i RtecEventCommS.i RtecSchedulerS.h RtecSchedulerC.h \
+ RtecSchedulerC.i RtecSchedulerS.i RtecEventChannelAdminC.h \
+ RtecEventChannelAdminC.i RtecEventChannelAdminS.i
 .obj/Event_Utilities.o .shobj/Event_Utilities.so: Event_Utilities.cpp Event_Utilities.h \
  RtecEventChannelAdminC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1505,7 +1514,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -1526,6 +1534,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -1535,15 +1544,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -1658,7 +1668,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -1679,6 +1688,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -1688,15 +1698,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -1823,7 +1834,6 @@ realclean: clean
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/any.h \
  $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/client_factory.h \
  $(TAO_ROOT)/tao/server_factory.h \
@@ -1844,6 +1854,7 @@ realclean: clean
  $(TAO_ROOT)/tao/objtable.h \
  $(TAO_ROOT)/tao/optable.h \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
  $(TAO_ROOT)/tao/iiopobj.h \
  $(TAO_ROOT)/tao/iioporb.h \
  $(TAO_ROOT)/tao/giop.h \
@@ -1853,15 +1864,16 @@ realclean: clean
  $(TAO_ROOT)/tao/sequence.i \
  $(TAO_ROOT)/tao/typecode.i \
  $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/stub.i \
  $(TAO_ROOT)/tao/object.i \
  $(TAO_ROOT)/tao/orbobj.i \
  $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
  $(TAO_ROOT)/tao/poa.i \
  $(TAO_ROOT)/tao/giop.i \
  $(TAO_ROOT)/tao/iioporb.i \
  $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/server_factory.i \
  $(TAO_ROOT)/tao/default_client.i \
@@ -1869,5 +1881,172 @@ realclean: clean
  $(TAO_ROOT)/tao/connect.i \
  $(TAO_ROOT)/tao/singletons.h \
  RtecSchedulerC.i RtecSchedulerS.i Runtime_Scheduler.i
+.obj/Scheduler_Utilities.o .shobj/Scheduler_Utilities.so: Scheduler_Utilities.cpp Scheduler_Utilities.h \
+ RtecSchedulerC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/orb.h \
+ $(TAO_ROOT)/tao/corbacom.h \
+ $(TAO_ROOT)/tao/object.h \
+ $(TAO_ROOT)/tao/align.h \
+ $(TAO_ROOT)/tao/sequence.h \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/any.h \
+ $(TAO_ROOT)/tao/poa.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/client_factory.h \
+ $(TAO_ROOT)/tao/server_factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/except.h \
+ $(TAO_ROOT)/tao/orbobj.h \
+ $(TAO_ROOT)/tao/nvlist.h \
+ $(TAO_ROOT)/tao/principa.h \
+ $(TAO_ROOT)/tao/request.h \
+ $(TAO_ROOT)/tao/svrrqst.h \
+ $(TAO_ROOT)/tao/typecode.h \
+ $(TAO_ROOT)/tao/marshal.h \
+ $(TAO_ROOT)/tao/cdr.h \
+ $(TAO_ROOT)/tao/stub.h \
+ $(TAO_ROOT)/tao/connect.h \
+ $(TAO_ROOT)/tao/orb_core.h \
+ $(TAO_ROOT)/tao/objtable.h \
+ $(TAO_ROOT)/tao/optable.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/managed_types.h \
+ $(TAO_ROOT)/tao/iiopobj.h \
+ $(TAO_ROOT)/tao/iioporb.h \
+ $(TAO_ROOT)/tao/giop.h \
+ $(TAO_ROOT)/tao/orb_core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(TAO_ROOT)/tao/corbacom.i \
+ $(TAO_ROOT)/tao/sequence.i \
+ $(TAO_ROOT)/tao/typecode.i \
+ $(TAO_ROOT)/tao/any.i \
+ $(TAO_ROOT)/tao/stub.i \
+ $(TAO_ROOT)/tao/object.i \
+ $(TAO_ROOT)/tao/orbobj.i \
+ $(TAO_ROOT)/tao/marshal.i \
+ $(TAO_ROOT)/tao/cdr.i \
+ $(TAO_ROOT)/tao/poa.i \
+ $(TAO_ROOT)/tao/giop.i \
+ $(TAO_ROOT)/tao/iioporb.i \
+ $(TAO_ROOT)/tao/iiopobj.i \
+ $(TAO_ROOT)/tao/managed_types.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/server_factory.i \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/connect.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ RtecSchedulerC.i Scheduler_Utilities.i
+.obj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/stdcpp.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Version.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ Timeprobe.h Timeprobe.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp b/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
index 694e0b7a276..d1cd9cc634f 100644
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
+++ b/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
@@ -66,7 +66,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_Dependency[] =
           TAO_ENCAP_BYTE_ORDER, // byte order
           27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
           5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_long,
+          CORBA::tk_double,
 
         6, 0x64617461, 0x5f000000,  // name = data_
         CORBA::tk_struct, // typecode kind
@@ -143,7 +143,7 @@ RtecEventChannelAdmin::_tao__seq_DependencySet::length (CORBA::ULong length)
     RtecEventChannelAdmin::Dependency *tmp = RtecEventChannelAdmin::_tao__seq_DependencySet::allocbuf (length);
     if (tmp == 0)
       return;
-    for (int i = 0; i < this->length_; ++i)
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp[i] = this->buffer_[i];
     }
@@ -194,7 +194,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin__tao__seq_DependencySet[] =
             TAO_ENCAP_BYTE_ORDER, // byte order
             27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
             5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
+            CORBA::tk_double,
 
           6, 0x64617461, 0x5f000000,  // name = data_
           CORBA::tk_struct, // typecode kind
@@ -265,7 +265,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_DependencySet[] =
             TAO_ENCAP_BYTE_ORDER, // byte order
             27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
             5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
+            CORBA::tk_double,
 
           6, 0x64617461, 0x5f000000,  // name = data_
           CORBA::tk_struct, // typecode kind
@@ -343,7 +343,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_ConsumerQOS[] =
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
                 5, 0x54696d65, 0x0,  // name = Time
-                CORBA::tk_long,
+                CORBA::tk_double,
 
               6, 0x64617461, 0x5f000000,  // name = data_
               CORBA::tk_struct, // typecode kind
@@ -406,7 +406,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_Publication[] =
           TAO_ENCAP_BYTE_ORDER, // byte order
           27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
           5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_long,
+          CORBA::tk_double,
 
         6, 0x64617461, 0x5f000000,  // name = data_
         CORBA::tk_struct, // typecode kind
@@ -493,7 +493,7 @@ RtecEventChannelAdmin::_tao__seq_PublicationSet::length (CORBA::ULong length)
     RtecEventChannelAdmin::Publication *tmp = RtecEventChannelAdmin::_tao__seq_PublicationSet::allocbuf (length);
     if (tmp == 0)
       return;
-    for (int i = 0; i < this->length_; ++i)
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp[i] = this->buffer_[i];
     }
@@ -544,7 +544,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin__tao__seq_PublicationSet[] =
             TAO_ENCAP_BYTE_ORDER, // byte order
             27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
             5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
+            CORBA::tk_double,
 
           6, 0x64617461, 0x5f000000,  // name = data_
           CORBA::tk_struct, // typecode kind
@@ -625,7 +625,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_PublicationSet[] =
             TAO_ENCAP_BYTE_ORDER, // byte order
             27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
             5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
+            CORBA::tk_double,
 
           6, 0x64617461, 0x5f000000,  // name = data_
           CORBA::tk_struct, // typecode kind
@@ -713,7 +713,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_SupplierQOS[] =
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
                 5, 0x54696d65, 0x0,  // name = Time
-                CORBA::tk_long,
+                CORBA::tk_double,
 
               6, 0x64617461, 0x5f000000,  // name = data_
               CORBA::tk_struct, // typecode kind
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp b/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp
index a4fdcfc2b6d..15b1262f284 100644
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp
+++ b/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp
@@ -26,11 +26,9 @@ void POA_RtecEventComm_PushConsumer_push_skel (CORBA::ServerRequest &_tao_server
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
   impl->push(data, _tao_environment);
   
-
 }
 
 void POA_RtecEventComm_PushConsumer_disconnect_push_consumer_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
@@ -44,21 +42,19 @@ void POA_RtecEventComm_PushConsumer_disconnect_push_consumer_skel (CORBA::Server
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
   impl->disconnect_push_consumer(_tao_environment);
   
-
 }
 
-static const TAO_operation_db_entry ProxyPushConsumer_operations [] = {
+static const TAO_operation_db_entry RtecEventChannelAdmin_ProxyPushConsumer_operations [] = {
   {"push", &POA_RtecEventComm_PushConsumer_push_skel},
   {"disconnect_push_consumer", &POA_RtecEventComm_PushConsumer_disconnect_push_consumer_skel},
   {"connect_push_supplier", &POA_RtecEventChannelAdmin::ProxyPushConsumer::connect_push_supplier_skel},
   {"_is_a", &POA_RtecEventChannelAdmin::ProxyPushConsumer::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_ProxyPushConsumer_optable (ProxyPushConsumer_operations, 4, 8);
+TAO_Dynamic_Hash_OpTable tao_RtecEventChannelAdmin_ProxyPushConsumer_optable (RtecEventChannelAdmin_ProxyPushConsumer_operations, 4, 8);
 // skeleton constructor
 POA_RtecEventChannelAdmin::ProxyPushConsumer::ProxyPushConsumer (const char *obj_name)
 {
@@ -67,7 +63,7 @@ POA_RtecEventChannelAdmin::ProxyPushConsumer::ProxyPushConsumer (const char *obj
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_ProxyPushConsumer_optable;
+  this->optable_ = &tao_RtecEventChannelAdmin_ProxyPushConsumer_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -98,11 +94,9 @@ void POA_RtecEventChannelAdmin::ProxyPushConsumer::connect_push_supplier_skel (C
   if (_tao_environment.exception ()) return;
   push_supplier = RtecEventComm::PushSupplier::_narrow (_tao_base_push_supplier, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
   impl->connect_push_supplier(push_supplier, qos, _tao_environment);
   
-
 }
 
 void POA_RtecEventChannelAdmin::ProxyPushConsumer::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
@@ -141,20 +135,18 @@ void POA_RtecEventComm_PushSupplier_disconnect_push_supplier_skel (CORBA::Server
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr) _tao_object_reference->get_subclass ();
   impl->disconnect_push_supplier(_tao_environment);
   
-
 }
 
-static const TAO_operation_db_entry ProxyPushSupplier_operations [] = {
+static const TAO_operation_db_entry RtecEventChannelAdmin_ProxyPushSupplier_operations [] = {
   {"disconnect_push_supplier", &POA_RtecEventComm_PushSupplier_disconnect_push_supplier_skel},
   {"connect_push_consumer", &POA_RtecEventChannelAdmin::ProxyPushSupplier::connect_push_consumer_skel},
   {"_is_a", &POA_RtecEventChannelAdmin::ProxyPushSupplier::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_ProxyPushSupplier_optable (ProxyPushSupplier_operations, 3, 6);
+TAO_Dynamic_Hash_OpTable tao_RtecEventChannelAdmin_ProxyPushSupplier_optable (RtecEventChannelAdmin_ProxyPushSupplier_operations, 3, 6);
 // skeleton constructor
 POA_RtecEventChannelAdmin::ProxyPushSupplier::ProxyPushSupplier (const char *obj_name)
 {
@@ -163,7 +155,7 @@ POA_RtecEventChannelAdmin::ProxyPushSupplier::ProxyPushSupplier (const char *obj
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_ProxyPushSupplier_optable;
+  this->optable_ = &tao_RtecEventChannelAdmin_ProxyPushSupplier_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -194,11 +186,9 @@ void POA_RtecEventChannelAdmin::ProxyPushSupplier::connect_push_consumer_skel (C
   if (_tao_environment.exception ()) return;
   push_consumer = RtecEventComm::PushConsumer::_narrow (_tao_base_push_consumer, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr) _tao_object_reference->get_subclass ();
   impl->connect_push_consumer(push_consumer, qos, _tao_environment);
   
-
 }
 
 void POA_RtecEventChannelAdmin::ProxyPushSupplier::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
@@ -226,12 +216,12 @@ void POA_RtecEventChannelAdmin::ProxyPushSupplier::_is_a_skel (CORBA::ServerRequ
   req.result (any, env);
 }
 
-static const TAO_operation_db_entry ConsumerAdmin_operations [] = {
+static const TAO_operation_db_entry RtecEventChannelAdmin_ConsumerAdmin_operations [] = {
   {"obtain_push_supplier", &POA_RtecEventChannelAdmin::ConsumerAdmin::obtain_push_supplier_skel},
   {"_is_a", &POA_RtecEventChannelAdmin::ConsumerAdmin::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_ConsumerAdmin_optable (ConsumerAdmin_operations, 2, 4);
+TAO_Dynamic_Hash_OpTable tao_RtecEventChannelAdmin_ConsumerAdmin_optable (RtecEventChannelAdmin_ConsumerAdmin_operations, 2, 4);
 // skeleton constructor
 POA_RtecEventChannelAdmin::ConsumerAdmin::ConsumerAdmin (const char *obj_name)
 {
@@ -240,7 +230,7 @@ POA_RtecEventChannelAdmin::ConsumerAdmin::ConsumerAdmin (const char *obj_name)
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_ConsumerAdmin_optable;
+  this->optable_ = &tao_RtecEventChannelAdmin_ConsumerAdmin_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -255,6 +245,7 @@ void POA_RtecEventChannelAdmin::ConsumerAdmin::obtain_push_supplier_skel (CORBA:
   POA_RtecEventChannelAdmin::ConsumerAdmin_ptr 	 impl;
   CORBA::Any *result;
   CORBA::Object_ptr *retval = new CORBA::Object_ptr;
+  *retval = CORBA::Object::_nil ();
   
   // create an NV list and populate it with typecodes
   _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
@@ -262,11 +253,9 @@ void POA_RtecEventChannelAdmin::ConsumerAdmin::obtain_push_supplier_skel (CORBA:
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ConsumerAdmin_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::ConsumerAdmin_ptr) _tao_object_reference->get_subclass ();
   *retval = impl->obtain_push_supplier(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_ProxyPushSupplier, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecEventChannelAdmin::_tc_ProxyPushSupplier, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -296,12 +285,12 @@ void POA_RtecEventChannelAdmin::ConsumerAdmin::_is_a_skel (CORBA::ServerRequest
   req.result (any, env);
 }
 
-static const TAO_operation_db_entry SupplierAdmin_operations [] = {
+static const TAO_operation_db_entry RtecEventChannelAdmin_SupplierAdmin_operations [] = {
   {"obtain_push_consumer", &POA_RtecEventChannelAdmin::SupplierAdmin::obtain_push_consumer_skel},
   {"_is_a", &POA_RtecEventChannelAdmin::SupplierAdmin::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_SupplierAdmin_optable (SupplierAdmin_operations, 2, 4);
+TAO_Dynamic_Hash_OpTable tao_RtecEventChannelAdmin_SupplierAdmin_optable (RtecEventChannelAdmin_SupplierAdmin_operations, 2, 4);
 // skeleton constructor
 POA_RtecEventChannelAdmin::SupplierAdmin::SupplierAdmin (const char *obj_name)
 {
@@ -310,7 +299,7 @@ POA_RtecEventChannelAdmin::SupplierAdmin::SupplierAdmin (const char *obj_name)
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_SupplierAdmin_optable;
+  this->optable_ = &tao_RtecEventChannelAdmin_SupplierAdmin_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -325,6 +314,7 @@ void POA_RtecEventChannelAdmin::SupplierAdmin::obtain_push_consumer_skel (CORBA:
   POA_RtecEventChannelAdmin::SupplierAdmin_ptr 	 impl;
   CORBA::Any *result;
   CORBA::Object_ptr *retval = new CORBA::Object_ptr;
+  *retval = CORBA::Object::_nil ();
   
   // create an NV list and populate it with typecodes
   _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
@@ -332,11 +322,9 @@ void POA_RtecEventChannelAdmin::SupplierAdmin::obtain_push_consumer_skel (CORBA:
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::SupplierAdmin_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::SupplierAdmin_ptr) _tao_object_reference->get_subclass ();
   *retval = impl->obtain_push_consumer(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_ProxyPushConsumer, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecEventChannelAdmin::_tc_ProxyPushConsumer, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -366,14 +354,14 @@ void POA_RtecEventChannelAdmin::SupplierAdmin::_is_a_skel (CORBA::ServerRequest
   req.result (any, env);
 }
 
-static const TAO_operation_db_entry EventChannel_operations [] = {
+static const TAO_operation_db_entry RtecEventChannelAdmin_EventChannel_operations [] = {
   {"for_consumers", &POA_RtecEventChannelAdmin::EventChannel::for_consumers_skel},
   {"for_suppliers", &POA_RtecEventChannelAdmin::EventChannel::for_suppliers_skel},
   {"destroy", &POA_RtecEventChannelAdmin::EventChannel::destroy_skel},
   {"_is_a", &POA_RtecEventChannelAdmin::EventChannel::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_EventChannel_optable (EventChannel_operations, 4, 8);
+TAO_Dynamic_Hash_OpTable tao_RtecEventChannelAdmin_EventChannel_optable (RtecEventChannelAdmin_EventChannel_operations, 4, 8);
 // skeleton constructor
 POA_RtecEventChannelAdmin::EventChannel::EventChannel (const char *obj_name)
 {
@@ -382,7 +370,7 @@ POA_RtecEventChannelAdmin::EventChannel::EventChannel (const char *obj_name)
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_EventChannel_optable;
+  this->optable_ = &tao_RtecEventChannelAdmin_EventChannel_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -397,6 +385,7 @@ void POA_RtecEventChannelAdmin::EventChannel::for_consumers_skel (CORBA::ServerR
   POA_RtecEventChannelAdmin::EventChannel_ptr 	 impl;
   CORBA::Any *result;
   CORBA::Object_ptr *retval = new CORBA::Object_ptr;
+  *retval = CORBA::Object::_nil ();
   
   // create an NV list and populate it with typecodes
   _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
@@ -404,11 +393,9 @@ void POA_RtecEventChannelAdmin::EventChannel::for_consumers_skel (CORBA::ServerR
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
   *retval = impl->for_consumers(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_ConsumerAdmin, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecEventChannelAdmin::_tc_ConsumerAdmin, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -419,6 +406,7 @@ void POA_RtecEventChannelAdmin::EventChannel::for_suppliers_skel (CORBA::ServerR
   POA_RtecEventChannelAdmin::EventChannel_ptr 	 impl;
   CORBA::Any *result;
   CORBA::Object_ptr *retval = new CORBA::Object_ptr;
+  *retval = CORBA::Object::_nil ();
   
   // create an NV list and populate it with typecodes
   _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
@@ -426,11 +414,9 @@ void POA_RtecEventChannelAdmin::EventChannel::for_suppliers_skel (CORBA::ServerR
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
   *retval = impl->for_suppliers(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_SupplierAdmin, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecEventChannelAdmin::_tc_SupplierAdmin, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -446,11 +432,9 @@ void POA_RtecEventChannelAdmin::EventChannel::destroy_skel (CORBA::ServerRequest
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
   impl->destroy(_tao_environment);
   
-
 }
 
 void POA_RtecEventChannelAdmin::EventChannel::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
diff --git a/TAO/orbsvcs/lib/RtecEventComm.idl b/TAO/orbsvcs/lib/RtecEventComm.idl
index 3ce98797ae8..acab33e578b 100644
--- a/TAO/orbsvcs/lib/RtecEventComm.idl
+++ b/TAO/orbsvcs/lib/RtecEventComm.idl
@@ -20,9 +20,13 @@ module RtecEventComm {
 #endif
 
   typedef long EventSourceID;
-  // TODO: Use CosTimeService?
-  typedef long Time;
   typedef long EventType;
+
+  // @@ TODO: Use CosTimeService?
+  // The current definition (double) is a TOTAL HACK, we store a long
+  // long here just because it fits....
+  typedef double Time;
+
   struct Event {
     EventSourceID source_;
     EventType type_;
diff --git a/TAO/orbsvcs/lib/RtecEventCommC.cpp b/TAO/orbsvcs/lib/RtecEventCommC.cpp
index dbcac3ed93b..e057dc9a835 100644
--- a/TAO/orbsvcs/lib/RtecEventCommC.cpp
+++ b/TAO/orbsvcs/lib/RtecEventCommC.cpp
@@ -53,7 +53,7 @@ static const CORBA::Long _oc_RtecEventComm_Time[] =
   TAO_ENCAP_BYTE_ORDER, // byte order
   27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
   5, 0x54696d65, 0x0,  // name = Time
-  CORBA::tk_long,
+  CORBA::tk_double,
 
 };
 static CORBA::TypeCode _tc__tc_RtecEventComm_Time (CORBA::tk_alias, sizeof (_oc_RtecEventComm_Time), (unsigned char *) &_oc_RtecEventComm_Time, CORBA::B_FALSE);
@@ -98,7 +98,7 @@ static const CORBA::Long _oc_RtecEventComm_Event[] =
       TAO_ENCAP_BYTE_ORDER, // byte order
       27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
       5, 0x54696d65, 0x0,  // name = Time
-      CORBA::tk_long,
+      CORBA::tk_double,
 
     6, 0x64617461, 0x5f000000,  // name = data_
     CORBA::tk_struct, // typecode kind
@@ -167,7 +167,7 @@ RtecEventComm::_tao__seq_EventSet::length (CORBA::ULong length)
     RtecEventComm::Event *tmp = RtecEventComm::_tao__seq_EventSet::allocbuf (length);
     if (tmp == 0)
       return;
-    for (int i = 0; i < this->length_; ++i)
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp[i] = this->buffer_[i];
     }
@@ -211,7 +211,7 @@ static const CORBA::Long _oc_RtecEventComm__tao__seq_EventSet[] =
         TAO_ENCAP_BYTE_ORDER, // byte order
         27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
         5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_long,
+        CORBA::tk_double,
 
       6, 0x64617461, 0x5f000000,  // name = data_
       CORBA::tk_struct, // typecode kind
@@ -267,7 +267,7 @@ static const CORBA::Long _oc_RtecEventComm_EventSet[] =
         TAO_ENCAP_BYTE_ORDER, // byte order
         27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
         5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_long,
+        CORBA::tk_double,
 
       6, 0x64617461, 0x5f000000,  // name = data_
       CORBA::tk_struct, // typecode kind
diff --git a/TAO/orbsvcs/lib/RtecEventCommC.h b/TAO/orbsvcs/lib/RtecEventCommC.h
index 99f5e65bd8d..91f8bcaa827 100644
--- a/TAO/orbsvcs/lib/RtecEventCommC.h
+++ b/TAO/orbsvcs/lib/RtecEventCommC.h
@@ -79,7 +79,7 @@ static CORBA::TypeCode_ptr _tc_Disconnected;
 
   static CORBA::TypeCode_ptr _tc_EventSourceID;
 
-  typedef CORBA::Long Time;typedef CORBA::Long_out Time_out;
+  typedef CORBA::Double Time;typedef CORBA::Double_out Time_out;
 
   static CORBA::TypeCode_ptr _tc_Time;
 
diff --git a/TAO/orbsvcs/lib/RtecEventCommS.cpp b/TAO/orbsvcs/lib/RtecEventCommS.cpp
index 0deb62ae2fa..72e0c9882ff 100644
--- a/TAO/orbsvcs/lib/RtecEventCommS.cpp
+++ b/TAO/orbsvcs/lib/RtecEventCommS.cpp
@@ -11,13 +11,13 @@
 #include "RtecEventCommS.i"
 #endif // !defined INLINE
 
-static const TAO_operation_db_entry PushConsumer_operations [] = {
+static const TAO_operation_db_entry RtecEventComm_PushConsumer_operations [] = {
   {"push", &POA_RtecEventComm::PushConsumer::push_skel},
   {"disconnect_push_consumer", &POA_RtecEventComm::PushConsumer::disconnect_push_consumer_skel},
   {"_is_a", &POA_RtecEventComm::PushConsumer::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PushConsumer_optable (PushConsumer_operations, 3, 6);
+TAO_Dynamic_Hash_OpTable tao_RtecEventComm_PushConsumer_optable (RtecEventComm_PushConsumer_operations, 3, 6);
 // skeleton constructor
 POA_RtecEventComm::PushConsumer::PushConsumer (const char *obj_name)
 {
@@ -26,7 +26,7 @@ POA_RtecEventComm::PushConsumer::PushConsumer (const char *obj_name)
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_PushConsumer_optable;
+  this->optable_ = &tao_RtecEventComm_PushConsumer_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -50,11 +50,9 @@ void POA_RtecEventComm::PushConsumer::push_skel (CORBA::ServerRequest &_tao_serv
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventComm::PushConsumer_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventComm::PushConsumer_ptr) _tao_object_reference->get_subclass ();
   impl->push(data, _tao_environment);
   
-
 }
 
 void POA_RtecEventComm::PushConsumer::disconnect_push_consumer_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
@@ -68,11 +66,9 @@ void POA_RtecEventComm::PushConsumer::disconnect_push_consumer_skel (CORBA::Serv
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventComm::PushConsumer_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventComm::PushConsumer_ptr) _tao_object_reference->get_subclass ();
   impl->disconnect_push_consumer(_tao_environment);
   
-
 }
 
 void POA_RtecEventComm::PushConsumer::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
@@ -100,12 +96,12 @@ void POA_RtecEventComm::PushConsumer::_is_a_skel (CORBA::ServerRequest &req, COR
   req.result (any, env);
 }
 
-static const TAO_operation_db_entry PushSupplier_operations [] = {
+static const TAO_operation_db_entry RtecEventComm_PushSupplier_operations [] = {
   {"disconnect_push_supplier", &POA_RtecEventComm::PushSupplier::disconnect_push_supplier_skel},
   {"_is_a", &POA_RtecEventComm::PushSupplier::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PushSupplier_optable (PushSupplier_operations, 2, 4);
+TAO_Dynamic_Hash_OpTable tao_RtecEventComm_PushSupplier_optable (RtecEventComm_PushSupplier_operations, 2, 4);
 // skeleton constructor
 POA_RtecEventComm::PushSupplier::PushSupplier (const char *obj_name)
 {
@@ -114,7 +110,7 @@ POA_RtecEventComm::PushSupplier::PushSupplier (const char *obj_name)
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_PushSupplier_optable;
+  this->optable_ = &tao_RtecEventComm_PushSupplier_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -134,11 +130,9 @@ void POA_RtecEventComm::PushSupplier::disconnect_push_supplier_skel (CORBA::Serv
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventComm::PushSupplier_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecEventComm::PushSupplier_ptr) _tao_object_reference->get_subclass ();
   impl->disconnect_push_supplier(_tao_environment);
   
-
 }
 
 void POA_RtecEventComm::PushSupplier::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.cpp b/TAO/orbsvcs/lib/RtecSchedulerC.cpp
index 050907a4e26..13a843513fb 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerC.cpp
+++ b/TAO/orbsvcs/lib/RtecSchedulerC.cpp
@@ -149,7 +149,7 @@ RtecScheduler::_tao__seq_Dependency_Set::length (CORBA::ULong length)
     RtecScheduler::Dependency_Info *tmp = RtecScheduler::_tao__seq_Dependency_Set::allocbuf (length);
     if (tmp == 0)
       return;
-    for (int i = 0; i < this->length_; ++i)
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp[i] = this->buffer_[i];
     }
@@ -492,7 +492,7 @@ RtecScheduler::_tao__seq_RT_Info_Set::length (CORBA::ULong length)
     RtecScheduler::RT_Info *tmp = RtecScheduler::_tao__seq_RT_Info_Set::allocbuf (length);
     if (tmp == 0)
       return;
-    for (int i = 0; i < this->length_; ++i)
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tmp[i] = this->buffer_[i];
     }
@@ -839,7 +839,7 @@ static const TAO_Param_Data RtecScheduler_Scheduler_create_paramdata [] =
 static const TAO_Call_Data RtecScheduler_Scheduler_create_calldata = 
 {"create", 1, 2, RtecScheduler_Scheduler_create_paramdata, 0, 0};
 
-RtecScheduler::handle_t  RtecScheduler::Scheduler::create (const char *entry_point, CORBA::Environment &env)
+RtecScheduler::handle_t  RtecScheduler::Scheduler::create (const char * entry_point, CORBA::Environment &env)
 {
   RtecScheduler::handle_t retval;
   STUB_Object *istub;
@@ -864,7 +864,7 @@ static const TAO_Param_Data RtecScheduler_Scheduler_lookup_paramdata [] =
 static const TAO_Call_Data RtecScheduler_Scheduler_lookup_calldata = 
 {"lookup", 1, 2, RtecScheduler_Scheduler_lookup_paramdata, 0, 0};
 
-RtecScheduler::handle_t  RtecScheduler::Scheduler::lookup (const char *entry_point, CORBA::Environment &env)
+RtecScheduler::handle_t  RtecScheduler::Scheduler::lookup (const char * entry_point, CORBA::Environment &env)
 {
   RtecScheduler::handle_t retval;
   STUB_Object *istub;
@@ -1001,7 +1001,7 @@ static const TAO_Param_Data RtecScheduler_Scheduler_entry_point_priority_paramda
 static const TAO_Call_Data RtecScheduler_Scheduler_entry_point_priority_calldata = 
 {"entry_point_priority", 1, 5, RtecScheduler_Scheduler_entry_point_priority_paramdata, 0, 0};
 
-void  RtecScheduler::Scheduler::entry_point_priority (const char *entry_point, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority, CORBA::Environment &env)
+void  RtecScheduler::Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority, CORBA::Environment &env)
 {
   STUB_Object *istub;
 
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.h b/TAO/orbsvcs/lib/RtecSchedulerC.h
index eec210cb6b1..78e78f30d43 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerC.h
+++ b/TAO/orbsvcs/lib/RtecSchedulerC.h
@@ -262,8 +262,8 @@ public:
   public:
     RT_Info_out (RT_Info *&);
     RT_Info_out (RT_Info_var &);
-    RT_Info_out (const RT_Info_out &);
-    RT_Info_out &operator= (const RT_Info_out &);
+    RT_Info_out (RT_Info_out &);
+    RT_Info_out &operator= (RT_Info_out &);
     RT_Info_out &operator= (RT_Info *);
     operator RT_Info *&();
     RT_Info *&ptr (void);
@@ -506,8 +506,8 @@ static CORBA::TypeCode_ptr _tc_TASK_COUNT_MISMATCH;
   public:
     _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set *&);
     _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set_var &);
-    _tao__seq_RT_Info_Set_out (const _tao__seq_RT_Info_Set_out &);
-    _tao__seq_RT_Info_Set_out &operator= (const _tao__seq_RT_Info_Set_out &);
+    _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set_out &);
+    _tao__seq_RT_Info_Set_out &operator= (_tao__seq_RT_Info_Set_out &);
     _tao__seq_RT_Info_Set_out &operator= (_tao__seq_RT_Info_Set *);
     operator _tao__seq_RT_Info_Set *&();
     _tao__seq_RT_Info_Set *&ptr (void);
@@ -551,13 +551,13 @@ class Scheduler: public virtual ACE_CORBA_1 (Object)
     static Scheduler_ptr _nil (void);
     static Scheduler_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
 
-    virtual RtecScheduler::handle_t create (const char *entry_point, CORBA::Environment &env);
-    virtual RtecScheduler::handle_t lookup (const char *entry_point, CORBA::Environment &env);
+    virtual RtecScheduler::handle_t create (const char * entry_point, CORBA::Environment &env);
+    virtual RtecScheduler::handle_t lookup (const char * entry_point, CORBA::Environment &env);
     virtual ACE_NESTED_CLASS (RtecScheduler,RT_Info) * get (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, CORBA::Environment &env);
     virtual void set (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, ACE_NESTED_CLASS (RtecScheduler,Time) time, ACE_NESTED_CLASS (RtecScheduler,Time) typical_time, ACE_NESTED_CLASS (RtecScheduler,Time) cached_time, ACE_NESTED_CLASS (RtecScheduler,Period) period, ACE_NESTED_CLASS (RtecScheduler,Importance) importance, ACE_NESTED_CLASS (RtecScheduler,Quantum) quantum, CORBA::Long threads, CORBA::Environment &env);
     virtual void add_dependency (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, ACE_NESTED_CLASS (RtecScheduler,handle_t) dependency, CORBA::Long number_of_calls, CORBA::Environment &env);
     virtual void priority (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, ACE_NESTED_CLASS (RtecScheduler,OS_Priority_out) priority, ACE_NESTED_CLASS (RtecScheduler,Sub_Priority_out) subpriority, ACE_NESTED_CLASS (RtecScheduler,Preemption_Priority_out) p_priority, CORBA::Environment &env);
-    virtual void entry_point_priority (const char *entry_point, ACE_NESTED_CLASS (RtecScheduler,OS_Priority_out) priority, ACE_NESTED_CLASS (RtecScheduler,Sub_Priority_out) subpriority, ACE_NESTED_CLASS (RtecScheduler,Preemption_Priority_out) p_priority, CORBA::Environment &env);
+    virtual void entry_point_priority (const char * entry_point, ACE_NESTED_CLASS (RtecScheduler,OS_Priority_out) priority, ACE_NESTED_CLASS (RtecScheduler,Sub_Priority_out) subpriority, ACE_NESTED_CLASS (RtecScheduler,Preemption_Priority_out) p_priority, CORBA::Environment &env);
     virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, ACE_NESTED_CLASS (RtecScheduler,RT_Info_Set_out) infos, CORBA::Environment &env);
   protected:
     Scheduler (void); // default constructor
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.i b/TAO/orbsvcs/lib/RtecSchedulerC.i
index 9da5fcca635..9a688e26490 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerC.i
+++ b/TAO/orbsvcs/lib/RtecSchedulerC.i
@@ -486,12 +486,12 @@ RtecScheduler::RT_Info_out::RT_Info_out (RtecScheduler::RT_Info_var &p) // const
 }
 
 ACE_INLINE
-RtecScheduler::RT_Info_out::RT_Info_out (const RtecScheduler::RT_Info_out &p) // copy constructor
+RtecScheduler::RT_Info_out::RT_Info_out (RtecScheduler::RT_Info_out &p) // copy constructor
 	: ptr_ (p.ptr_)
 {}
 
 ACE_INLINE RtecScheduler::RT_Info_out &
-RtecScheduler::RT_Info_out::operator= (const RtecScheduler::RT_Info_out &p)
+RtecScheduler::RT_Info_out::operator= (RtecScheduler::RT_Info_out &p)
 {
   this->ptr_ = p.ptr_;
   return *this;
@@ -791,12 +791,12 @@ RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (RtecSchedul
 }
 
 ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (const RtecScheduler::_tao__seq_RT_Info_Set_out &p) // copy constructor
+RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (RtecScheduler::_tao__seq_RT_Info_Set_out &p) // copy constructor
 	: ptr_ (p.ptr_)
 {}
 
 ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set_out &
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator= (const RtecScheduler::_tao__seq_RT_Info_Set_out &p)
+RtecScheduler::_tao__seq_RT_Info_Set_out::operator= (RtecScheduler::_tao__seq_RT_Info_Set_out &p)
 {
   this->ptr_ = p.ptr_;
   return *this;
diff --git a/TAO/orbsvcs/lib/RtecSchedulerS.cpp b/TAO/orbsvcs/lib/RtecSchedulerS.cpp
index 43679b79f97..f8a3f601ae7 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerS.cpp
+++ b/TAO/orbsvcs/lib/RtecSchedulerS.cpp
@@ -11,7 +11,7 @@
 #include "RtecSchedulerS.i"
 #endif // !defined INLINE
 
-static const TAO_operation_db_entry Scheduler_operations [] = {
+static const TAO_operation_db_entry RtecScheduler_Scheduler_operations [] = {
   {"create", &POA_RtecScheduler::Scheduler::create_skel},
   {"lookup", &POA_RtecScheduler::Scheduler::lookup_skel},
   {"get", &POA_RtecScheduler::Scheduler::get_skel},
@@ -23,7 +23,7 @@ static const TAO_operation_db_entry Scheduler_operations [] = {
   {"_is_a", &POA_RtecScheduler::Scheduler::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_Scheduler_optable (Scheduler_operations, 9, 18);
+TAO_Dynamic_Hash_OpTable tao_RtecScheduler_Scheduler_optable (RtecScheduler_Scheduler_operations, 9, 18);
 // skeleton constructor
 POA_RtecScheduler::Scheduler::Scheduler (const char *obj_name)
 {
@@ -32,7 +32,7 @@ POA_RtecScheduler::Scheduler::Scheduler (const char *obj_name)
   TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
   CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
   const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_Scheduler_optable;
+  this->optable_ = &tao_RtecScheduler_Scheduler_optable;
   
   // set up an IIOP object
   data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
@@ -47,7 +47,7 @@ void POA_RtecScheduler::Scheduler::create_skel (CORBA::ServerRequest &_tao_serve
   POA_RtecScheduler::Scheduler_ptr 	 impl;
   CORBA::Any *result;
   RtecScheduler::handle_t *retval = new RtecScheduler::handle_t;
-  char *entry_point;
+  char * entry_point;
   CORBA::NamedValue_ptr nv_entry_point;
   CORBA::Any 	 any_entry_point (CORBA::_tc_string, &entry_point); // ORB does not own
   
@@ -58,11 +58,9 @@ void POA_RtecScheduler::Scheduler::create_skel (CORBA::ServerRequest &_tao_serve
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
    *retval = impl->create(entry_point, _tao_environment);
-  
-result = new CORBA::Any (RtecScheduler::_tc_handle_t, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecScheduler::_tc_handle_t, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -73,7 +71,7 @@ void POA_RtecScheduler::Scheduler::lookup_skel (CORBA::ServerRequest &_tao_serve
   POA_RtecScheduler::Scheduler_ptr 	 impl;
   CORBA::Any *result;
   RtecScheduler::handle_t *retval = new RtecScheduler::handle_t;
-  char *entry_point;
+  char * entry_point;
   CORBA::NamedValue_ptr nv_entry_point;
   CORBA::Any 	 any_entry_point (CORBA::_tc_string, &entry_point); // ORB does not own
   
@@ -84,11 +82,9 @@ void POA_RtecScheduler::Scheduler::lookup_skel (CORBA::ServerRequest &_tao_serve
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
    *retval = impl->lookup(entry_point, _tao_environment);
-  
-result = new CORBA::Any (RtecScheduler::_tc_handle_t, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecScheduler::_tc_handle_t, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -110,11 +106,9 @@ void POA_RtecScheduler::Scheduler::get_skel (CORBA::ServerRequest &_tao_server_r
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
   retval = impl->get(handle, _tao_environment);
-  
-result = new CORBA::Any (RtecScheduler::_tc_RT_Info, retval, 1); // ORB owns
+  result = new CORBA::Any (RtecScheduler::_tc_RT_Info, retval, 1); // ORB owns
   _tao_server_request.result (result, _tao_environment);
   
 }
@@ -162,11 +156,9 @@ void POA_RtecScheduler::Scheduler::set_skel (CORBA::ServerRequest &_tao_server_r
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
   impl->set(handle, time, typical_time, cached_time, period, importance, quantum, threads, _tao_environment);
   
-
 }
 
 void POA_RtecScheduler::Scheduler::add_dependency_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
@@ -192,11 +184,9 @@ void POA_RtecScheduler::Scheduler::add_dependency_skel (CORBA::ServerRequest &_t
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
   impl->add_dependency(handle, dependency, number_of_calls, _tao_environment);
   
-
 }
 
 void POA_RtecScheduler::Scheduler::priority_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
@@ -226,18 +216,16 @@ void POA_RtecScheduler::Scheduler::priority_skel (CORBA::ServerRequest &_tao_ser
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
   impl->priority(handle, *priority, *subpriority, *p_priority, _tao_environment);
   
-
 }
 
 void POA_RtecScheduler::Scheduler::entry_point_priority_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
 {
   CORBA::NVList_ptr 	 nvlist;
   POA_RtecScheduler::Scheduler_ptr 	 impl;
-  char *entry_point;
+  char * entry_point;
   CORBA::NamedValue_ptr nv_entry_point;
   CORBA::Any 	 any_entry_point (CORBA::_tc_string, &entry_point); // ORB does not own
   RtecScheduler::OS_Priority *priority = new RtecScheduler::OS_Priority;
@@ -260,11 +248,9 @@ void POA_RtecScheduler::Scheduler::entry_point_priority_skel (CORBA::ServerReque
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
   impl->entry_point_priority(entry_point, *priority, *subpriority, *p_priority, _tao_environment);
   
-
 }
 
 void POA_RtecScheduler::Scheduler::compute_scheduling_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
@@ -291,11 +277,9 @@ void POA_RtecScheduler::Scheduler::compute_scheduling_skel (CORBA::ServerRequest
   // parse the arguments
   _tao_server_request.params (nvlist, _tao_environment);
   if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
+  impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
   impl->compute_scheduling(minimum_priority, maximum_priority, infos_out, _tao_environment);
   
-
 }
 
 void POA_RtecScheduler::Scheduler::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
diff --git a/TAO/orbsvcs/lib/RtecSchedulerS.h b/TAO/orbsvcs/lib/RtecSchedulerS.h
index 83e89a3b372..ff46d3f35fb 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerS.h
+++ b/TAO/orbsvcs/lib/RtecSchedulerS.h
@@ -21,10 +21,10 @@ public:
     Scheduler (const char *obj_name = 0);
     virtual ~Scheduler (void);
   public:
-    virtual RtecScheduler::handle_t create (const char *entry_point,  CORBA::Environment &env) = 0; // pure virtual
+    virtual RtecScheduler::handle_t create (const char * entry_point,  CORBA::Environment &env) = 0; // pure virtual
     static void create_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
 
-    virtual RtecScheduler::handle_t lookup (const char *entry_point,  CORBA::Environment &env) = 0; // pure virtual
+    virtual RtecScheduler::handle_t lookup (const char * entry_point,  CORBA::Environment &env) = 0; // pure virtual
     static void lookup_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
 
     virtual RtecScheduler::RT_Info * get (RtecScheduler::handle_t handle,  CORBA::Environment &env) = 0; // pure virtual
@@ -39,7 +39,7 @@ public:
     virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority,  CORBA::Environment &env) = 0; // pure virtual
     static void priority_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
 
-    virtual void entry_point_priority (const char *entry_point, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority,  CORBA::Environment &env) = 0; // pure virtual
+    virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority,  CORBA::Environment &env) = 0; // pure virtual
     static void entry_point_priority_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
 
     virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos,  CORBA::Environment &env) = 0; // pure virtual
diff --git a/TAO/orbsvcs/lib/Timeprobe.cpp b/TAO/orbsvcs/lib/Timeprobe.cpp
new file mode 100644
index 00000000000..730315b0364
--- /dev/null
+++ b/TAO/orbsvcs/lib/Timeprobe.cpp
@@ -0,0 +1,73 @@
+//
+// $Id$
+//
+
+#include "ace/OS.h"
+
+#include "Timeprobe.h"
+
+#if !defined (__ACE_INLINE__)
+#include "Timeprobe.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_Timeprobe *ACE_Timeprobe::instance_ = 0;
+
+ACE_Timeprobe &
+ACE_Timeprobe::instance ()
+{
+  if (instance_ == 0)
+    {
+      // if this allocation fails, we're in big trouble . . .
+      ACE_NEW_RETURN (instance_, ACE_Timeprobe (), *instance_);
+    }
+
+  return *instance_;
+}
+
+void
+ACE_Timeprobe::timeprobe (const char *id)
+{
+  timeprobes [current_slot_].id_ = id;
+  timeprobes [current_slot_].time_ = ACE_OS::gethrtime ();
+  timeprobes [current_slot_].thread_ = ACE_OS::thr_self ();
+
+  ++current_slot_;
+
+  ACE_ASSERT (current_slot_ < SLOTS);
+}
+
+void
+ACE_Timeprobe::print_times () const
+{
+  ACE_OS::printf ("\nACE_Timeprobe; %u timeprobes were recorded:\n",
+                  current_slot_ > 1  ?  current_slot_ - 1 :  0);
+
+  if (current_slot_ <= 0)
+    {
+      return;
+    }
+
+  ACE_OS::printf ("%-52.52s  %8.8s %10.10s\n", "NAME", "thread", "usec");
+  ACE_OS::printf ("\"%-50s\" %8.8x %10.10s\n",
+		  timeprobes[0].id_, timeprobes[0].thread_, "START");
+  for (u_int i = 1; i < current_slot_; ++i)
+    {
+      ACE_hrtime_t elapsed = timeprobes [i].time_ - timeprobes [i-1].time_;
+      ACE_OS::printf ("\"%-50s\" %8.8x %10.3f\n",
+		      timeprobes [i].id_,
+		      timeprobes [i].thread_,
+		      (double) (elapsed / 1000) /* nanosec/microsec */);
+    }
+#if 0
+  ACE_hrtime_t elapsed2 = (timeprobes [current_slot_ - 1].time_
+			   - timeprobes [0].time_);
+
+  double total = elapsed2/1000.0; // nanoseconds/microsecond
+  // print the total time
+  ACE_OS::printf ("%52.52s =========\n"
+		  "%46.46s total %10.3f usec\n",
+		  "", "",
+		  total);
+#endif /* 0 */
+}
+
diff --git a/TAO/orbsvcs/lib/Timeprobe.h b/TAO/orbsvcs/lib/Timeprobe.h
new file mode 100644
index 00000000000..9d51bf4a955
--- /dev/null
+++ b/TAO/orbsvcs/lib/Timeprobe.h
@@ -0,0 +1,59 @@
+//
+// $Id$
+//
+
+#ifndef ACE_TIMEPROBE_H
+#define ACE_TIMEPROBE_H
+
+class ACE_Timeprobe
+{
+public:
+  static ACE_Timeprobe &instance ();
+
+  void timeprobe (const char *id);
+
+  void print_times () const;
+
+  void reset();
+
+  void destroy ();
+
+private:
+  static ACE_Timeprobe *instance_;
+
+  enum { SLOTS = 8192 };
+
+  u_int current_slot_;
+
+  typedef struct timeprobe_info {
+    const char *id_;
+    ACE_hrtime_t time_;
+    ACE_thread_t thread_;
+  } timeprobe_t;
+  timeprobe_t timeprobes [SLOTS];
+
+  ACE_Timeprobe ();
+  ~ACE_Timeprobe ();
+
+  friend class null_friend_to_avoid_compiler_warning_about_no_friends;
+
+  ACE_Timeprobe (const ACE_Timeprobe &); // not implemented
+};
+
+#if defined (ACE_ENABLE_TIMEPROBES)
+#  define ACE_TIMEPROBE_RESET ACE_Timeprobe::instance ().reset ()
+#  define ACE_TIMEPROBE(id) ACE_Timeprobe::instance ().timeprobe (id)
+#  define ACE_TIMEPROBE_PRINT ACE_Timeprobe::instance ().print_times ()
+#  define ACE_TIMEPROBE_FINI ACE_Timeprobe::instance ().destroy ()
+#else
+#  define ACE_TIMEPROBE_RESET
+#  define ACE_TIMEPROBE(id)
+#  define ACE_TIMEPROBE_PRINT
+#  define ACE_TIMEPROBE_FINI
+#endif /* ACE_ENABLE_TIMEPROBES */
+
+#if defined (__ACE_INLINE__)
+#include "Timeprobe.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /* ACE_TIMEPROBE_H */
diff --git a/TAO/orbsvcs/lib/Timeprobe.i b/TAO/orbsvcs/lib/Timeprobe.i
new file mode 100644
index 00000000000..b2157abd8f7
--- /dev/null
+++ b/TAO/orbsvcs/lib/Timeprobe.i
@@ -0,0 +1,27 @@
+//
+// $Id$
+//
+
+ACE_INLINE
+ACE_Timeprobe::ACE_Timeprobe ()
+  : current_slot_ (0)
+{
+}
+
+ACE_INLINE
+ACE_Timeprobe::~ACE_Timeprobe ()
+{
+}
+
+ACE_INLINE void
+ACE_Timeprobe::destroy ()
+{
+  delete instance_;
+  instance_ = 0;
+}
+
+ACE_INLINE void
+ACE_Timeprobe::reset()
+{
+  current_slot_ = 0;
+}
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 15bac5be041..a08c0061a61 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -243,7 +243,9 @@ if (ACE_TRY_ENV.exception () != 0)
 
 // The first "while" closes the local scope.  The second "while"
 // closes the ACE_TRY_ENV scope.
-#define ACE_ENDTRY } while (0); } while (0)
+#define ACE_ENDTRY \
+} while (0); \
+} while (0)
 
 // If continue is called, control will skip to the next ACE_CATCHANY
 // statement.
@@ -262,14 +264,20 @@ if ( X . exception () != 0) return Y
 #define ACE_THROW(EXCEPTION) \
 do {\
  _env.exception (new EXCEPTION); \
- return; } while (0)
+  return; } while (0)
 
 #define ACE_THROW_RETURN(EXCEPTION, RETURN) \
 do {\
  _env.exception (new EXCEPTION); \
  return RETURN; } while (0)
 
-#define ACE_RETHROW _env.exception (ACE_TRY_ENV.exception ())
+#define ACE_RETHROW \
+_env.exception (ACE_TRY_ENV.exception ()); \
+return
+
+#define ACE_RETHROW_RETURN (RETURN) \
+_env.exception (ACE_TRY_ENV.exception ()); \
+return RETURN
 
 #define ACE_THROW_SPEC(X)