diff options
-rwxr-xr-x | perf/all.dsw | 24 | ||||
-rw-r--r-- | perf/src/omniORB/Client.cpp | 6 | ||||
-rw-r--r-- | perf/src/omniORB/Server.cpp | 2 | ||||
-rwxr-xr-x | perf/src/omniORB/omniORBC.dsp | 144 | ||||
-rwxr-xr-x | perf/src/omniORB/omniORBS.dsp | 144 |
5 files changed, 317 insertions, 3 deletions
diff --git a/perf/all.dsw b/perf/all.dsw index 03b055aff4d..b6e6fecdb6d 100755 --- a/perf/all.dsw +++ b/perf/all.dsw @@ -123,6 +123,30 @@ Package=<4> ###############################################################################
+Project: "omniORBC"=.\src\omniORB\omniORBC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "omniORBS"=.\src\omniORB\omniORBS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "taoC"=.\src\TAO\taoC.dsp - Package Owner=<4>
Package=<5>
diff --git a/perf/src/omniORB/Client.cpp b/perf/src/omniORB/Client.cpp index c10966ea80b..47542d84f1c 100644 --- a/perf/src/omniORB/Client.cpp +++ b/perf/src/omniORB/Client.cpp @@ -12,7 +12,11 @@ #include <iostream> #include <fstream> -#include <sys/time.h> +#ifdef _WIN32 +# include <sys/timeb.h> +#else +# include <sys/time.h> +#endif using namespace std; using namespace Test; diff --git a/perf/src/omniORB/Server.cpp b/perf/src/omniORB/Server.cpp index de0d65f761e..b48ab71dc35 100644 --- a/perf/src/omniORB/Server.cpp +++ b/perf/src/omniORB/Server.cpp @@ -70,8 +70,6 @@ int main(int argc, char** argv) { CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - int i; - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow(obj); diff --git a/perf/src/omniORB/omniORBC.dsp b/perf/src/omniORB/omniORBC.dsp new file mode 100755 index 00000000000..dee0d07e0ad --- /dev/null +++ b/perf/src/omniORB/omniORBC.dsp @@ -0,0 +1,144 @@ +# Microsoft Developer Studio Project File - Name="omniORBC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=omniORBC - 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 "omniORBC.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 "omniORBC.mak" CFG="omniORBC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "omniORBC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "omniORBC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "omniORBC - Win32 Debug"
+
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "."
+# PROP Intermediate_Dir "Debug\omniORBC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD MTL /D "_DEBUG" /nologo /mktyplib203 /win32
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "." /I "$(OMNIORB_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "__x86__" /D "__OMNIORB4__" /D "__WIN32__" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 omniORB407_rtd.lib omnithread32_rtd.lib msvcstubd.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\client.exe" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "omniORBC - Win32 Release"
+
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD MTL /D "NDEBUG" /nologo /mktyplib203 /win32
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "$(OMNIORB_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "__x86__" /D "__OMNIORB4__" /D "__WIN32__" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 omniORB407_rt.lib omnithread32_rt.lib msvcstub.lib advapi32.lib user32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(ICE_HOME)\lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "omniORBC - Win32 Debug"
+# Name "omniORBC - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;cxx;c"
+# Begin Source File
+
+SOURCE=.\Client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\pingSK.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hh"
+# Begin Source File
+
+SOURCE=.\ping.hh
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ping.idl
+
+!IF "$(CFG)" == "omniORBC - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\ping.idl
+
+BuildCmds= \
+ $(OMNIORB_HOME)\bin\x86_win32\omniidl -bcxx -Wba ping.idl \
+ move pingSK.cc pingSK.cpp \
+
+
+"pingSK.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"pingSK.hh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "omniORBC - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\ping.idl
+
+BuildCmds= \
+ $(OMNIORB_HOME)\bin\x86_win32\omniidl -bcxx -Wba ping.idl \
+ move pingSK.cc pingSK.cpp \
+
+
+"pingSK.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"pingSK.hh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/perf/src/omniORB/omniORBS.dsp b/perf/src/omniORB/omniORBS.dsp new file mode 100755 index 00000000000..2e9d44dff70 --- /dev/null +++ b/perf/src/omniORB/omniORBS.dsp @@ -0,0 +1,144 @@ +# Microsoft Developer Studio Project File - Name="omniORBS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=omniORBS - 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 "omniORBS.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 "omniORBS.mak" CFG="omniORBS - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "omniORBS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "omniORBS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "omniORBS - Win32 Debug"
+
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "."
+# PROP Intermediate_Dir "Debug\omniORBS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD MTL /D "_DEBUG" /nologo /mktyplib203 /win32
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "." /I "$(OMNIORB_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "__x86__" /D "__OMNIORB4__" /D "__WIN32__" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib omniORB407_rtd.lib omnithread32_rtd.lib msvcstubd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\server.exe" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "omniORBS - Win32 Release"
+
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD MTL /D "NDEBUG" /nologo /mktyplib203 /win32
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "$(OMNIORB_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "__x86__" /D "__OMNIORB4__" /D "__WIN32__" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\.." /i "$(TAO_ROOT)" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /machine:IX86
+# ADD LINK32 advapi32.lib user32.lib omniORB407_rt.lib omnithread32_rt.lib msvcstub.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(TAO_ROOT)\..\ace" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(TAO_ROOT)\tao\Strategies" /libpath:"$(TAO_ROOT)\tao\Messaging" /libpath:"$(TAO_ROOT)\tao\ValueType"
+
+!ENDIF
+
+# Begin Target
+
+# Name "omniORBS - Win32 Debug"
+# Name "omniORBS - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;cxx;c"
+# Begin Source File
+
+SOURCE=.\pingSK.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hh"
+# Begin Source File
+
+SOURCE=.\ping.hh
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ping.idl
+
+!IF "$(CFG)" == "omniORBS - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\ping.idl
+
+BuildCmds= \
+ $(OMNIORB_HOME)\bin\x86_win32\omniidl -bcxx -Wba ping.idl \
+ move pingSK.cc pingSK.cpp \
+
+
+"pingSK.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"pingSK.hh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "omniORBS - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\ping.idl
+
+BuildCmds= \
+ $(OMNIORB_HOME)\bin\x86_win32\omniidl -bcxx -Wba ping.idl \
+ move pingSK.cc pingSK.cpp \
+
+
+"pingSK.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"pingSK.hh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
|