Merge pull request #20 from dspace-group/Cpp17

Cpp17

.github/workflows/cmake-multi-platform.yml

@@ -30,12 +30,15 @@ jobs:
           - os: windows-latest
             c_compiler: cl
             cpp_compiler: cl
+            test_executable: \test\Release\DsVeosCoSimTest.exe
           - os: ubuntu-latest
             c_compiler: gcc
             cpp_compiler: g++
+            test_executable: /test/DsVeosCoSimTest
           - os: ubuntu-latest
             c_compiler: clang
             cpp_compiler: clang++
+            test_executable: /test/DsVeosCoSimTest
         exclude:
           - os: windows-latest
             c_compiler: gcc
@@ -65,6 +68,7 @@ jobs:
         -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -DDSVEOSCOSIM_BUILD_TESTS=ON
         -S ${{ github.workspace }}
 
     - name: Build
@@ -75,4 +79,4 @@ jobs:
       working-directory: ${{ steps.strings.outputs.build-output-dir }}
       # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest --build-config ${{ matrix.build_type }}
+      run: ${{ steps.strings.outputs.build-output-dir }}${{ matrix.test_executable }}

.gitignore

@@ -4,3 +4,5 @@ obj/
 tmplin/
 tmpwin/
 .mono/
+
+debug.log

.vscode/settings.json

@@ -18,5 +18,101 @@
         "swappable",
         "vecu",
         "vpus"
-    ]
+    ],
+    "files.associations": {
+        "algorithm": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "cfenv": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "coroutine": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "expected": "cpp",
+        "filesystem": "cpp",
+        "format": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "queue": "cpp",
+        "random": "cpp",
+        "ranges": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "source_location": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stack": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "utility": "cpp",
+        "variant": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp"
+    }
 }

CMakeLists.txt

@@ -8,7 +8,7 @@ option(BUILD_SHARED_LIBS "Compile dSPACE VEOS CoSim as a shared library" OFF)
 option(DSVEOSCOSIM_BUILD_TESTS "Create tests for dSPACE VEOS CoSim" OFF)
 option(DSVEOSCOSIM_BUILD_BENCHMARKS "Create benchmarks for dSPACE VEOS CoSim" OFF)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 set(DSVEOSCOSIM_TYPE STATIC)
@@ -27,12 +27,12 @@ if(DSVEOSCOSIM_BUILD_TESTS)
   add_subdirectory(test)
   add_subdirectory(utilities/TestClient)
   add_subdirectory(utilities/TestServer)
+  add_subdirectory(utilities/PerformanceTestClient)
+  add_subdirectory(utilities/PerformanceTestServer)
 endif()
 
 if(DSVEOSCOSIM_BUILD_BENCHMARKS)
   add_subdirectory(benchmark)
-  add_subdirectory(utilities/PerformanceTestClient)
-  add_subdirectory(utilities/PerformanceTestServer)
 endif()
 
 install(EXPORT DsVeosCoSimTargets

benchmark/BenchmarkBusBuffer.cpp

@@ -59,12 +59,12 @@ void RunTest(benchmark::State& state,
     bool stopThread{};
     Event endEvent;
 
-    std::jthread thread(ReceiveMessages<TypeParam>,
-                        count,
-                        std::ref(receiverBusBuffer),
-                        std::ref(receiverChannel),
-                        std::ref(stopThread),
-                        std::ref(endEvent));
+    std::thread thread(ReceiveMessages<TypeParam>,
+                       count,
+                       std::ref(receiverBusBuffer),
+                       std::ref(receiverChannel),
+                       std::ref(stopThread),
+                       std::ref(endEvent));
 
     TMessage sendMessage{};
     FillWithRandom(sendMessage, controller.id);
@@ -91,6 +91,8 @@ void RunTest(benchmark::State& state,
 
     MUST_BE_TRUE(transmitterBusBuffer.Serialize(senderChannel.GetWriter()));
     MUST_BE_TRUE(senderChannel.GetWriter().EndWrite());
+
+    thread.join();
 }
 
 template <typename TypeParam>

benchmark/BenchmarkIoBuffer.cpp

@@ -51,12 +51,12 @@ void RunTest(benchmark::State& state,
     bool stopThread{};
     Event endEvent;
 
-    std::jthread thread(Receive,
-                        std::ref(signal),
-                        std::ref(readerIoBuffer),
-                        std::ref(receiverChannel),
-                        std::ref(stopThread),
-                        std::ref(endEvent));
+    std::thread thread(Receive,
+                       std::ref(signal),
+                       std::ref(readerIoBuffer),
+                       std::ref(receiverChannel),
+                       std::ref(stopThread),
+                       std::ref(endEvent));
 
     for (auto _ : state) {
         writeValue[0]++;
@@ -75,6 +75,8 @@ void RunTest(benchmark::State& state,
 
     MUST_BE_TRUE(writerIoBuffer.Serialize(senderChannel.GetWriter()));
     MUST_BE_TRUE(senderChannel.GetWriter().EndWrite());
+
+    thread.join();
 }
 
 void TcpIo(benchmark::State& state) {

benchmark/Communication/BenchmarkChannel.cpp

@@ -34,7 +34,7 @@ void RunTest(benchmark::State& state, Channel& channel1, Channel& channel2) {
     size_t size = state.range(0);
 
     bool stopThread{};
-    std::jthread thread(CounterPart, std::ref(channel1), std::ref(stopThread), size);
+    std::thread thread(CounterPart, std::ref(channel1), std::ref(stopThread), size);
 
     std::vector<uint8_t> buffer;
     buffer.resize(size);
@@ -48,6 +48,8 @@ void RunTest(benchmark::State& state, Channel& channel1, Channel& channel2) {
     stopThread = true;
     MUST_BE_TRUE(channel2.GetWriter().Write(buffer.data(), buffer.size()));
     MUST_BE_TRUE(channel2.GetWriter().EndWrite());
+
+    thread.join();
 }
 
 void TcpChannelRoundtrip(benchmark::State& state) {

benchmark/OsAbstraction/BenchmarkNamedEvent.cpp

@@ -54,7 +54,7 @@ void EventRoundtrip(benchmark::State& state) {
     NamedEvent event2 = NamedEvent::CreateOrOpen(eventName2);
 
     stopThread = false;
-    std::jthread thread(WaitAndSet, eventName1, eventName2);
+    std::thread thread(WaitAndSet, eventName1, eventName2);
 
     for (auto _ : state) {
         event1.Set();
@@ -63,6 +63,8 @@ void EventRoundtrip(benchmark::State& state) {
 
     stopThread = true;
     event1.Set();
+
+    thread.join();
 }
 
 }  // namespace

benchmark/OsAbstraction/BenchmarkSocket.cpp

@@ -32,7 +32,7 @@ void RunTest(benchmark::State& state, Socket& socket1, Socket& socket2) {
     buffer.resize(size);
 
     bool stopThread{};
-    std::jthread thread(CounterPart, std::ref(socket1), std::ref(stopThread), size);
+    std::thread thread(CounterPart, std::ref(socket1), std::ref(stopThread), size);
 
     for (auto _ : state) {
         MUST_BE_TRUE(SendComplete(socket2, buffer.data(), buffer.size()));
@@ -41,6 +41,8 @@ void RunTest(benchmark::State& state, Socket& socket1, Socket& socket2) {
 
     stopThread = true;
     MUST_BE_TRUE(SendComplete(socket2, buffer.data(), buffer.size()));
+
+    thread.join();
 }
 
 void SocketTcpRoundtrip(benchmark::State& state) {

build.cmd

@@ -36,7 +36,7 @@ echo Building %config% %platformToUse% ...
 set buildDir=%currentDir%\tmpwin\%config%\%platformToUse%
 if not exist "%buildDir%" mkdir "%buildDir%" || exit /b 1
 cd "%buildDir%"
-cmake ..\..\.. -GNinja -DCMAKE_BUILD_TYPE=%config% -DDSVEOSCOSIM_BUILD_TESTS=ON -DDSVEOSCOSIM_BUILD_BENCHMARKS=ON || exit /b 1
+cmake ..\..\.. -GNinja -DCMAKE_BUILD_TYPE=%config% -DDSVEOSCOSIM_BUILD_TESTS=ON || exit /b 1
 cmake --build . --config %config% || exit /b 1
 
 echo Building %config% %platformToUse% finished successfully.

build.sh

@@ -13,7 +13,7 @@ echo Building $config ...
 mkdir -p "$currentDir/tmplin/$config" || exit 1
 cd "$currentDir/tmplin/$config"
 
-cmake ../.. -GNinja -DCMAKE_BUILD_TYPE=$config -DDSVEOSCOSIM_BUILD_TESTS=ON -DDSVEOSCOSIM_BUILD_BENCHMARKS=ON || exit 1
+cmake ../.. -GNinja -DCMAKE_BUILD_TYPE=$config -DDSVEOSCOSIM_BUILD_TESTS=ON || exit 1
 cmake --build . || exit 1
 
 echo Building $config finished successfully.

include/DsVeosCoSim/DsVeosCoSim.h

@@ -1134,8 +1134,48 @@ DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_ReceiveLinMessage(DsVeosCoSim_Ha
 DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_TransmitLinMessage(DsVeosCoSim_Handle handle,
                                                                    const DsVeosCoSim_LinMessage* message);
 
+DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_StartSimulation(DsVeosCoSim_Handle handle);
+DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_StopSimulation(DsVeosCoSim_Handle handle);
+DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_PauseSimulation(DsVeosCoSim_Handle handle);
+DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_ContinueSimulation(DsVeosCoSim_Handle handle);
+DSVEOSCOSIM_DECL DsVeosCoSim_Result DsVeosCoSim_TerminateSimulation(DsVeosCoSim_Handle handle,
+                                                                    DsVeosCoSim_TerminateReason terminateReason);
+
 #ifdef __cplusplus
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_SimulationTimeToString(DsVeosCoSim_SimulationTime simulationTime);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_ResultToString(DsVeosCoSim_Result result);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_CommandToString(DsVeosCoSim_Command command);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_SeverityToString(DsVeosCoSim_Severity severity);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_TerminateReasonToString(DsVeosCoSim_TerminateReason terminateReason);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_ConnectionStateToString(DsVeosCoSim_ConnectionState connectionState);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_DataTypeToString(DsVeosCoSim_DataType dataType);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_SizeKindToString(DsVeosCoSim_SizeKind sizeKind);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_IoSignalToString(const DsVeosCoSim_IoSignal& ioSignal);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_CanControllerToString(const DsVeosCoSim_CanController& controller);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_EthControllerToString(const DsVeosCoSim_EthController& controller);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_LinControllerToString(const DsVeosCoSim_LinController& controller);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_ValueToString(DsVeosCoSim_DataType dataType,
+                                                             uint32_t length,
+                                                             const void* value);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_DataToString(const uint8_t* data, size_t dataLength, char separator = 0);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_IoDataToString(DsVeosCoSim_SimulationTime simulationTime,
+                                                              const DsVeosCoSim_IoSignal& ioSignal,
+                                                              uint32_t length,
+                                                              const void* value);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_CanMessageToString(DsVeosCoSim_SimulationTime simulationTime,
+                                                                  const DsVeosCoSim_CanController& controller,
+                                                                  const DsVeosCoSim_CanMessage& message);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_EthMessageToString(DsVeosCoSim_SimulationTime simulationTime,
+                                                                  const DsVeosCoSim_EthController& controller,
+                                                                  const DsVeosCoSim_EthMessage& message);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_LinMessageToString(DsVeosCoSim_SimulationTime simulationTime,
+                                                                  const DsVeosCoSim_LinController& controller,
+                                                                  const DsVeosCoSim_LinMessage& message);
+extern DSVEOSCOSIM_API std::string DsVeosCoSim_LinControllerTypeToString(
+    DsVeosCoSim_LinControllerType linControllerType);
 extern DSVEOSCOSIM_API std::string DsVeosCoSim_CanMessageFlagsToString(DsVeosCoSim_CanMessageFlags flags);
 extern DSVEOSCOSIM_API std::string DsVeosCoSim_EthMessageFlagsToString(DsVeosCoSim_EthMessageFlags flags);
 extern DSVEOSCOSIM_API std::string DsVeosCoSim_LinMessageFlagsToString(DsVeosCoSim_LinMessageFlags flags);
+
+extern DSVEOSCOSIM_API size_t DsVeosCoSim_GetDataTypeSize(DsVeosCoSim_DataType dataType);
 #endif