loggingcentral: cleanup

Author: dron0gus

firmware/console/binary/tunerstudio.cpp

@@ -849,19 +849,12 @@ static void handleGetText(TsChannelBase* tsChannel) {
 	tsState.textCommandCounter++;
 
 	printOverallStatus();
-
-#if 0
-	size_t outputSize = loggingGetOutputData(tsChannel->scratchBuffer + TS_PACKET_HEADER_SIZE, sizeof(tsChannel->scratchBuffer) - TS_PACKET_HEADER_SIZE - TS_PACKET_TAIL_SIZE);
 #if EFI_SIMULATOR
-	logMsg("get test sending [%d]\r\n", outputSize);
-#endif
-
-	tsChannel->crcAndWriteBuffer(TS_RESPONSE_OK, outputSize);
-#else
-	/* size_t outputSize = */loggingSendOutputData(tsChannel);
-#endif
+	size_t outputSize =
+#endif // EFI_SIMULATOR
+		loggingSendOutputData(tsChannel);
 #if EFI_SIMULATOR
-	//logMsg("sent [%d]\r\n", outputSize);
+	logMsg("sent [%d]\r\n", outputSize);
 #endif // EFI_SIMULATOR
 }
 #endif // EFI_TEXT_LOGGING

firmware/util/loggingcentral.cpp

@@ -46,38 +46,16 @@ void LogLineBuffer::free() {
 	freeBuffers.post(this, TIME_INFINITE);
 }
 
-/**
- * Fill buffer with as much data as possible
- *
- * @return actual size to transfer
- */
-size_t loggingGetOutputData(char *buffer, size_t size) {
-	LogBufferBase* line;
-	size_t offset = 0;
-	// TODO: better?
-	while (offset + 128 <= size) {
-		// Fetch a queued message
-		msg_t msg = filledBuffers.fetch(&line, TIME_IMMEDIATE);
-
-		if (msg != MSG_OK) {
-			return offset;
-		}
-
-		const char* content = line->getBuffer();
-		size_t len = std::strlen(content);
-		memcpy(buffer + offset, content, len);
-		offset += len;
-
-		// Return this logging buffer to the owner
-		line->free();
-	}
-
-	return offset;
-}
 
 // actually we can send much more in one packed. this is just a threshold that triggers current packet finalization
 constexpr size_t maxSend = scratchBuffer_SIZE;
 
+/**
+ * Write as much data as possible
+ *
+ * @return actual size transfered
+ */
+
 size_t loggingSendOutputData(TsChannelBase* tsChannel) {
 	// consolidate up to 16 line buffers in one TS packet
 	LogBufferBase* bufs[16];

firmware/util/loggingcentral.h

@@ -15,7 +15,6 @@ class Logging;
 
 void startLoggingProcessor();
 
-size_t loggingGetOutputData(char *buffer, size_t size);
 size_t loggingSendOutputData(TsChannelBase* tsChannel);
 
 namespace priv