recorder: Small fixes

christoph2 · Aug 17, 2022 · 94b3d94 · 94b3d94
1 parent 5dad87e
commit 94b3d94
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/pyxcp/recorder/build_clang.sh b/pyxcp/recorder/build_clang.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-clang++ -std=c++20 -O3 -fvectorize -Rpass=loop-vectorize -ggdb -Wall -Wextra -Weffc++ -DLZ4_DEBUG=1 -DSTANDALONE_REKORDER=1 lz4.cpp rekorder.cpp -o rekorder
+clang++ -std=c++20 -O3 -fvectorize -Rpass=loop-vectorize -ggdb -Wall -Wextra -Weffc++-lpthread -DLZ4_DEBUG=1 -DSTANDALONE_REKORDER=1 lz4.cpp rekorder.cpp -o rekorder
diff --git a/pyxcp/recorder/build_gcc.sh b/pyxcp/recorder/build_gcc.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
-g++ -std=c++20 -O3 -ffast-math -ftree-vectorize -ftree-vectorizer-verbose=9 -fcoroutines -ggdb -Wall -Wextra -Weffc++ -DLZ4_DEBUG=1 -DSTANDALONE_REKORDER=1 lz4.cpp rekorder.cpp -o rekorder
+#!/bin/sh
+g++ -std=c++20 -O3 -ffast-math -ftree-vectorize -ftree-vectorizer-verbose=9 -fcoroutines -ggdb -Wall -Wextra -Weffc++ -DLZ4_DEBUG=1 -DSTANDALONE_REKORDER=1 lz4.cpp rekorder.cpp -o rekorder -lpthread
diff --git a/pyxcp/recorder/build_gcc_arm.sh b/pyxcp/recorder/build_gcc_arm.sh
diff --git a/pyxcp/recorder/rekorder.cpp b/pyxcp/recorder/rekorder.cpp
@@ -17,6 +17,7 @@ void some_records(XcpLogFileWriter& writer)
         fr.timestamp = std::clock();
         fr.length = 10 + (rand() % 240);
         filler = (filler + 1) % 16;
+        printf("buffer: %p\n", buffer);
         memset(buffer, filler, fr.length);
 		writer.add_frame(fr.category, fr.counter, fr.timestamp, fr.length, reinterpret_cast<char*>(&buffer));
     }

diff --git a/pyxcp/recorder/rekorder.hpp b/pyxcp/recorder/rekorder.hpp
@@ -118,7 +118,7 @@ struct frame_header_t
 using FrameTuple = std::tuple<std::uint8_t, std::uint16_t, double, std::uint16_t, payload_t>;
 using FrameVector = std::vector<FrameTuple>;
 
-using FrameTupleWriter = std::tuple<std::uint8_t, std::uint16_t, double, std::uint16_t, std::shared_ptr<blob_t[]>>;
+using FrameTupleWriter = std::tuple<std::uint8_t, std::uint16_t, double, std::uint16_t, std::shared_ptr<char[]>>;
 
 
 enum class FrameCategory : std::uint8_t {
@@ -325,8 +325,9 @@ class XcpLogFileWriter
     }
 
     void add_frame(uint8_t category, uint16_t counter, double timestamp, uint16_t length, char const * data) {
-    	auto pl = std::make_shared<blob_t[]>(length);
-        _fcopy(reinterpret_cast<char*>(pl.get()), data, length);
+    	auto pl = std::make_shared<char []>(length);
+        printf("data: %p length: %u\n", data, length);
+        _fcopy(pl.get(), data, length);
 
         my_queue.put(
             std::make_tuple(category, counter, timestamp, length, std::move(pl))