Write logs in the buffer first to ensure the order of log entries (#508)

kstenerud · Jun 21, 2024 · 901cfdc · 901cfdc
1 parent 63bab23
commit 901cfdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/KSCrash-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/KSCrash-Package.xcscheme
@@ -148,12 +148,6 @@
                <Test
                   Identifier = "KSDebug_Tests">
                </Test>
-               <Test
-                  Identifier = "KSFileUtils_Tests/testWriteBuffered_FlushAndLargeWriteOrder">
-               </Test>
-               <Test
-                  Identifier = "KSFileUtils_Tests/testWriteBuffered_OrderWithLargeData">
-               </Test>
                <Test
                   Identifier = "KSObjC_Tests/testDateDescription">
                </Test>

diff --git a/Sources/KSCrashRecordingCore/KSFileUtils.c b/Sources/KSCrashRecordingCore/KSFileUtils.c
@@ -480,18 +480,17 @@ void ksfu_closeBufferedWriter(KSBufferedWriter* writer)
 
 bool ksfu_writeBufferedWriter(KSBufferedWriter* writer, const char* restrict const data, const int length)
 {
-    if(length > writer->bufferLength)
-    {
-        return ksfu_writeBytesToFD(writer->fd, data, length);
-    }
     if(length > writer->bufferLength - writer->position)
     {
         if (!ksfu_flushBufferedWriter(writer))
         {
             return false;
         }
     }
-
+    if(length > writer->bufferLength)
+    {
+        return ksfu_writeBytesToFD(writer->fd, data, length);
+    }
     memcpy(writer->buffer + writer->position, data, length);
     writer->position += length;
     return true;