summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/tao/Connect.cpp11
-rw-r--r--TAO/tao/GIOP.cpp20
-rw-r--r--TAO/tao/ORB.cpp16
-rw-r--r--TAO/tao/POA.cpp38
-rw-r--r--TAO/tao/POA.i2
-rw-r--r--TAO/tao/Server_Request.cpp5
-rw-r--r--TAO/tao/TAO.dsp1202
-rw-r--r--TAO/tao/Timeprobe.h143
-rw-r--r--TAO/tao/Timeprobe.i25
-rw-r--r--TAO/tests/POA/Generic_Servant/client.dsp328
-rw-r--r--TAO/tests/POA/Generic_Servant/server.dsp366
11 files changed, 1100 insertions, 1056 deletions
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index bfe926570e5..16ee358bc77 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -261,11 +261,10 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
void
TAO_Server_Connection_Handler::send_response (TAO_OutputCDR &output)
{
- TAO_SVC_HANDLER *this_ptr = this;
+ ACE_FUNCTION_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
- ACE_TIMEPROBE (" -> Connection_Handler::send_response - start");
+ TAO_SVC_HANDLER *this_ptr = this;
TAO_GIOP::send_request (this_ptr, output);
- ACE_TIMEPROBE (" -> Connection_Handler::send_response - end");
}
int
@@ -277,7 +276,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
// 2. construct a complete request
// 3. dispatch that request and return any required reply and errors
- ACE_TIMEPROBE (" -> Connection_Handler::handle_input");
+ ACE_FUNCTION_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
// @@ TODO This should take its memory from a specialized
// allocator. It is better to use a message block than a on stack
@@ -337,7 +336,6 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
if (response_required || error_encountered)
this->send_response (output);
- ACE_TIMEPROBE (" -> Connection_Handler::handle_input done");
return result;
}
@@ -406,7 +404,7 @@ int
TAO_Client_Connection_Handler::send_request (TAO_OutputCDR &stream,
int is_twoway)
{
- ACE_TIMEPROBE (" -> Client_Connection_Handler::send_request - start");
+ ACE_FUNCTION_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
// NOTE: Here would also be a fine place to calculate a digital
// signature for the message and place it into a preallocated slot
@@ -452,7 +450,6 @@ TAO_Client_Connection_Handler::send_request (TAO_OutputCDR &stream,
this->expecting_response_ = 0;
}
- ACE_TIMEPROBE (" -> Client_Connection_Handler::send_request - done");
return 0;
}
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 9e456a8f49e..35ee2e2d733 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -122,7 +122,7 @@ CORBA::Boolean
TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
TAO_OutputCDR &stream)
{
- ACE_TIMEPROBE (" -> GIOP::send_request - start");
+ ACE_FUNCTION_TIMEPROBE (TAO_GIOP_SEND_REQUEST_START);
char *buf = (char *) stream.buffer ();
size_t buflen = stream.total_length ();
@@ -191,7 +191,6 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
"(%P|%t) closing conn %d after fault %p\n",
peer.get_handle (), "GIOP::send_request"));
handler->close ();
- ACE_TIMEPROBE (" -> GIOP::send_request - fail");
return CORBA::B_FALSE;
}
else if (n == 0)
@@ -201,7 +200,6 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
"EOF, closing conn %d\n",
peer.get_handle ()));
handler->close ();
- ACE_TIMEPROBE (" -> GIOP::send_request - fail");
return CORBA::B_FALSE;
}
iovcnt = 0;
@@ -217,7 +215,6 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
"(%P|%t) closing conn %d after fault %p\n",
peer.get_handle (), "GIOP::send_request"));
handler->close ();
- ACE_TIMEPROBE (" -> GIOP::send_request - fail");
return CORBA::B_FALSE;
}
else if (n == 0)
@@ -227,13 +224,11 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
"EOF, closing conn %d\n",
peer.get_handle ()));
handler->close ();
- ACE_TIMEPROBE (" -> GIOP::send_request - fail");
return CORBA::B_FALSE;
}
iovcnt = 0;
}
- ACE_TIMEPROBE (" -> GIOP::send_request - done");
return CORBA::B_TRUE;
}
@@ -321,6 +316,8 @@ TAO_GIOP::read_buffer (TAO_SOCK_Stream &peer,
char *buf,
size_t len)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_GIOP_READ_BUFFER_START);
+
ssize_t bytes_read = peer.recv_n (buf, len);
if (bytes_read == -1 && errno == ECONNRESET)
@@ -360,7 +357,8 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
TAO_InputCDR &msg,
CORBA::Environment &env)
{
- ACE_TIMEPROBE (" -> GIOP::recv_request - start");
+ ACE_FUNCTION_TIMEPROBE (TAO_GIOP_RECV_REQUEST_START);
+
TAO_GIOP::Message_Type retval;
CORBA::ULong message_size;
TAO_SOCK_Stream &connection = handler->peer ();
@@ -396,7 +394,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) Header EOF ... peer probably aborted connection %d\n",
connection.get_handle ()));
- ACE_TIMEPROBE (" -> GIOP::recv_request - EOF");
return TAO_GIOP::EndOfFile;
// @@ should probably find some way to report this without
// an exception, since for most servers it's not an error.
@@ -417,7 +414,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
}
env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
- ACE_TIMEPROBE (" -> GIOP::recv_request - fail");
return TAO_GIOP::MessageError;
}
@@ -434,7 +430,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
{
env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
ACE_DEBUG ((LM_DEBUG, "bad header, magic word\n"));
- ACE_TIMEPROBE (" -> GIOP::recv_request - fail");
return TAO_GIOP::MessageError;
}
@@ -446,7 +441,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
{
env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
ACE_DEBUG ((LM_DEBUG, "bad header, version\n"));
- ACE_TIMEPROBE (" -> GIOP::recv_request - fail");
return TAO_GIOP::MessageError;
}
@@ -518,14 +512,12 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
// clean up, and ...
env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
ACE_DEBUG ((LM_DEBUG, "couldn't read rest of message\n"));
- ACE_TIMEPROBE (" -> GIOP::recv_request - fail");
return TAO_GIOP::MessageError;
}
TAO_GIOP::dump_msg ("recv",
ACE_reinterpret_cast (u_char *, header),
message_size + TAO_GIOP_HEADER_LEN);
- ACE_TIMEPROBE (" -> GIOP::recv_request - done");
return retval;
}
@@ -1511,6 +1503,8 @@ CORBA::Boolean
TAO_GIOP_LocateRequestHeader::init (TAO_InputCDR &msg,
CORBA::Environment &env)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START);
+
return (msg.read_ulong (this->request_id)
&& msg.decode (TC_opaque,
&this->object_key,
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 3347c2cc1c9..9b1e7f25fd7 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -192,10 +192,21 @@ CORBA_ORB::run (ACE_Time_Value *tv)
return -1;
// Loop "forever" handling client requests.
-
+
+ const int max_iterations = 100;
+ int counter = 0;
while (this->should_shutdown_ == 0)
{
- ACE_TIMEPROBE (" -> CORBA_ORB::run handling events");
+ counter++;
+ if (counter == max_iterations)
+ {
+ ACE_TIMEPROBE_PRINT_USING_TABLE (TAO_Timeprobe_Description);
+ ACE_TIMEPROBE_RESET;
+ counter = 0;
+ }
+
+ ACE_FUNCTION_TIMEPROBE (TAO_CORBA_ORB_RUN_START);
+
switch (r->handle_events (tv))
{
case 0: // Timed out, so we return to caller.
@@ -206,7 +217,6 @@ CORBA_ORB::run (ACE_Time_Value *tv)
/* NOTREACHED */
default: // Some handlers were dispatched, so keep on processing
// requests until we're told to shutdown .
- ACE_TIMEPROBE (" -> CORBA_ORB::run events handled");
break;
/* NOTREACHED */
}
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 7ecd4cb4fb7..4cea5adf527 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -4,9 +4,8 @@
# include "tao/corba.h"
-#if !defined (__ACE_INLINE__)
-# include "tao/POA.i"
-#endif /* ! __ACE_INLINE__ */
+// Timeprobes class
+#include "tao/Timeprobe.h"
// auto_ptr class
#include "ace/Auto_Ptr.h"
@@ -14,6 +13,10 @@
// Forwarding Servant class
#include "tao/Forwarding_Servant.h"
+#if !defined (__ACE_INLINE__)
+# include "tao/POA.i"
+#endif /* ! __ACE_INLINE__ */
+
// This is the maximum space require to convert the ulong into a
// string.
const int TAO_POA::max_space_required_for_ulong = 24;
@@ -1760,6 +1763,8 @@ TAO_POA::locate_poa_i (const TAO_ObjectKey &key,
PortableServer::ObjectId &id,
CORBA::Environment &env)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_POA_I_START);
+
TAO_POA::String poa_name;
CORBA::Boolean persistent = CORBA::B_FALSE;
TAO_Temporary_Creation_Time poa_creation_time;
@@ -1912,6 +1917,8 @@ TAO_POA::locate_poa_and_servant_i (const TAO_ObjectKey &key,
TAO_POA *&poa_impl,
CORBA::Environment &env)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_POA_AND_SERVANT_I_START);
+
poa_impl = this->locate_poa_i (key,
id,
env);
@@ -1925,9 +1932,14 @@ TAO_POA::locate_poa_and_servant_i (const TAO_ObjectKey &key,
if (poa_impl->policies ().servant_retention () == PortableServer::RETAIN)
{
PortableServer::Servant servant = 0;
- if (poa_impl->active_object_map ().find (id, servant) != -1)
- // Success
- return servant;
+
+ {
+ ACE_FUNCTION_TIMEPROBE (TAO_POA_FIND_SERVANT_START);
+
+ if (poa_impl->active_object_map ().find (id, servant) != -1)
+ // Success
+ return servant;
+ }
}
// If the POA has the NON_RETAIN policy or has the RETAIN policy but
@@ -2104,10 +2116,14 @@ TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key,
&current_context,
env);
- // Upcall
- servant->_dispatch (req,
- context,
- env);
+ {
+ ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
+
+ // Upcall
+ servant->_dispatch (req,
+ context,
+ env);
+ }
// Cleanup from upcall
poa->post_invoke (servant,
@@ -2182,6 +2198,8 @@ TAO_POA::parse_key (const TAO_ObjectKey &key,
CORBA::Boolean &persistent,
TAO_Temporary_Creation_Time &poa_creation_time)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
+
// Try to find the last separator
int last_token_position = this->rfind (key, TAO_POA::name_separator ());
diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
index ef7cfca1854..04d0f08bb44 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -498,6 +498,8 @@ TAO_POA::dispatch_servant (const TAO_ObjectKey &key,
void *context,
CORBA::Environment &env)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_POA_DISPATCH_SERVANT_START);
+
// Lock access to the POAManager for the duration of this transaction
TAO_POA_READ_GUARD (ACE_Lock, monitor, this->lock (), env);
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
index 4bad52ed072..4ab96f5c68f 100644
--- a/TAO/tao/Server_Request.cpp
+++ b/TAO/tao/Server_Request.cpp
@@ -4,6 +4,9 @@
#include "tao/corba.h"
+// Timeprobes class
+#include "tao/Timeprobe.h"
+
#if !defined (__ACE_INLINE__)
# include "tao/Server_Request.i"
#endif /* ! __ACE_INLINE__ */
@@ -54,6 +57,8 @@ IIOP_ServerRequest::IIOP_ServerRequest (TAO_InputCDR &input,
object_key_ (),
requesting_principal_ (0)
{
+ ACE_FUNCTION_TIMEPROBE (TAO_GIOP_REQUEST_HEADER_INIT_START);
+
CORBA::Boolean hdr_status;
// Tear out the service context ... we currently ignore it, but it
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 548b8078678..651b3b638b9 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -1,603 +1,599 @@
-# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=TAO - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "TAO.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "TAO - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /incremental:yes
-
-!ELSEIF "$(CFG)" == "TAO - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "TAO - Win32 Release"
-# Name "TAO - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Any.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\append.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDR.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Client_Strategy_Factory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Connect.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\debug.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\decode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\deep_copy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\deep_free.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_server.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\encode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Exception.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Forwarding_Servant.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\GIOP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Interpreter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_ORB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Marshal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NVList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_KeyC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_Table.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Operation_Table.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB_Core.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\params.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Principal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Request.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sequence.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Servant_Base.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Request.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Strategy_Factory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\skip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Stub.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO.cpp
-# End Source File
-# Begin Source File
-
-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
-
-SOURCE=.\Typecode_Constants.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\align.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\any.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\arg_shifter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cdr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Client_Strategy_Factory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\connect.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\corba.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_server.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Exception.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Forwarding_Servant.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\giop.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Interpreter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_ORB.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\initguid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\marshal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nvlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\objbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_KeyC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_Table.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Operation_Table.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orb_core.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB_Strategies_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orbconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\params.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa_macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Principal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\request.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sequence.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sequence_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\servant_base.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Request.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Strategy_Factory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\singletons.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\stub.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO_Internal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Timeprobe.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\typecode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\varout.h
-# End Source File
-# End Group
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "*.i"
-# Begin Source File
-
-SOURCE=.\any.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\cdr.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\connect.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_client.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_server.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Exception.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\giop.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Object.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_ORB.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\marshal.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\NVList.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\object.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_KeyC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\orb_core.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB_Strategies_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\params.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Request.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\sequence.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sequence_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Request.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\stub.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO_Internal.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Timeprobe.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\typecode.i
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=TAO - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "TAO.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "TAO - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Release"
+# PROP BASE Intermediate_Dir ".\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"
+# SUBTRACT LINK32 /incremental:yes
+
+!ELSEIF "$(CFG)" == "TAO - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Debug"
+# PROP BASE Intermediate_Dir ".\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ".\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /debug /machine:I386
+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "TAO - Win32 Release"
+# Name "TAO - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\Any.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\append.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CDR.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client_Strategy_Factory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Connect.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\decode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\deep_copy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\deep_free.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\encode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\GIOP.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Interpreter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_ORB.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Marshal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\NVList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_KeyC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Core.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\params.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Principal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Request.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Request.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Strategy_Factory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\skip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Stub.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO_Internal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Typecode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Typecode_Constants.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=.\align.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\any.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arg_shifter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cdr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client_Strategy_Factory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\connect.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\corba.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_client.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_server.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\giop.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Interpreter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_ORB.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\compat\initguid.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\marshal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\compat\objbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\object.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_KeyC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Table.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\orb.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\orb_core.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Strategies_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\orbconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\params.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Principal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sequence.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\servant_base.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Strategy_Factory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\singletons.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\stub.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO_Internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Timeprobe.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\typecode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\varout.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "*.i"
+# Begin Source File
+
+SOURCE=.\any.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\cdr.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\connect.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_client.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_server.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\giop.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Object.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_ORB.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\marshal.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\NVList.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\object.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_KeyC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\orb_core.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Strategies_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\params.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Request.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\sequence.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Request.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\stub.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO_Internal.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Timeprobe.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\typecode.i
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
index 59007bf7105..85bf06852bd 100644
--- a/TAO/tao/Timeprobe.h
+++ b/TAO/tao/Timeprobe.h
@@ -1,67 +1,114 @@
// $Id$
-#if !defined (ACE_TIMEPROBE_H)
-#define ACE_TIMEPROBE_H
+//#define ACE_COMPILE_TIMEPROBES
+//#define ACE_ENABLE_TIMEPROBES
+//#define ACE_MT_TIMEPROBES
+//#define ACE_TSS_TIMEPROBES
-#include "ace/Synch.h"
+#include "ace/Timeprobe.h"
-class ACE_Timeprobe
-{
- // @@ Please comment me.
-public:
- static ACE_Timeprobe &instance (void);
+static const char *TAO_Timeprobe_Description[] =
+{
+
+ "TAO Timeprobe Description Table",
+
+ "GIOP::send_request - start",
+ "GIOP::send_request - end",
+
+ "GIOP::recv_request - start",
+ "GIOP::recv_request - end",
- void timeprobe (const char *id);
+ "GIOP::read_buffer - start",
+ "GIOP::read_buffer - end",
- void print_times (void) const;
+ "GIOP::RequestHeader_init - start",
+ "GIOP::RequestHeader_init - end",
- void reset (void);
+ "GIOP::LocateRequestHeader_init - start",
+ "GIOP::LocateRequestHeader_init - end",
- void destroy (void);
+ "Server_Connection_Handler::send_response - start",
+ "Server_Connection_Handler::send_response - end",
-private:
- ACE_Timeprobe (void);
- ~ACE_Timeprobe (void);
+ "Server_Connection_Handler::handle_input - start",
+ "Server_Connection_Handler::handle_input - end",
- ACE_Timeprobe (const ACE_Timeprobe &);
- // Not implemented.
+ "Client_Connection_Handler::send_request - start",
+ "Client_Connection_Handler::send_request - end",
-private:
- static ACE_Timeprobe *instance_;
+ "CORBA_ORB::run - start",
+ "CORBA_ORB::run - end",
- enum { SLOTS = 8192 };
+ "POA::locate_poa_i - start",
+ "POA::locate_poa_i - end",
- ACE_SYNCH_MUTEX mutex_;
+ "POA::locate_poa_and_servant_i - start",
+ "POA::locate_poa_and_servant_i - end",
- u_int current_slot_;
+ "POA::find_servant - start",
+ "POA::find_servant - end",
- struct timeprobe_t
- {
- const char *id_;
- ACE_hrtime_t time_;
- ACE_thread_t thread_;
- };
+ "POA::dispatch_servant - start",
+ "POA::dispatch_servant - end",
+
+ "POA::parse_key - start",
+ "POA::parse_key - end",
+
+ "Servant::_dispatch - start",
+ "Servant::_dispatch - end",
- timeprobe_t timeprobes [SLOTS];
- // @@ Don't we have a macro that does this?
- friend class null_friend_to_avoid_compiler_warning_about_no_friends;
};
-#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 */
+enum
+{
+ TAO_TIMEPROBE_DESCRIPTION_TABLE,
+
+ TAO_GIOP_SEND_REQUEST_START,
+ TAO_GIOP_SEND_REQUEST_END,
+
+ TAO_GIOP_RECV_REQUEST_START,
+ TAO_GIOP_RECV_REQUEST_END,
+
+ TAO_GIOP_READ_BUFFER_START,
+ TAO_GIOP_READ_BUFFER_END,
+
+ TAO_GIOP_REQUEST_HEADER_INIT_START,
+ TAO_GIOP_REQUEST_HEADER_INIT_END,
+
+ TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START,
+ TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_END,
+
+ TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START,
+ TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_END,
+
+ TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START,
+ TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
+
+ TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
+ TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END,
+
+ TAO_CORBA_ORB_RUN_START,
+ TAO_CORBA_ORB_RUN_END,
+
+ TAO_POA_LOCATE_POA_I_START,
+ TAO_POA_LOCATE_POA_I_END,
+
+ TAO_POA_LOCATE_POA_AND_SERVANT_I_START,
+ TAO_POA_LOCATE_POA_AND_SERVANT_I_END,
+
+ TAO_POA_FIND_SERVANT_START,
+ TAO_POA_FIND_SERVANT_END,
+
+ TAO_POA_DISPATCH_SERVANT_START,
+ TAO_POA_DISPATCH_SERVANT_END,
+
+ TAO_POA_PARSE_KEY_START,
+ TAO_POA_PARSE_KEY_END,
+
+ TAO_SERVANT_DISPATCH_START,
+ TAO_SERVANT_DISPATCH_END,
+
+ TAO_LAST_TIMEPROBE_ENTRY
+
+};
diff --git a/TAO/tao/Timeprobe.i b/TAO/tao/Timeprobe.i
deleted file mode 100644
index faed2b6d69c..00000000000
--- a/TAO/tao/Timeprobe.i
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_Timeprobe::ACE_Timeprobe (void)
- : current_slot_ (0)
-{
-}
-
-ACE_INLINE
-ACE_Timeprobe::~ACE_Timeprobe (void)
-{
-}
-
-ACE_INLINE void
-ACE_Timeprobe::destroy (void)
-{
- delete instance_;
- instance_ = 0;
-}
-
-ACE_INLINE void
-ACE_Timeprobe::reset (void)
-{
- current_slot_ = 0;
-}
diff --git a/TAO/tests/POA/Generic_Servant/client.dsp b/TAO/tests/POA/Generic_Servant/client.dsp
index 4ee9d087ee9..2bf2fea4ffb 100644
--- a/TAO/tests/POA/Generic_Servant/client.dsp
+++ b/TAO/tests/POA/Generic_Servant/client.dsp
@@ -1,164 +1,164 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=client - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "client.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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:console /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "client__"
-# PROP BASE Intermediate_Dir "client__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Foo.idl
-
-!IF "$(CFG)" == "client - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "client - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooS.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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:console /machine:I386
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "client__"
+# PROP BASE Intermediate_Dir "client__"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "client - Win32 Release"
+# Name "client - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Foo.idl
+
+!IF "$(CFG)" == "client - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+ ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "client - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+ ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooS.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp
index abb9706bd3b..a6c4b1e4167 100644
--- a/TAO/tests/POA/Generic_Servant/server.dsp
+++ b/TAO/tests/POA/Generic_Servant/server.dsp
@@ -1,183 +1,183 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=server - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "server.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "server__"
-# PROP BASE Intermediate_Dir "server__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "server_0"
-# PROP BASE Intermediate_Dir "server_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /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
-
-!ENDIF
-
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\Foo.idl
-
-!IF "$(CFG)" == "server - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "server - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MyFooServant.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "server__"
+# PROP BASE Intermediate_Dir "server__"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "server_0"
+# PROP BASE Intermediate_Dir "server_0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 tao.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /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
+
+!ENDIF
+
+# Begin Target
+
+# Name "server - Win32 Release"
+# Name "server - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\Foo.idl
+
+!IF "$(CFG)" == "server - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+ ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "server - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+ ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MyFooServant.cpp
+# End Source File
+# End Target
+# End Project
View Lorry Controller Status