wip: working on new parser

klonyyy · Aug 30, 2023 · 1eecb0c · 1eecb0c
1 parent 2ac8695
commit 1eecb0c
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 131,265 deletions.
diff --git a/src/TraceReader/TraceReaderNew.cpp b/src/TraceReader/TraceReaderNew.cpp
@@ -164,6 +164,29 @@ void TraceReaderNew::processTimestamp(std::vector<uint8_t>& chunk)
 	chunk.clear();
 }
 
+void TraceReaderNew::handleTimestamp(uint32_t& idx, int32_t& length)
+{
+	timestamp = 0;
+	chunk.push_back(buffer[idx]);
+	remainingFrameType = 0;
+	while (TRACE_OP_GET_CONTINUATION(buffer[idx]) && !remainingFrameType)
+	{
+		if (idx < length - 1)
+		{
+			idx++;
+			chunk.push_back(buffer[idx]);
+		}
+		else
+		{
+			std::cout << "    remaining timestamp    " << std::endl;
+			remainingFrameType = 2;
+			remainingBytes = 1;
+		}
+	}
+	if (remainingFrameType == 0)
+		processTimestamp(chunk);
+}
+
 void TraceReaderNew::readerThread()
 {
 	while (isRunning.load())
@@ -208,40 +231,25 @@ void TraceReaderNew::readerThread()
 
 		if (remainingFrameType == 2)
 		{
-			remainingFrameType = 0;
-			chunk.push_back(buffer[idx]);
-			while (TRACE_OP_GET_CONTINUATION(buffer[idx]))
-			{
-				if (idx < length - 1)
-					idx++;
-				else
-				{
-					std::cout << "    remaining timestamp REST   " << std::endl;
-					remainingFrameType = 2;
-				}
-				chunk.push_back(buffer[idx]);
-			}
-			if (remainingFrameType == 0)
-			{
-				std::cout << "procesing timestampo" << std::endl;
-				processTimestamp(chunk);
-				idx++;
-			}
+			handleTimestamp(idx, length);
+			idx++;
 		}
-		else if (remainingFrameType == 1 && remainingBytes)
+		else if (remainingFrameType == 1)
 		{
 			remainingFrameType = 0;
+			chunk.push_back(buffer[idx]);
+			remainingBytes--;
 			while (remainingBytes--)
 			{
-				chunk.push_back(buffer[idx]);
 				if (idx < length - 1)
 					idx++;
 				else
 					remainingFrameType = 1;
+				chunk.push_back(buffer[idx]);
 			}
-			length -= idx;
 			if (remainingFrameType == 0)
 			{
+				std::cout << "procesing sourco" << std::endl;
 				processSource(chunk);
 				idx++;
 			}
@@ -264,42 +272,22 @@ void TraceReaderNew::readerThread()
 				for (uint32_t i = 0; i < size; i++)
 				{
 					if (idx < length - 1)
+					{
 						idx++;
+						chunk.push_back(buffer[idx]);
+					}
 					else
 					{
 						remainingFrameType = 1;
 						remainingBytes = size - i;
 						std::cout << "remaining: " << (int)remainingBytes << std::endl;
 					}
-
-					chunk.push_back(buffer[idx]);
 				}
 				if (remainingFrameType == 0)
 					processSource(chunk);
 			}
 			else if (TRACE_OP_IS_LOCAL_TIME(c))
-			{
-				timestamp = 0;
-
-				chunk.push_back(buffer[idx]);
-
-				while (TRACE_OP_GET_CONTINUATION(buffer[idx]) && !remainingFrameType)
-				{
-					if (idx < length - 1)
-					{
-						idx++;
-						chunk.push_back(buffer[idx]);
-					}
-					else
-					{
-						std::cout << "    remaining timestamp    " << std::endl;
-						remainingFrameType = 2;
-						remainingBytes = 1;
-					}
-				}
-				if (remainingFrameType == 0)
-					processTimestamp(chunk);
-			}
+				handleTimestamp(idx, length);
 
 			idx++;
 

diff --git a/src/TraceReader/TraceReaderNew.hpp b/src/TraceReader/TraceReaderNew.hpp
@@ -87,6 +87,7 @@ class TraceReaderNew
 
 	void processSource(std::vector<uint8_t>& chunk);
 	void processTimestamp(std::vector<uint8_t>& chunk);
+	void handleTimestamp(uint32_t& idx, int32_t& length);
 	void readerThread();
 
 	std::shared_ptr<ITraceDevice> traceDevice;

diff --git a/test/TraceReaderTest.cpp b/test/TraceReaderTest.cpp
@@ -3,8 +3,8 @@
 #include <memory>
 
 #include "ITraceDevice.hpp"
-// #include "TraceReader/TraceReader.hpp"
-#include "TraceReader/TraceReaderNew.hpp"
+#include "TraceReader/TraceReader.hpp"
+// #include "TraceReader/TraceReaderNew.hpp"
 #include "gmock/gmock.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include "spdlog/spdlog.h"
@@ -34,7 +34,7 @@ class TraceReaderTest : public ::testing::Test
 	void SetUp() override
 	{
 		traceDevice = std::make_shared<::NiceMock<TraceDeviceMock>>();
-		traceReader = std::make_shared<TraceReaderNew>(traceDevice, logger);
+		traceReader = std::make_shared<TraceReader>(traceDevice, logger);
 
 		ON_CALL(*traceDevice, startTrace(_, _, _)).WillByDefault(Return(true));
 		ON_CALL(*traceDevice, stopTrace()).WillByDefault(Return(true));
@@ -55,7 +55,7 @@ class TraceReaderTest : public ::testing::Test
 	std::shared_ptr<spdlog::sinks::stdout_color_sink_mt> stdout_sink;
 	std::shared_ptr<spdlog::logger> logger;
 
-	std::shared_ptr<TraceReaderNew> traceReader;
+	std::shared_ptr<TraceReader> traceReader;
 	std::shared_ptr<::NiceMock<TraceDeviceMock>> traceDevice;
 };