stream/livestatus: refactor ReadLine with context saving

components/livestatus/component.cpp

@@ -84,13 +84,11 @@ void LivestatusComponent::ClientThreadProc(const Socket::Ptr& client)
 
 	for (;;) {
 		String line;
-		bool read_line = false;
+		ReadLineContext context;
 
 		std::vector<String> lines;
 
-		while (stream->ReadLine(&line)) {
-			read_line = true;
-
+		while (stream->ReadLine(&line, context)) {
 			if (line.GetLength() > 0)
 				lines.push_back(line);
 			else

lib/base/stream.cpp

@@ -24,42 +24,54 @@
 
 using namespace icinga;
 
-bool Stream::ReadLine(String *line, size_t maxLength)
+bool Stream::ReadLine(String *line, ReadLineContext& context, size_t maxLength)
 {
-	BOOST_THROW_EXCEPTION(std::runtime_error("Not implemented."));
-	/*
-	char *buffer = new char[maxLength];
-
-	size_t rc = Peek(buffer, maxLength);
-
-	if (rc == 0)
+	if (context.Eof)
 		return false;
 
-	for (size_t i = 0; i < rc; i++) {
-		if (buffer[i] == '\n') {
-			*line = String(buffer, &(buffer[i]));
+	for (;;) {
+		if (context.MustRead) {
+			context.Buffer = (char *)realloc(context.Buffer, context.Size + maxLength);
+
+			if (!context.Buffer)
+				throw std::bad_alloc();
+
+			size_t rc = Read(context.Buffer + context.Size, maxLength);
+
+			if (rc == 0) {
+				*line = String(context.Buffer, &(context.Buffer[context.Size]));
+				boost::algorithm::trim_right(*line);
+
+				context.Eof = true;
+
+				return true;
+			}
+
+			context.Size += rc;
+		}
+
+		int count = 0;
+		size_t first_newline;
+
+		for (size_t i = 0; i < context.Size; i++) {
+			if (context.Buffer[i] == '\n') {
+				count++;
+
+				if (count == 1)
+					first_newline = i;
+			}
+		}
+
+		context.MustRead = (count <= 1);
+
+		if (count > 0) {
+			*line = String(context.Buffer, &(context.Buffer[first_newline]));
 			boost::algorithm::trim_right(*line);
 
-			Read(NULL, i + 1);
-
-			delete buffer;
+			memmove(context.Buffer, context.Buffer + first_newline + 1, context.Size - first_newline - 1);
+			context.Size -= first_newline + 1;
 
 			return true;
 		}
 	}
-
-	if (IsReadEOF()) {
-		*line = String(buffer, buffer + rc);
-		boost::algorithm::trim_right(*line);
-
-		Read(NULL, rc);
-
-		delete buffer;
-
-		return true;
-	}
-
-	delete buffer;*/
-
-	return false;
 }

lib/base/stream.h

@@ -29,6 +29,17 @@
 namespace icinga
 {
 
+struct ReadLineContext
+{
+	ReadLineContext(void) : Buffer(NULL), Size(0), Eof(false), MustRead(true)
+	{ }
+
+	char *Buffer;
+	size_t Size;
+	bool Eof;
+	bool MustRead;
+};
+
 /**
  * A stream.
  *
@@ -64,7 +75,7 @@ public:
 	 */
 	virtual void Close(void) = 0;
 
-	bool ReadLine(String *line, size_t maxLength = 4096);
+	bool ReadLine(String *line, ReadLineContext& context, size_t maxLength = 4096);
 };
 
 }