Merge pull request #33 from red0124/improvement/getline_update

Improvement/getline update

.github/workflows/coverage.yml

@@ -56,7 +56,7 @@ jobs:
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+        run: ctest --output-on-failure
 
       - name: Generate coverage report
         run: |

.github/workflows/ubuntu-latest-clang.yml

@@ -66,4 +66,4 @@ jobs:
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+        run: ctest --output-on-failure

.github/workflows/ubuntu-latest-gcc.yml

@@ -56,4 +56,4 @@ jobs:
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+        run: ctest --output-on-failure

.github/workflows/ubuntu-latest-icc.yml

@@ -74,4 +74,4 @@ jobs:
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+        run: ctest --output-on-failure

.github/workflows/win-msvc.yml

@@ -62,4 +62,4 @@ jobs:
       - name: Run
         working-directory: build
         run: >-
-          ctest -C Debug --output-on-failure -j ${{steps.cores.outputs.count}}
+          ctest -C Debug --output-on-failure

.github/workflows/win-msys2-clang.yml

@@ -73,4 +73,4 @@ jobs:
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+        run: ctest --output-on-failure

.github/workflows/win-msys2-gcc.yml

@@ -71,4 +71,4 @@ jobs:
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+        run: ctest --output-on-failure

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 
 project(
     ssp
-    VERSION 1.6.1
+    VERSION 1.6.2
     DESCRIPTION "csv parser"
     HOMEPAGE_URL "https://github.com/red0124/ssp"
     LANGUAGES CXX

include/ss/common.hpp

@@ -1,13 +1,20 @@
 #pragma once
+#include <cerrno>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 
 namespace ss {
+
 struct none {};
 
 using string_range = std::pair<const char*, const char*>;
 using split_data = std::vector<string_range>;
 
 constexpr inline auto default_delimiter = ",";
+constexpr inline auto get_line_initial_buffer_size = 128;
 
 template <bool StringError>
 inline void assert_string_error_defined() {
@@ -20,4 +27,66 @@ inline void assert_throw_on_error_not_defined() {
     static_assert(!ThrowOnError, "cannot handle errors manually if "
                                  "'throw_on_error' is enabled");
 }
+
+#if __unix__
+inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
+    return getline(lineptr, n, stream);
+}
+#else
+
+using ssize_t = int64_t;
+
+ssize_t get_line(char** lineptr, size_t* n, FILE* fp) {
+    if (lineptr == nullptr || n == nullptr || fp == nullptr) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    char buff[get_line_initial_buffer_size];
+
+    if (*lineptr == nullptr || *n < sizeof(buff)) {
+        size_t new_n = sizeof(buff);
+        auto new_lineptr = static_cast<char*>(realloc(*lineptr, new_n));
+        if (new_lineptr == nullptr) {
+            errno = ENOMEM;
+            return -1;
+        }
+
+        *lineptr = new_lineptr;
+        *n = new_n;
+    }
+
+    (*lineptr)[0] = '\0';
+
+    while (fgets(buff, sizeof(buff), fp) != nullptr) {
+        size_t line_used = strlen(*lineptr);
+        size_t buff_used = strlen(buff);
+
+        if (*n < buff_used + line_used) {
+            size_t new_n = *n * 2;
+
+            auto new_lineptr = static_cast<char*>(realloc(*lineptr, *n));
+            if (new_lineptr == nullptr) {
+                errno = ENOMEM;
+                return -1;
+            }
+
+            *lineptr = new_lineptr;
+            *n = new_n;
+        }
+
+        memcpy(*lineptr + line_used, buff, buff_used);
+        line_used += buff_used;
+        (*lineptr)[line_used] = '\0';
+
+        if ((*lineptr)[line_used - 1] == '\n') {
+            return line_used;
+        }
+    }
+
+    return -1;
+}
+
+#endif
+
 } /* ss */

meson.build

@@ -6,7 +6,7 @@ project(
       'cpp_std=c++17', 
       'buildtype=debugoptimized',
       'wrap_mode=forcefallback'],
-  version: '1.6.1',
+  version: '1.6.2',
   meson_version:'>=0.54.0')
 
 fast_float_dep = dependency('fast_float')

ssp.hpp

@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <array>
+#include <cerrno>
 #include <charconv>
 #include <cstdint>
 #include <cstdio>
@@ -625,6 +626,7 @@ using string_range = std::pair<const char*, const char*>;
 using split_data = std::vector<string_range>;
 
 constexpr inline auto default_delimiter = ",";
+constexpr inline auto get_line_initial_buffer_size = 128;
 
 template <bool StringError>
 inline void assert_string_error_defined() {
@@ -643,55 +645,60 @@ inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
     return getline(lineptr, n, stream);
 }
 #else
-using ssize_t = int64_t;
-inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
-    size_t pos;
-    int c;
 
-    if (lineptr == nullptr || stream == nullptr || n == nullptr) {
+using ssize_t = int64_t;
+
+ssize_t get_line(char** lineptr, size_t* n, FILE* fp) {
+    if (lineptr == nullptr || n == nullptr || fp == nullptr) {
         errno = EINVAL;
         return -1;
     }
 
-    c = getc(stream);
-    if (c == EOF) {
-        return -1;
-    }
+    char buff[get_line_initial_buffer_size];
 
-    if (*lineptr == nullptr) {
-        *lineptr = static_cast<char*>(malloc(128));
-        if (*lineptr == nullptr) {
+    if (*lineptr == nullptr || *n < sizeof(buff)) {
+        size_t new_n = sizeof(buff);
+        auto new_lineptr = static_cast<char*>(realloc(*lineptr, new_n));
+        if (new_lineptr == nullptr) {
+            errno = ENOMEM;
             return -1;
         }
-        *n = 128;
+
+        *lineptr = new_lineptr;
+        *n = new_n;
     }
 
-    pos = 0;
-    while (c != EOF) {
-        if (pos + 1 >= *n) {
-            size_t new_size = *n + (*n >> 2);
-            if (new_size < 128) {
-                new_size = 128;
-            }
-            char* new_ptr = static_cast<char*>(
-                realloc(static_cast<void*>(*lineptr), new_size));
-            if (new_ptr == nullptr) {
+    (*lineptr)[0] = '\0';
+
+    while (fgets(buff, sizeof(buff), fp) != nullptr) {
+        size_t line_used = strlen(*lineptr);
+        size_t buff_used = strlen(buff);
+
+        if (*n < buff_used + line_used) {
+            size_t new_n = *n * 2;
+
+            auto new_lineptr = static_cast<char*>(realloc(*lineptr, *n));
+            if (new_lineptr == nullptr) {
+                errno = ENOMEM;
                 return -1;
             }
-            *n = new_size;
-            *lineptr = new_ptr;
+
+            *lineptr = new_lineptr;
+            *n = new_n;
         }
 
-        (*lineptr)[pos++] = c;
-        if (c == '\n') {
-            break;
+        memcpy(*lineptr + line_used, buff, buff_used);
+        line_used += buff_used;
+        (*lineptr)[line_used] = '\0';
+
+        if ((*lineptr)[line_used - 1] == '\n') {
+            return line_used;
         }
-        c = getc(stream);
     }
 
-    (*lineptr)[pos] = '\0';
-    return pos;
+    return -1;
 }
+
 #endif
 
 } /* ss */
@@ -2281,7 +2288,7 @@ public:
             return;
         }
 
-        if (header_.empty()) {
+        if (header_.empty() && !eof()) {
             split_header_data();
         }
 

test/test_parser.cpp

@@ -897,7 +897,7 @@ void test_multiline_restricted() {
         out << "17,18,\"ju\\\n\\\n\\\n\\\\\n\nnk\"" << std::endl;
         out << "19,20,just strings" << std::endl;
     }
-    auto bad_lines = 19;
+    auto bad_lines = 15;
     auto num_errors = 0;
 
     ss::parser<ss::multiline_restricted<2>, ss::quote<'"'>, ss::escape<'\\'>,
@@ -1641,7 +1641,6 @@ void test_ignore_empty(const std::vector<X>& data) {
     test_ignore_empty_impl<ss::throw_on_error>(data);
 }
 
-// TODO test with different initial buffer sizes
 TEST_CASE("parser test various cases with empty lines") {
     test_ignore_empty({{1, 2, "x"}, {3, 4, "y"}, {9, 10, "v"}, {11, 12, "w"}});
 
@@ -1671,53 +1670,13 @@ TEST_CASE("parser test various cases with empty lines") {
                        {9, 10, X::empty},
                        {11, 12, X::empty}});
 
-    test_ignore_empty({{1, 2, X::empty},
-                       {3, 4, X::empty},
-                       {5, 6, X::empty},
-                       {7, 8, X::empty},
-                       {9, 10, X::empty},
-                       {11, 12, X::empty},
-                       {13, 14, X::empty},
-                       {15, 16, X::empty},
-                       {17, 18, X::empty}});
+    test_ignore_empty(
+        {{1, 2, "x"}, {3, 4, X::empty}, {9, 10, X::empty}, {11, 12, X::empty}});
 
-    test_ignore_empty({{1, 2, X::empty},
-                       {3, 4, X::empty},
-                       {5, 6, X::empty},
-                       {7, 8, X::empty},
-                       {9, 10, X::empty},
-                       {11, 12, X::empty},
-                       {13, 14, X::empty},
-                       {15, 16, X::empty},
-                       {17, 18, "x"}});
+    test_ignore_empty(
+        {{1, 2, X::empty}, {3, 4, X::empty}, {9, 10, X::empty}, {11, 12, "w"}});
 
-        test_ignore_empty({{1, 2, "x"},
-                           {3, 4, X::empty},
-                           {9, 10, X::empty},
-                           {11, 12, X::empty}});
+    test_ignore_empty({{11, 12, X::empty}});
 
-        test_ignore_empty({{1, 2, "x"},
-                           {3, 4, X::empty},
-                           {3, 4, X::empty},
-                           {5, 6, X::empty},
-                           {7, 8, X::empty},
-                           {9, 10, X::empty},
-                           {11, 12, X::empty}});
-
-        test_ignore_empty({{1, 2, "x"},
-                           {3, 4, X::empty},
-                           {3, 4, X::empty},
-                           {5, 6, X::empty},
-                           {7, 8, X::empty},
-                           {9, 10, X::empty},
-                           {11, 12, "y"}});
-
-        test_ignore_empty({{1, 2, X::empty},
-                           {3, 4, X::empty},
-                           {9, 10, X::empty},
-                           {11, 12, "w"}});
-
-        test_ignore_empty({{11, 12, X::empty}});
-
-        test_ignore_empty({});
+    test_ignore_empty({});
 }