Skip to content

N
NADS_DDSLIB
Commit 9975ba72 by Heitbrink, David A
Options

added sample client...........vxproj files likely needs some changing as this… 

added sample client...........vxproj files likely needs some changing as this project used to be in the root
parent a8acebb0
Showing with 491 additions and 0 deletions
DDSSimClient.cpp 0 → 100644
#include "stdafx.h"
#include ".\include\NadsDDSLib\DDSSimClient.h"
namespace NDDSClient {
using namespace std;
CCellInputMap::CCellInputMap() {}
void CCellInputMap::RegInpElem(std::string name, void *_pBuffer, const unsigned int _BufferSize, char _BufferType) {
CCellInputMap::TCellRef ref = std::make_unique<CellInput>();
ref->_sub = NADSDDS::CSubscription::MakeSubscription(name, _BufferType);
ref->_size = _BufferSize;
ref->_type = _BufferType;
ref->_target = _pBuffer;
_cellsIn[name] = std::move(ref);
}
void CCellInputMap::ReadInputElements() {
for (auto& cell : _cellsIn) {
auto& cellIn = cell.second;
cellIn->_sub->SwapBuffer();
size_t size = cellIn->_sub->GetSizeInByes();
if (cellIn->_size == size) {
void* ptr = cellIn->_sub->GetRaw();
memcpy(cellIn->_target, ptr, size);
}
}
}
void CCellOutputMap::RegInpElem(std::string name, void *_pBuffer, const unsigned int _BufferSize, char _BufferType) {
TCellRef ref = std::make_unique<CellOutput>();
size_t elementSize = 0;
switch (_BufferType) {
case 'c':
elementSize = 1;
break;
case 's':
elementSize = 2;
break;
case 'f':
case 'i':
elementSize = 4;
break;
case 'd':
elementSize = 8;
break;
}
size_t cnt = _BufferSize / elementSize;
ref->_sub = NADSDDS::CPublication::MakePublication(name, -1, cnt, _BufferType);
ref->_size = _BufferSize;
ref->_type = _BufferType;
ref->_target = _pBuffer;
_cellsOut[name] = std::move(ref);
}
void CCellOutputMap::WriteOutputElements() {
for (auto& cell : _cellsOut) {
auto& cellOut = cell.second;
void* ptr = cellOut->_sub->Raw();
memcpy(ptr, cellOut->_target, cellOut->_size);
cellOut->_sub->Publish();
}
}
void DDSSimClient::RegisterStartup(DDSSimClient::TStartCBRef) {
}
void DDSSimClient::RegisterFrameCB(DDSSimClient::TFrameCBRef) {
}
DDSSimClient::DDSSimClient() : NADSDDS::CState::Callback(), _currentFrame(-1), _Started(false) {}
void DDSSimClient::OnFrame(int frame) {
_currentFrame = frame;
NADSDDS::CState cs;
auto state = cs.GetState();
if (!_Started) {
return;
}
_map.ReadInputElements();
if (_HeartBeat) {
_HeartBeat->asShort()[0]++;
_HeartBeat->Publish();
}
_omap.WriteOutputElements();
}
void DDSSimClient::StartUp() {
}
void DDSSimClient::RegInputCell(const std::string& name, void* pnt, size_t size, char type) {
_map.RegInpElem(name, pnt, size, type);
}
void DDSSimClient::RegOutputCell(const std::string& name, void* pnt, size_t size, char type) {
_omap.RegInpElem(name, pnt, size, type);
}
DDSSimClient::TRef DDSSimClient::Make(TFrameCBRef frame, TStartCBRef startup) {
auto ptr = std::make_shared<DDSSimClient>();
ptr->RegisterFrameCB(frame);
ptr->RegisterStartup(startup);
ptr->StartUp();
ptr->_dds_state.Register(ptr);
}
}
\ No newline at end of file
NadsDDSLib.vcxproj
......@@ -159,6 +159,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="apex_memmove.h" />
<ClInclude Include="include\NadsDDSLib\DDSSimClient.h" />
<ClInclude Include="include\NadsDDSLib\NadsDDSLib.h" />
<ClInclude Include="NADS.hpp" />
<ClInclude Include="NADSPlugin.hpp" />
......@@ -170,6 +171,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="apex_memmove.cpp" />
<ClCompile Include="DDSSimClient.cpp" />
<ClCompile Include="NADS.cxx" />
<ClCompile Include="NADSPlugin.cxx" />
<ClCompile Include="NADS_publisher.cxx" />
......
NadsDDSLib.vcxproj.filters
......@@ -42,6 +42,9 @@
<ClInclude Include="src\value_as_string.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="include\NadsDDSLib\DDSSimClient.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
......@@ -74,5 +77,8 @@
<ClCompile Include="src\value_as_string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DDSSimClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
SampleClient/SampleClient.vcxproj 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.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>
<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">
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{7603D3C1-1AD1-459E-BE7A-6D9C9BF3D4C6}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>SampleClient</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(solutiondir)NadsDDSLib\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(solutiondir)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>NadsDDSLib_32ds.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerbose</ShowProgress>
</Link>
<ProjectReference>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(solutiondir)NadsDDSLib\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>NadsDDSLib_64ds.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(solutiondir)lib;$(AdditionalLibraryDirectories);$(NDDSHOME)\lib\x64Win64VS2017</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="SampleClient.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
SampleClient/SampleClient.vcxproj.filters 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="targetver.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SampleClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
include/NadsDDSLib/DDSSimClient.h 0 → 100644
#pragma once
#include <NadsDDSLib/NadsDDSLib.h>
#include <Windows.h>
namespace NDDSClient {
class CellInput {
public:
size_t _size;
void* _target;
char _type;
NADSDDS::CSubscription::TRef _sub;
};
class CCellInputMap {
public:
CCellInputMap();
void RegInpElem(std::string name, void *_pBuffer, const unsigned int _BufferSize, char _BufferType);
void ReadInputElements();
private:
typedef std::unique_ptr<CellInput> TCellRef;
std::map<std::string, TCellRef> _cellsIn;
};
class CellOutput {
public:
size_t _size;
void* _target;
char _type;
NADSDDS::CPublication::TRef _sub;
};
class CCellOutputMap {
public:
CCellOutputMap() {}
void RegInpElem(std::string name, void *_pBuffer, const unsigned int _BufferSize, char _BufferType);
void WriteOutputElements();
private:
typedef std::unique_ptr<CellOutput> TCellRef;
std::map<std::string, TCellRef> _cellsOut;
};
class DDSSimClient : public NADSDDS::CState::Callback {
public:
NADSDDS::CPublication::TRef _HeartBeat;
NADSDDS::CPublication::TRef _StateAck;
typedef std::shared_ptr<DDSSimClient> TRef; //this is shared with the DDS back end...so this must be a shared ptr;
class StartUpCB {
public:
StartUpCB() {}
virtual void Startup(DDSSimClient&)= 0;
};
typedef std::shared_ptr<StartUpCB> TStartCBRef;
typedef std::weak_ptr<StartUpCB> TStartCBWRef;
void RegisterStartup(TStartCBRef);
class FrameCB {
public:
FrameCB() {}
virtual int Frame(DDSSimClient&, int state, int frameNum) = 0;
};
typedef std::shared_ptr<FrameCB> TFrameCBRef;
typedef std::weak_ptr<FrameCB> TFrameCBWRef;
void RegisterFrameCB(TFrameCBRef);
virtual void OnFrame(int frame);
static TRef Make(TFrameCBRef, TStartCBRef);
//char
void RegInputCell(const std::string& name, char* pnt, size_t cnt) {
RegInputCell(name, pnt, cnt * sizeof(char), 'c');
}
void RegInputCell(const std::string& name, char& pnt) {
RegInputCell(name, &pnt, sizeof(char), 'c');
}
//short
void RegInputCell(const std::string& name, short* pnt, size_t cnt) {
RegInputCell(name, pnt, cnt * sizeof(short), 's');
}
void RegInputCell(const std::string& name, short& pnt) {
RegInputCell(name, &pnt, sizeof(short), 's');
}
//int
void RegInputCell(const std::string& name, int* pnt, size_t cnt) {
RegInputCell(name, pnt, cnt * sizeof(int), 'i');
}
void RegInputCell(const std::string& name, int& pnt) {
RegInputCell(name, &pnt, sizeof(int), 'i');
}
//float
void RegInputCell(const std::string& name, float* pnt, size_t cnt) {
RegInputCell(name, pnt, cnt * sizeof(float), 'f');
}
void RegInputCell(const std::string& name, float& pnt) {
RegInputCell(name, &pnt, sizeof(float), 'f');
}
//double
void RegInputCell(const std::string& name, double* pnt, size_t cnt) {
RegInputCell(name, pnt, cnt * sizeof(double), 'd');
}
void RegInputCell(const std::string& name, double& pnt) {
RegInputCell(name, &pnt, sizeof(double), 'd');
}
//char
void RegOutputCell(const std::string& name, char* pnt, size_t cnt) {
RegOutputCell(name, pnt, cnt * sizeof(char), 'c');
}
void RegOutputCell(const std::string& name, char& pnt) {
RegOutputCell(name, &pnt, sizeof(char), 'c');
}
//short
void RegOutputCell(const std::string& name, short* pnt, size_t cnt) {
RegOutputCell(name, pnt, cnt * sizeof(short), 's');
}
void RegOutputCell(const std::string& name, short& pnt) {
RegOutputCell(name, &pnt, sizeof(short), 's');
}
//int
void RegOutputCell(const std::string& name, int* pnt, size_t cnt) {
RegOutputCell(name, pnt, cnt * sizeof(int), 'i');
}
void RegOutputCell(const std::string& name, int& pnt) {
RegOutputCell(name, &pnt, sizeof(int), 'i');
}
//float
void RegOutputCell(const std::string& name, float* pnt, size_t cnt) {
RegOutputCell(name, pnt, cnt * sizeof(float), 'f');
}
void RegOutputCell(const std::string& name, float& pnt) {
RegOutputCell(name, &pnt, sizeof(float), 'f');
}
//double
void RegOutputCell(const std::string& name, double* pnt, size_t cnt) {
RegOutputCell(name, pnt, cnt * sizeof(double), 'd');
}
void RegOutputCell(const std::string& name, double& pnt) {
RegOutputCell(name, &pnt, sizeof(double), 'd');
}
private:
NADSDDS::CState _dds_state;
DDSSimClient();
void StartUp();
void RegInputCell(const std::string& name, void* pnt, size_t size, char type);
void RegOutputCell(const std::string& name, void* pnt, size_t size, char type);
std::vector<TFrameCBRef> _FrameCBs;
std::vector<TStartCBWRef> _StartupCBs;
NADSDDS::CPublication::TRef _heartBeat;
CCellInputMap _map;
CCellOutputMap _omap;
int _currentFrame;
bool _Started;
};
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment