Allow for writing arbitrary long strings in LineWriter

src/interpret/heaptrack_interpret.cpp

@@ -275,7 +275,9 @@ struct AccumulatedTraceData
         if (internedString) {
             *internedString = it->first.data();
         }
-        out.write("s %s\n", str.c_str());
+        out.write("s ");
+        out.write(str);
+        out.write("\n");
         return id;
     }
 

src/util/linewriter.h

@@ -106,6 +106,29 @@ class LineWriter
         return write("%s", line);
     }
 
+    /**
+     * write an arbitrary string literal to the buffer
+     */
+    bool write(const std::string& line)
+    {
+        const auto length = line.length();
+        if (availableSpace() < length) {
+            if (!flush()) {
+                return false;
+            }
+            if (availableSpace() < length) {
+                int ret = 0;
+                do {
+                    ret = ::write(fd, line.c_str(), length);
+                } while (ret < 0 && errno == EINTR);
+                return ret >= 0;
+            }
+        }
+        memcpy(out(), line.c_str(), length);
+        bufferSize += length;
+        return true;
+    }
+
     /**
      * write one of the common heaptrack output lines to the buffer
      *

tests/auto/tst_io.cpp

@@ -67,6 +67,16 @@ TEST_CASE ("buffered write", "[write]") {
     for (unsigned i = 0; i < 10000; ++i) {
         REQUIRE(writer.write("%d %x\n", 42, 42));
         expectedContents += "42 2a\n";
+        if (i % 1000 == 0) {
+            const string longString(LineWriter::BUFFER_CAPACITY * 2, '*');
+            REQUIRE(writer.write(longString));
+            expectedContents += longString;
+        }
+    }
+    for (unsigned i = 0; i < LineWriter::BUFFER_CAPACITY * 2; ++i) {
+        const string longString(i, '*');
+        REQUIRE(writer.write(longString));
+        expectedContents += longString;
     }
     REQUIRE(expectedContents.size() > LineWriter::BUFFER_CAPACITY);
     REQUIRE(writer.flush());