Update contrib/restricted/aws/aws-c-common to 0.12.5

commit_hash:a5eea4b5dc9467a6e6ced7629b2f7f220e46408a

Author: robot-piglet

contrib/restricted/aws/aws-c-common/.yandex_meta/__init__.py

@@ -59,7 +59,7 @@ def post_install(self):
 
     posix_srcs = []
     for src in sorted(m.SRCS):
-        if "/posix/" in src:
+        if ("/posix/" in src) or ("/linux" in src):
             m.SRCS.remove(src)
             posix_srcs.append(src)
 

contrib/restricted/aws/aws-c-common/.yandex_meta/devtools.copyrights.report

@@ -154,6 +154,7 @@ BELONGS ya.make
         source/json.c [2:2]
         source/lifo_cache.c [2:2]
         source/linked_hash_table.c [2:2]
+        source/linux/file_direct_io.c [2:2]
         source/linux/system_info.c [2:2]
         source/log_channel.c [2:2]
         source/log_formatter.c [2:2]

contrib/restricted/aws/aws-c-common/.yandex_meta/devtools.licenses.report

@@ -394,6 +394,7 @@ BELONGS ya.make
         source/json.c [3:3]
         source/lifo_cache.c [3:3]
         source/linked_hash_table.c [3:3]
+        source/linux/file_direct_io.c [3:3]
         source/linux/system_info.c [3:3]
         source/log_channel.c [3:3]
         source/log_formatter.c [3:3]

contrib/restricted/aws/aws-c-common/.yandex_meta/override.nix

@@ -1,10 +1,10 @@
 pkgs: attrs: with pkgs; with attrs; rec {
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-common";
     rev = "v${version}";
-    hash = "sha256-hKCIPZlLPyH7D3Derk2onyqTzWGUtCx+f2+EKtAKlwA=";
+    hash = "sha256-NrKeDEI6TOFogqKQzRS25il9fU8XJ+swFLhqMVkDk2o=";
   };
 }

contrib/restricted/aws/aws-c-common/THIRD-PARTY-LICENSES.txt

@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** cJSON; version 1.7.18 -- https://github.com/DaveGamble/cJSON
+** cJSON; version 1.7.19 -- https://github.com/DaveGamble/cJSON
 Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -57,7 +57,7 @@ THE SOFTWARE.
 
 ------
 
-** libcbor; version 0.12.0 -- https://github.com/PJK/libcbor
+** libcbor; version 0.13.0 -- https://github.com/PJK/libcbor
 Copyright (c) 2014-2017 Pavel Kalvoda
 
 MIT License

contrib/restricted/aws/aws-c-common/include/aws/common/allocator.h

@@ -228,6 +228,19 @@ size_t aws_small_block_allocator_page_size(struct aws_allocator *sba_allocator);
 AWS_COMMON_API
 size_t aws_small_block_allocator_page_size_available(struct aws_allocator *sba_allocator);
 
+/*
+ * Create an aligned allocator with an explicit alignment. Always align the allocated buffer with the passed-in
+ * alignment value.
+ */
+AWS_COMMON_API
+struct aws_allocator *aws_explicit_aligned_allocator_new(size_t alignment);
+
+/*
+ * Destroys a customized aligned allocator instance and frees its memory.
+ */
+AWS_COMMON_API
+void aws_explicit_aligned_allocator_destroy(struct aws_allocator *aligned_alloc);
+
 AWS_EXTERN_C_END
 AWS_POP_SANE_WARNING_LEVEL
 

contrib/restricted/aws/aws-c-common/include/aws/common/file.h

@@ -207,7 +207,66 @@ int aws_fseek(FILE *file, int64_t offset, int whence);
 AWS_COMMON_API
 int aws_file_get_length(FILE *file, int64_t *length);
 
-AWS_EXTERN_C_END
-AWS_POP_SANE_WARNING_LEVEL
+/*
+ * Read from the file using the file path with DIRECT I/O, starting at offset to fill the output_buf or to the
+ * max_read_length.
+ * Using direct IO to bypass the OS cache. Helpful when the disk I/O outperform the kernel cache.
+ * If O_DIRECT is not supported, returns AWS_ERROR_UNSUPPORTED_OPERATION.
+ * Notes:
+ * - ONLY supports linux for now and raise AWS_ERROR_UNSUPPORTED_OPERATION on all other platforms (eg: FreeBSD).
+ * - check the NOTES for O_DIRECT in https://man7.org/linux/man-pages/man2/openat.2.html
+ * - The offset, length and output_buf->buffer all need to be aligned with the page size. Otherwise,
+ *  AWS_ERROR_INVALID_ARGUMENT will be raised.
+ *
+ * @param file_path         The file path to read from.
+ * @param offset            The offset in the file to start reading from.
+ * @param max_read_length   The maximum number of bytes to read.
+ * @param output_buf        The buffer read to.
+ * @param out_actual_read   The actual number of bytes read.
+ *
+ * Returns AWS_OP_SUCCESS, or AWS_OP_ERR (after an error has been raised).
+ */
+AWS_COMMON_API
+int aws_file_path_read_from_offset_direct_io(
+    const struct aws_string *file_path,
+    uint64_t offset,
+    size_t max_read_length,
+    struct aws_byte_buf *output_buf,
+    size_t *out_actual_read);
+
+/*
+ * Read from the file using the file path, starting at offset to fill the output_buf or to the
+ * max_read_length.
+ *
+ * @param file_path         The file path to read from.
+ * @param offset            The offset in the file to start reading from.
+ * @param max_read_length   The maximum number of bytes to read.
+ * @param output_buf        The buffer read to.
+ * @param out_actual_read   The actual number of bytes read.
+ *
+ * Returns AWS_OP_SUCCESS, or AWS_OP_ERR (after an error has been raised).
+ */
+AWS_COMMON_API
+int aws_file_path_read_from_offset(
+    const struct aws_string *file_path,
+    uint64_t offset,
+    size_t max_read_length,
+    struct aws_byte_buf *output_buf,
+    size_t *out_actual_read);
+
+/*
+ * The function serve the same purpose as `aws_file_path_read_from_offset_direct_io`.
+ * Please use `aws_file_path_read_from_offset_direct_io` directly.
+ */
+AWS_COMMON_API
+int aws_file_path_read_from_offset_direct_io_with_chunk_size(
+    const struct aws_string *file_path,
+    uint64_t offset,
+    size_t max_read_length,
+    size_t max_chunk_size,
+    struct aws_byte_buf *output_buf,
+    size_t *out_actual_read);
+
+AWS_EXTERN_C_END AWS_POP_SANE_WARNING_LEVEL
 
 #endif /* AWS_COMMON_FILE_H */

contrib/restricted/aws/aws-c-common/include/aws/common/system_info.h

@@ -78,6 +78,10 @@ enum aws_platform_os aws_get_platform_build_os(void);
 AWS_COMMON_API
 size_t aws_system_info_processor_count(void);
 
+/* Returns the system page size in bytes. */
+AWS_COMMON_API
+size_t aws_system_info_page_size(void);
+
 /**
  * Returns the logical processor groupings on the system (such as multiple numa nodes).
  */

contrib/restricted/aws/aws-c-common/source/allocator.c

@@ -35,20 +35,28 @@ bool aws_allocator_is_valid(const struct aws_allocator *alloc) {
 }
 
 static void *s_aligned_malloc(struct aws_allocator *allocator, size_t size) {
-    (void)allocator;
-    /* larger allocations should be aligned so that AVX and friends can avoid
-     * the extra preamble during unaligned versions of memcpy/memset on big buffers
-     * This will also accelerate hardware CRC and SHA on ARM chips
-     *
-     * 64 byte alignment for > page allocations on 64 bit systems
-     * 32 byte alignment for > page allocations on 32 bit systems
-     * 16 byte alignment for <= page allocations on 64 bit systems
-     * 8 byte alignment for <= page allocations on 32 bit systems
-     *
-     * We use PAGE_SIZE as the boundary because we are not aware of any allocations of
-     * this size or greater that are not data buffers
-     */
-    const size_t alignment = sizeof(void *) * (size > (size_t)PAGE_SIZE ? 8 : 2);
+    size_t alignment = 0;
+    if (allocator->impl != NULL) {
+        alignment = (size_t)allocator->impl;
+    } else {
+        /**
+         * For implicit alignment.
+         * larger allocations should be aligned so that AVX and friends can avoid
+         * the extra preamble during unaligned versions of memcpy/memset on big buffers
+         * This will also accelerate hardware CRC and SHA on ARM chips
+         *
+         * 64 byte alignment for > page allocations on 64 bit systems
+         * 32 byte alignment for > page allocations on 32 bit systems
+         * 16 byte alignment for <= page allocations on 64 bit systems
+         * 8 byte alignment for <= page allocations on 32 bit systems
+         *
+         * We use PAGE_SIZE as the boundary because we are not aware of any allocations of
+         * this size or greater that are not data buffers.
+         *
+         * Unless there is a customized alignment size.
+         */
+        alignment = sizeof(void *) * (size > (size_t)PAGE_SIZE ? 8 : 2);
+    }
 #if !defined(_WIN32)
     void *result = NULL;
     int err = posix_memalign(&result, alignment, size);
@@ -146,26 +154,48 @@ static void *s_non_aligned_calloc(struct aws_allocator *allocator, size_t num, s
     return mem;
 }
 
-static struct aws_allocator default_allocator = {
+static struct aws_allocator s_default_allocator = {
     .mem_acquire = s_non_aligned_malloc,
     .mem_release = s_non_aligned_free,
     .mem_realloc = s_non_aligned_realloc,
     .mem_calloc = s_non_aligned_calloc,
 };
 
 struct aws_allocator *aws_default_allocator(void) {
-    return &default_allocator;
+    return &s_default_allocator;
 }
 
-static struct aws_allocator aligned_allocator = {
+static struct aws_allocator s_implicit_aligned_allocator = {
     .mem_acquire = s_aligned_malloc,
     .mem_release = s_aligned_free,
     .mem_realloc = s_aligned_realloc,
     .mem_calloc = s_aligned_calloc,
 };
 
 struct aws_allocator *aws_aligned_allocator(void) {
-    return &aligned_allocator;
+    return &s_implicit_aligned_allocator;
+}
+
+struct aws_allocator *aws_explicit_aligned_allocator_new(size_t customized_alignment) {
+    if (customized_alignment == 0 || (customized_alignment & (customized_alignment - 1)) != 0 ||
+        customized_alignment % sizeof(void *) != 0) {
+        /**
+         * the alignment must be a power of two and a multiple of sizeof(void *) and non-zero.
+         */
+        aws_raise_error(AWS_ERROR_INVALID_ARGUMENT);
+        return NULL;
+    }
+    struct aws_allocator *aligned_alloc = aws_mem_calloc(aws_default_allocator(), 1, sizeof(struct aws_allocator));
+    *aligned_alloc = s_implicit_aligned_allocator;
+    aligned_alloc->impl = (void *)customized_alignment;
+    return aligned_alloc;
+}
+
+void aws_explicit_aligned_allocator_destroy(struct aws_allocator *aligned_alloc) {
+    if (!aligned_alloc) {
+        return;
+    }
+    aws_mem_release(aws_default_allocator(), aligned_alloc);
 }
 
 void *aws_mem_acquire(struct aws_allocator *allocator, size_t size) {