From ef5909be4986d4336ab9441e7c0da301fa13bf0a Mon Sep 17 00:00:00 2001 From: irfan Date: Sat, 18 Apr 1998 06:55:28 +0000 Subject: *** empty log message *** --- ChangeLog-98a | 5 +++++ TAO/ChangeLog-98c | 4 ++++ TAO/tao/TAO.dsp | 4 ---- TAO/tests/POA/Explicit_Activation/svc.conf | 2 +- TAO/tests/POA/Generic_Servant/server.dsp | 15 +++++++++++---- ace/Timeprobe.cpp | 19 ++++++++++++------- ace/Timeprobe.h | 2 +- 7 files changed, 34 insertions(+), 17 deletions(-) diff --git a/ChangeLog-98a b/ChangeLog-98a index 5b016dd33c2..4dbe45a747e 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,3 +1,8 @@ +Sat Apr 18 01:28:36 1998 Irfan Pyarali + + * ace/Timeprobe.h (class ACE_Timeprobe): Changed ACE_Timeprobe to + use ACE_OS::gethrtime(). + Thu Apr 16 04:14:53 1998 Irfan Pyarali * ace/Timeprobe: diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index a86fabf49af..474bbf765d4 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,7 @@ +Sat Apr 18 01:27:52 1998 Irfan Pyarali + + * tao/Timeprobe.h: Added more timeprobes to POA, ORB, and GIOP. + Thu Apr 16 01:25:18 1998 Irfan Pyarali * TAO: Change the use of time probes. The new ACE scheme is now diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index 23e693e23e5..f955a6fe8a9 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -260,10 +260,6 @@ SOURCE=.\TAO_Internal.cpp # End Source File # Begin Source File -SOURCE=.\Timeprobe.cpp -# End Source File -# Begin Source File - SOURCE=.\Typecode.cpp # End Source File # Begin Source File diff --git a/TAO/tests/POA/Explicit_Activation/svc.conf b/TAO/tests/POA/Explicit_Activation/svc.conf index 43c6a486c92..d5d271b956f 100644 --- a/TAO/tests/POA/Explicit_Activation/svc.conf +++ b/TAO/tests/POA/Explicit_Activation/svc.conf @@ -46,4 +46,4 @@ # dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global" dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() -dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128" +dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock null" diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp index 78b16995046..abb9706bd3b 100644 --- a/TAO/tests/POA/Generic_Servant/server.dsp +++ b/TAO/tests/POA/Generic_Servant/server.dsp @@ -54,6 +54,13 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 # ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" # SUBTRACT LINK32 /pdb:none +# Begin Special Build Tool +SOURCE=$(InputPath) +PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\ + ..\On_Demand_Activation +PostBuild_Cmds=copy server.dll ..\Explicit_Activation copy server.dll\ + ..\On_Demand_Activation +# End Special Build Tool !ELSEIF "$(CFG)" == "server - Win32 Debug" @@ -84,9 +91,9 @@ LINK32=link.exe # Begin Special Build Tool SOURCE=$(InputPath) PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\ - ..\On_Demand_Activation + ..\On_Demand_Activation PostBuild_Cmds=copy server.dll ..\Explicit_Activation copy server.dll\ - ..\On_Demand_Activation + ..\On_Demand_Activation # End Special Build Tool !ENDIF @@ -107,7 +114,7 @@ InputName=Foo BuildCmds= \ ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\ - -Wb,export_include=generic_servant_export.h $(InputName).idl + -Wb,export_include=generic_servant_export.h $(InputName).idl "$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -136,7 +143,7 @@ InputName=Foo BuildCmds= \ ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\ - -Wb,export_include=generic_servant_export.h $(InputName).idl + -Wb,export_include=generic_servant_export.h $(InputName).idl "$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) diff --git a/ace/Timeprobe.cpp b/ace/Timeprobe.cpp index 19b9beae8ea..6f6d451b9bc 100644 --- a/ace/Timeprobe.cpp +++ b/ace/Timeprobe.cpp @@ -11,6 +11,8 @@ #include "ace/Timeprobe.i" #endif /* __ACE_INLINE__ */ +#include "ace/High_Res_Timer.h" + template ACE_Timeprobe::ACE_Timeprobe (u_long size, ACE_Allocator *alloc) @@ -42,7 +44,7 @@ ACE_Timeprobe::timeprobe (u_long event) this->timeprobes_[this->current_size_].event_.event_number_ = event; this->timeprobes_[this->current_size_].event_type_ = timeprobe_t::NUMBER; - this->timeprobes_[this->current_size_].time_ = ACE_OS::gettimeofday (); + this->timeprobes_[this->current_size_].time_ = ACE_OS::gethrtime (); this->timeprobes_[this->current_size_].thread_ = ACE_OS::thr_self (); this->current_size_++; @@ -57,7 +59,7 @@ ACE_Timeprobe::timeprobe (const char *event) this->timeprobes_[this->current_size_].event_.event_description_ = event; this->timeprobes_[this->current_size_].event_type_ = timeprobe_t::STRING; - this->timeprobes_[this->current_size_].time_ = ACE_OS::gettimeofday (); + this->timeprobes_[this->current_size_].time_ = ACE_OS::gethrtime (); this->timeprobes_[this->current_size_].thread_ = ACE_OS::thr_self (); this->current_size_++; @@ -82,7 +84,7 @@ ACE_Timeprobe::print_times (const char *event_descriptions[]) const return; ACE_DEBUG ((LM_DEBUG, - "\n%-50.50s %8.8s %10.10s\n\n", + "\n%-50.50s %8.8s %13.13s\n\n", "Event", "thread", "usec")); @@ -94,26 +96,29 @@ ACE_Timeprobe::print_times (const char *event_descriptions[]) const description = event_descriptions[this->timeprobes_[0].event_.event_number_]; ACE_DEBUG ((LM_DEBUG, - "%-50.50s %8.8x %10.10s\n", + "%-50.50s %8.8x %13.13s\n", description, this->timeprobes_[0].thread_, "START")); for (u_int i = 1; i < this->current_size_; i++) { - ACE_Time_Value elapsed = + ACE_hrtime_t time_difference = this->timeprobes_[i].time_ - this->timeprobes_[i-1].time_; + float elapsed_time_in_micro_seconds = + (float) time_difference / ACE_High_Res_Timer::global_scale_factor (); + if (this->timeprobes_[i].event_type_ == timeprobe_t::STRING) description = this->timeprobes_[i].event_.event_description_; else description = event_descriptions[this->timeprobes_[i].event_.event_number_]; ACE_DEBUG ((LM_DEBUG, - "%-50.50s %8.8x %10.3d\n", + "%-50.50s %8.8x %13.3f\n", description, this->timeprobes_[i].thread_, - elapsed.msec () * 1000)); + elapsed_time_in_micro_seconds)); } } diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index aa4729d1d16..72123a093d2 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -94,7 +94,7 @@ protected: event_type event_type_; // Event type - ACE_Time_Value time_; + ACE_hrtime_t time_; // Timestamp ACE_thread_t thread_; -- cgit v1.2.1