script_core 0.2.2 → 0.2.7

data/ext/enterprise_script_service/msgpack/src/vrefbuffer.c

@@ -25,6 +25,12 @@ bool msgpack_vrefbuffer_init(msgpack_vrefbuffer* vbuf,
     struct iovec* array;
     msgpack_vrefbuffer_chunk* chunk;
 
+    if (ref_size == 0) {
+        ref_size = MSGPACK_VREFBUFFER_REF_SIZE;
+    }
+    if(chunk_size == 0) {
+        chunk_size = MSGPACK_VREFBUFFER_CHUNK_SIZE;
+    }
     vbuf->chunk_size = chunk_size;
     vbuf->ref_size =
         ref_size > MSGPACK_PACKER_MAX_BUFFER_SIZE + 1 ?

data/ext/enterprise_script_service/msgpack/test/CMakeLists.txt

@@ -7,73 +7,85 @@ INCLUDE_DIRECTORIES (
     ${ZLIB_INCLUDE_DIRS}
 )
 
-LIST (APPEND check_PROGRAMS
-    array_ref.cpp
-    buffer.cpp
-    carray.cpp
-    cases.cpp
-    convert.cpp
-    fixint.cpp
+SET (tests_C
+    buffer_c.cpp
     fixint_c.cpp
-    inc_adaptor_define.cpp
-    json.cpp
-    limit.cpp
-    msgpack_basic.cpp
     msgpack_c.cpp
-    msgpack_container.cpp
-    msgpack_stream.cpp
-    msgpack_tuple.cpp
-    msgpack_vref.cpp
-    object.cpp
-    object_with_zone.cpp
-    pack_unpack.cpp
     pack_unpack_c.cpp
-    raw.cpp
-    reference.cpp
-    size_equal_only.cpp
-    streaming.cpp
     streaming_c.cpp
-    user_class.cpp
-    version.cpp
-    visitor.cpp
-    zone.cpp
 )
 
-IF (MSGPACK_BOOST)
+IF (NOT MSGPACK_CXX_ONLY)
     LIST (APPEND check_PROGRAMS
-        boost_fusion.cpp
-        boost_variant.cpp
-        boost_optional.cpp
-        boost_string_ref.cpp
-        boost_string_view.cpp
+        ${tests_C}
     )
 ENDIF ()
 
-IF (MSGPACK_USE_X3_PARSE)
+IF (MSGPACK_ENABLE_CXX)
     LIST (APPEND check_PROGRAMS
-        msgpack_x3_parse.cpp
+        array_ref.cpp
+        buffer.cpp
+        carray.cpp
+        cases.cpp
+        convert.cpp
+        fixint.cpp
+        inc_adaptor_define.cpp
+        json.cpp
+        limit.cpp
+        msgpack_basic.cpp
+        msgpack_container.cpp
+        msgpack_stream.cpp
+        msgpack_tuple.cpp
+        msgpack_vref.cpp
+        object.cpp
+        object_with_zone.cpp
+        pack_unpack.cpp
+        raw.cpp
+        reference.cpp
+        size_equal_only.cpp
+        streaming.cpp
+        user_class.cpp
+        version.cpp
+        visitor.cpp
+        zone.cpp
     )
-ENDIF ()
 
-IF (MSGPACK_CXX11)
-    LIST (APPEND check_PROGRAMS
-        iterator_cpp11.cpp
-        msgpack_cpp11.cpp
-        reference_cpp11.cpp
-        reference_wrapper_cpp11.cpp
-        shared_ptr_cpp11.cpp
-        unique_ptr_cpp11.cpp
+    IF (MSGPACK_BOOST)
+        LIST (APPEND check_PROGRAMS
+            boost_fusion.cpp
+            boost_variant.cpp
+            boost_optional.cpp
+            boost_string_ref.cpp
+            boost_string_view.cpp
+        )
+    ENDIF ()
 
-        # fuzzers are cpp11 only
-        fuzz_unpack_pack_fuzzer_cpp11.cpp
-    )
-ENDIF ()
+    IF (MSGPACK_USE_X3_PARSE)
+        LIST (APPEND check_PROGRAMS
+            msgpack_x3_parse.cpp
+        )
+    ENDIF ()
 
-IF (MSGPACK_CXX17)
-    LIST (APPEND check_PROGRAMS
-        msgpack_cpp17.cpp
-    )
-ENDIF ()
+    IF (MSGPACK_CXX11 OR MSGPACK_CXX17)
+        LIST (APPEND check_PROGRAMS
+            iterator_cpp11.cpp
+            msgpack_cpp11.cpp
+            reference_cpp11.cpp
+            reference_wrapper_cpp11.cpp
+            shared_ptr_cpp11.cpp
+            unique_ptr_cpp11.cpp
+
+            # fuzzers are cpp11 only
+            fuzz_unpack_pack_fuzzer_cpp11.cpp
+        )
+    ENDIF ()
+
+    IF (MSGPACK_CXX17)
+        LIST (APPEND check_PROGRAMS
+            msgpack_cpp17.cpp
+        )
+    ENDIF ()
+ENDIF (MSGPACK_ENABLE_CXX)
 
 FOREACH (source_file ${check_PROGRAMS})
     GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
@@ -81,8 +93,16 @@ FOREACH (source_file ${check_PROGRAMS})
         ${source_file_we}
         ${source_file}
     )
+
+    LIST (FIND tests_C ${source_file} idx)
+    IF (idx GREATER -1)
+        SET (link_target msgpackc)
+    ELSE ()
+        SET (link_target msgpackc-cxx)
+    ENDIF ()
+
     TARGET_LINK_LIBRARIES (${source_file_we}
-        msgpackc
+        ${link_target}
         ${GTEST_BOTH_LIBRARIES}
         ${ZLIB_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
@@ -96,20 +116,22 @@ FOREACH (source_file ${check_PROGRAMS})
     ENDIF ()
 
     IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4] /WX")
+        IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
             STRING(REGEX REPLACE "/W[0-4]" "/W3 /WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
         ELSE ()
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX")
         ENDIF ()
     ENDIF ()
 ENDFOREACH ()
 
-ADD_EXECUTABLE (
-    multi_file
-    multi_file1.cpp multi_file2.cpp
-)
-TARGET_INCLUDE_DIRECTORIES (multi_file
-    PRIVATE
-        $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
-)
-ADD_TEST (multi_file multi_file)
+IF (MSGPACK_ENABLE_CXX)
+    ADD_EXECUTABLE (
+        multi_file
+        multi_file1.cpp multi_file2.cpp
+    )
+    TARGET_INCLUDE_DIRECTORIES (multi_file
+        PRIVATE
+            $<TARGET_PROPERTY:msgpackc-cxx,INTERFACE_INCLUDE_DIRECTORIES>
+    )
+    ADD_TEST (multi_file multi_file)
+ENDIF ()

data/ext/enterprise_script_service/msgpack/test/array_ref.cpp

@@ -3,12 +3,16 @@
 #include <string>
 #include <sstream>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/boost_fusion.cpp

@@ -3,12 +3,16 @@
 #include <iterator>
 #include <cmath>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/boost_optional.cpp

@@ -2,12 +2,16 @@
 #include <sstream>
 #include <iterator>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 
 #ifdef HAVE_CONFIG_H

data/ext/enterprise_script_service/msgpack/test/boost_string_ref.cpp

@@ -2,13 +2,16 @@
 #include <sstream>
 #include <iterator>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
-
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/boost_string_view.cpp

@@ -2,12 +2,16 @@
 #include <sstream>
 #include <iterator>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/boost_variant.cpp

@@ -3,12 +3,16 @@
 #include <sstream>
 #include <iterator>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/ext/enterprise_script_service/msgpack/test/buffer.cpp

@@ -1,15 +1,17 @@
 #include <msgpack.hpp>
 #include <msgpack/fbuffer.hpp>
-#include <msgpack/fbuffer.h>
 #include <msgpack/zbuffer.hpp>
-#include <msgpack/zbuffer.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
 
 #include <gtest/gtest.h>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
 
 #include <string.h>
 
@@ -69,7 +71,6 @@ TEST(buffer, vrefbuffer)
     EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 );
 }
 
-
 TEST(buffer, zbuffer)
 {
     msgpack::zbuffer zbuf;
@@ -81,22 +82,6 @@ TEST(buffer, zbuffer)
     zbuf.flush();
 }
 
-
-TEST(buffer, zbuffer_c)
-{
-    msgpack_zbuffer zbuf;
-    EXPECT_TRUE(msgpack_zbuffer_init(&zbuf, 1, MSGPACK_ZBUFFER_INIT_SIZE));
-    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
-    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
-    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
-    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "", 0));
-
-    EXPECT_TRUE(msgpack_zbuffer_flush(&zbuf) != NULL);
-
-    msgpack_zbuffer_destroy(&zbuf);
-}
-
-
 TEST(buffer, fbuffer)
 {
 #if defined(_MSC_VER)
@@ -124,31 +109,3 @@ TEST(buffer, fbuffer)
     EXPECT_EQ(EOF, fgetc(file));
     fclose(file);
 }
-
-
-TEST(buffer, fbuffer_c)
-{
-#if defined(_MSC_VER)
-    FILE* file;
-    tmpfile_s(&file);
-#else  // defined(_MSC_VER)
-    FILE* file = tmpfile();
-#endif // defined(_MSC_VER)
-
-    void* fbuf = (void*)file;
-
-    EXPECT_TRUE( file != NULL );
-    EXPECT_EQ(0, msgpack_fbuffer_write(fbuf, "a", 1));
-    EXPECT_EQ(0, msgpack_fbuffer_write(fbuf, "a", 1));
-    EXPECT_EQ(0, msgpack_fbuffer_write(fbuf, "a", 1));
-
-    fflush(file);
-    rewind(file);
-    for (size_t i=0; i < 3; ++i) {
-        int ch = fgetc(file);
-        EXPECT_TRUE(ch != EOF);
-        EXPECT_EQ('a', (char) ch);
-    }
-    EXPECT_EQ(EOF, fgetc(file));
-    fclose(file);
-}

data/ext/enterprise_script_service/msgpack/test/buffer_c.cpp

@@ -0,0 +1,148 @@
+#include <msgpack/fbuffer.h>
+#include <msgpack/zbuffer.h>
+#include <msgpack/sbuffer.h>
+#include <msgpack/vrefbuffer.h>
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+#endif //defined(__GNUC__)
+
+#include <gtest/gtest.h>
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif //defined(__GNUC__)
+
+#include <string.h>
+
+#if defined(unix) || defined(__unix) || defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__QNX__) || defined(__QNXTO__) || defined(__HAIKU__)
+#define HAVE_SYS_UIO_H 1
+#else
+#define HAVE_SYS_UIO_H 0
+#endif
+
+TEST(buffer, zbuffer_c)
+{
+    msgpack_zbuffer zbuf;
+    EXPECT_TRUE(msgpack_zbuffer_init(&zbuf, 1, MSGPACK_ZBUFFER_INIT_SIZE));
+    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
+    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
+    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "a", 1));
+    EXPECT_EQ(0, msgpack_zbuffer_write(&zbuf, "", 0));
+
+    EXPECT_TRUE(msgpack_zbuffer_flush(&zbuf) != NULL);
+
+    msgpack_zbuffer_destroy(&zbuf);
+}
+
+TEST(buffer, fbuffer_c)
+{
+#if defined(_MSC_VER)
+    FILE* file;
+    tmpfile_s(&file);
+#else  // defined(_MSC_VER)
+    FILE* file = tmpfile();
+#endif // defined(_MSC_VER)
+
+    void* fbuf = (void*)file;
+
+    EXPECT_TRUE( file != NULL );
+    EXPECT_EQ(0, msgpack_fbuffer_write(fbuf, "a", 1));
+    EXPECT_EQ(0, msgpack_fbuffer_write(fbuf, "a", 1));
+    EXPECT_EQ(0, msgpack_fbuffer_write(fbuf, "a", 1));
+
+    fflush(file);
+    rewind(file);
+    for (size_t i=0; i < 3; ++i) {
+        int ch = fgetc(file);
+        EXPECT_TRUE(ch != EOF);
+        EXPECT_EQ('a', (char) ch);
+    }
+    EXPECT_EQ(EOF, fgetc(file));
+    fclose(file);
+}
+
+TEST(buffer, sbuffer_c)
+{
+    msgpack_sbuffer *sbuf;
+    char *data;
+
+    sbuf = msgpack_sbuffer_new();
+    EXPECT_TRUE(sbuf != NULL);
+    EXPECT_EQ(0, msgpack_sbuffer_write(sbuf, "a", 1));
+    EXPECT_EQ(0, msgpack_sbuffer_write(sbuf, "b", 1));
+    EXPECT_EQ(0, msgpack_sbuffer_write(sbuf, "c", 1));
+    EXPECT_EQ(0, msgpack_sbuffer_write(sbuf, "", 0));
+    EXPECT_EQ(3U, sbuf->size);
+    EXPECT_EQ(0, memcmp(sbuf->data, "abc", 3));
+    data = msgpack_sbuffer_release(sbuf);
+    EXPECT_EQ(0, memcmp(data, "abc", 3));
+    EXPECT_EQ(0U, sbuf->size);
+    EXPECT_TRUE(sbuf->data == NULL);
+
+    free(data);
+    msgpack_sbuffer_free(sbuf);
+}
+
+TEST(buffer, vrefbuffer_c)
+{
+    const char *raw = "I was about to sail away in a junk,"
+                      "When suddenly I heard"
+                      "The sound of stamping and singing on the bank--"
+                      "It was you and your friends come to bid me farewell."
+                      "The Peach Flower Lake is a thousand fathoms deep,"
+                      "But it cannot compare, O Wang Lun,"
+                      "With the depth of your love for me.";
+    const size_t rawlen = strlen(raw);
+    msgpack_vrefbuffer *vbuf;
+    const int ref_size = 24, chunk_size = 128;
+    size_t slices[] = {0, 9, 10,
+                    MSGPACK_VREFBUFFER_REF_SIZE,
+                    MSGPACK_VREFBUFFER_REF_SIZE + 1,
+                    ref_size, chunk_size + 1};
+    size_t iovcnt;
+    const iovec *iov;
+    size_t len = 0, i;
+    char *buf;
+
+    vbuf = msgpack_vrefbuffer_new(ref_size, 0);
+    for (i = 0; i < sizeof(slices) / sizeof(slices[0]); i++) {
+        msgpack_vrefbuffer_write(vbuf, raw + len, slices[i]);
+        len += slices[i];
+    }
+    EXPECT_LT(len, rawlen);
+    iov = msgpack_vrefbuffer_vec(vbuf);
+    iovcnt = msgpack_vrefbuffer_veclen(vbuf);
+
+    buf = (char *)malloc(rawlen);
+#if HAVE_SYS_UIO_H
+    {
+        int fd;
+        char filename[] = "/tmp/mp.XXXXXX";
+
+        fd = mkstemp(filename);
+        EXPECT_LT(0, fd);
+        writev(fd, iov, (int)iovcnt);
+        len = (size_t)lseek(fd, 0, SEEK_END);
+        lseek(fd, 0, SEEK_SET);
+        read(fd, buf, len);
+        EXPECT_EQ(0, memcmp(buf, raw, len));
+        close(fd);
+        unlink(filename);
+    }
+#else
+    {
+        len = 0;
+        for (i = 0; i < iovcnt; i++)
+        {
+            EXPECT_LT(len, rawlen);
+            memcpy(buf + len, iov[i].iov_base, iov[i].iov_len);
+            len += iov[i].iov_len;
+        }
+        EXPECT_EQ(0, memcmp(buf, raw, len));
+    }
+#endif
+    free(buf);
+    msgpack_vrefbuffer_free(vbuf);
+}