Skip to content

Commit

Permalink
5.2.4 Changes applied
Browse files Browse the repository at this point in the history
  • Loading branch information
javmorcas committed Aug 28, 2016
1 parent 2fc5635 commit 7001d2f
Show file tree
Hide file tree
Showing 142 changed files with 6,347 additions and 9,293 deletions.
139 changes: 139 additions & 0 deletions DDSTypesManaged/DDSTypesManaged-64-VS2015.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>DDSTypesManaged-64-VS2015</ProjectName>
<ProjectGuid>{02F70308-1E4F-413C-B7B7-FCFECB116D64}</ProjectGuid>
<RootNamespace>DDSTypesManaged</RootNamespace>
<Keyword>ManagedCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NDDSHOME)/lib/x64Win64VS2015;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\bin\x64Win64VS2015\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\bin\x64Win64VS2015\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NDDSHOME)/lib/x64Win64VS2015;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\bin\x64Win64VS2015\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\bin\x64Win64VS2015\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(NDDSHOME)/include;$(NDDSHOME)/include/ndds;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;RTI_WIN32;NDDS_DLL_VARIABLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>nddscppd.lib;nddscd.lib;nddscored.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(NDDSHOME)/lib/x64Win64VS2015;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>$(NDDSHOME)/include;$(NDDSHOME)/include/ndds;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;RTI_WIN32;NDDS_DLL_VARIABLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>nddscpp.lib;nddsc.lib;nddscore.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(NDDSHOME)/lib/x64Win64VS2015;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="nddsdotnet46">
<HintPath>$(NDDSHOME)\x64Win64VS2015\nddsdotnet46.dll</HintPath>
</Reference>
<Reference Include="System">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Data">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Xml">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp" />
<ClCompile Include="test.cpp" />
<ClCompile Include="testPlugin.cpp" />
<ClCompile Include="testSupport.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="test.h" />
<ClInclude Include="testPlugin.h" />
<ClInclude Include="testSupport.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\idl\test.idl">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(NDDSHOME)\bin\rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(NDDSHOME)/bin/rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
141 changes: 141 additions & 0 deletions DDSTypesManaged/DDSTypesManaged-VS2015.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>DDSTypesManaged-VS2015</ProjectName>
<ProjectGuid>{02F70308-1E4F-413C-B7B7-FCFECB116D64}</ProjectGuid>
<RootNamespace>DDSTypesManaged</RootNamespace>
<Keyword>ManagedCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NDDSHOME)/lib/i86Win32VS2015;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\bin\i86Win32VS2015\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\i86Win32VS2015\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NDDSHOME)/lib/i86Win32VS2015;$(ReferencePath)</ReferencePath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\bin\i86Win32VS2015\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\i86Win32VS2015\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(NDDSHOME)/include;$(NDDSHOME)/include/ndds;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;RTI_WIN32;NDDS_DLL_VARIABLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>nddscppd.lib;nddscd.lib;nddscored.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(NDDSHOME)/lib/i86Win32VS2015;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(NDDSHOME)/include;$(NDDSHOME)/include/ndds;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;RTI_WIN32;NDDS_DLL_VARIABLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>nddscpp.lib;nddsc.lib;nddscore.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(NDDSHOME)/lib/i86Win32VS2015;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="System">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Data">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Xml">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="nddsdotnet46">
<HintPath>nddsdotnet46.dll</HintPath>
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp" />
<ClCompile Include="test.cpp" />
<ClCompile Include="testPlugin.cpp" />
<ClCompile Include="testSupport.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="test.h" />
<ClInclude Include="testPlugin.h" />
<ClInclude Include="testSupport.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\idl\test.idl">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(NDDSHOME)\bin\rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Regenerating type support plugin from %(Filename)%(Extension) $(RTIDDSGEN_PREPROCESSOR)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(NDDSHOME)/bin/rtiddsgen" -replace -language C++/CLI -d ../DDSTypesManaged $(RTIDDSGEN_PREPROCESSOR) ../idl/%(Filename)%(Extension)
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../DDSTypesManaged/test.h;../DDSTypesManaged/test.cpp;../DDSTypesManaged/testPlugin.h;../DDSTypesManaged/testPlugin.cpp;../DDSTypesManaged/testSupport.h;../DDSTypesManaged/testSupport.cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# RTI Perftest 5.2.3

*RTI Perftest 5.2.3* release is based on the *RTI Perftest 5.2.0* code. No changes were performed in the code.
# RTI Perftest 5.2.4

Find the documentation built as a `.pdf` document under [`rtiperftest/doc`](doc/RTI_ConnextDDS_PerformanceTest_GettingStarted.pdf).
Binary file modified doc/RTI_ConnextDDS_PerformanceTest_GettingStarted.pdf
Binary file not shown.
26 changes: 5 additions & 21 deletions idl/test.idl
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
/* $Id: test.idl,v 1.7 2014/09/22 16:28:49 jmorales Exp $

(c) 2005-2012 Copyright, Real-Time Innovations, Inc. All rights reserved.
Permission to modify and use for internal purposes granted.
This software is provided "as is", without warranty, express or implied.

modification history
--------------------
5.1.0,22sep14,jm PERFTEST-75 Fixed LargeData + Turbo-Mode. Changing max size to
131072.
5.1.0,16sep14,jm PERFTEST-60 PERFTEST-64 PERFTEST-65 PERFTEST-66 Large data
support added for perftest.
5.1.0,28aug14,jm PERFTEST-64 PERFTEST-65 PERFTEST-66 Reverting changes, since
They causes issues in Java with the allocated heap.
5.1.0,28aug14,jm PERFTEST-64 PERFTEST-65 PERFTEST-66 Added support
for large data.
5.1.0,11aug14,jm PERFTEST-57 Added -keyed command line option.
1.0a,08may08,ch Added keyed type support
1.0a,15apr08,fcs Added entity_id field
1.0a,18mar08,hhw Created.
===================================================================== */
/*
* (c) 2005-2016 Copyright, Real-Time Innovations, Inc. All rights reserved.
* Permission to modify and use for internal purposes granted.
* This software is provided "as is", without warranty, express or implied.
*/

const long MAX_BINDATA_SIZE = 131072;
const long KEY_SIZE = 4;
Expand Down
Loading

0 comments on commit 7001d2f

Please sign in to comment.