Merge branch 'master' of https://github.com/aeron-io/aeron

aeron-io · Feb 11, 2025 · 4479df2 · 4479df2
2 parents b44ce56 + b8df4ff
commit 4479df2
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 195 deletions.
diff --git a/.github/workflows/ci-low-cadence.yml b/.github/workflows/ci-low-cadence.yml
@@ -7,10 +7,10 @@ on:
     types: run-slow-tests
   schedule:
     - cron: '0 0,12 * * *'
-#  push:
-#    branches:
-#      - master
-#      - 'release/**'
+  push:
+    branches:
+      - master
+      - 'release/**'
   pull_request:
     types: [opened, synchronize]
     branches:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,10 +5,10 @@ on:
   workflow_dispatch:
   repository_dispatch:
     types: run-commit-tests
-#  push:
-#    branches:
-#      - master
-#      - 'release/**'
+  push:
+    branches:
+      - master
+      - 'release/**'
   pull_request:
     types: [opened, synchronize]
     branches:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -5,10 +5,10 @@ on:
   workflow_dispatch:
   repository_dispatch:
     types: run-commit-tests
-#  push:
-#    branches:
-#      - master
-#      - release/**
+  push:
+    branches:
+      - master
+      - release/**
   pull_request:
     types: [opened, synchronize]
     branches:

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
diff --git a/aeron-client/src/main/cpp/concurrent/Atomic64.h b/aeron-client/src/main/cpp/concurrent/Atomic64.h
@@ -18,12 +18,10 @@
 
 #include "util/Platform.h"
 
-#if defined(AERON_COMPILER_GCC)
-    #if defined(AERON_CPU_X64)
-        #include "concurrent/atomic/Atomic64_gcc_x86_64.h"
-    #else
-        #include "concurrent/atomic/Atomic64_gcc_cpp11.h"
-    #endif
+#if defined(AERON_COMPILER_GCC) && defined(AERON_CPU_X64)
+    #include "concurrent/atomic/Atomic64_gcc_x86_64.h"
+#elif defined(AERON_COMPILER_GCC) && defined(AERON_CPU_ARM)
+    #include "concurrent/atomic/Atomic64_gcc_cpp11.h"
 #elif defined(AERON_COMPILER_MSVC) && defined(AERON_CPU_X64)
     #include "concurrent/atomic/Atomic64_msvc.h"
 #else

diff --git a/aeron-client/src/main/cpp/util/Platform.h b/aeron-client/src/main/cpp/util/Platform.h
@@ -26,7 +26,6 @@
 
     #if defined(_M_X64)
         #define AERON_CPU_X64 1
-
     #else
         #error Unsupported CPU!
     #endif
@@ -42,6 +41,13 @@
         #define AERON_CPU_X64 1
     #endif
 
+    #if defined(__aarch64__)
+        #define AERON_CPU_ARM 1
+        #if defined(__STDC_NO_ATOMICS__)
+            #error C11 atomics are required to compile for aarch64!
+        #endif
+    #endif
+
 #else
     #error Unsupported compiler!
 #endif

diff --git a/aeron-client/src/main/cpp_wrapper/concurrent/Atomic64.h b/aeron-client/src/main/cpp_wrapper/concurrent/Atomic64.h
@@ -18,12 +18,10 @@
 
 #include "util/Platform.h"
 
-#if defined(AERON_COMPILER_GCC)
-    #if defined(AERON_CPU_X64)
-        #include "concurrent/atomic/Atomic64_gcc_x86_64.h"
-    #else
-        #include "concurrent/atomic/Atomic64_gcc_cpp11.h"
-    #endif
+#if defined(AERON_COMPILER_GCC) && defined(AERON_CPU_X64)
+    #include "concurrent/atomic/Atomic64_gcc_x86_64.h"
+#elif defined(AERON_COMPILER_GCC) && defined(AERON_CPU_ARM)
+    #include "concurrent/atomic/Atomic64_gcc_cpp11.h"
 #elif defined(AERON_COMPILER_MSVC) && defined(AERON_CPU_X64)
     #include "concurrent/atomic/Atomic64_msvc.h"
 #else

diff --git a/aeron-client/src/main/cpp_wrapper/concurrent/logbuffer/LogBufferDescriptor.h b/aeron-client/src/main/cpp_wrapper/concurrent/logbuffer/LogBufferDescriptor.h
@@ -29,8 +29,6 @@ namespace aeron { namespace concurrent { namespace logbuffer { namespace LogBuff
 
 const std::int32_t TERM_MIN_LENGTH = 64 * 1024;
 const std::int32_t TERM_MAX_LENGTH = 1024 * 1024 * 1024;
-const std::int32_t AERON_PAGE_MIN_SIZE = 4 * 1024;
-const std::int32_t AERON_PAGE_MAX_SIZE = 1024 * 1024 * 1024;
 
 #if defined(__GNUC__) || _MSC_VER >= 1900
 static constexpr const int PARTITION_COUNT = 3;

diff --git a/aeron-client/src/main/cpp_wrapper/util/Platform.h b/aeron-client/src/main/cpp_wrapper/util/Platform.h
@@ -26,7 +26,6 @@
 
     #if defined(_M_X64)
         #define AERON_CPU_X64 1
-
     #else
         #error Unsupported CPU!
     #endif
@@ -42,6 +41,13 @@
         #define AERON_CPU_X64 1
     #endif
 
+    #if defined(__aarch64__)
+        #define AERON_CPU_ARM 1
+        #if defined(__STDC_NO_ATOMICS__)
+            #error C11 atomics are required to compile for aarch64!
+        #endif
+    #endif
+
 #else
     #error Unsupported compiler!
 #endif

diff --git a/aeron-driver/src/main/c/agent/aeron_driver_agent.c b/aeron-driver/src/main/c/agent/aeron_driver_agent.c
@@ -1470,7 +1470,7 @@ static const char *dissect_cmd_in(int64_t cmd_id, const void *message, size_t le
             snprintf(
                 buffer,
                 sizeof(buffer) - 1,
-                "streamId=%d clientId=%" PRId64 " correlationId=%" PRId64 " channel=%*.s",
+                "streamId=%d clientId=%" PRId64 " correlationId=%" PRId64 " channel=%.*s",
                 command->stream_id,
                 command->correlated.client_id,
                 command->correlated.correlation_id,

diff --git a/aeron-driver/src/main/c/media/aeron_udp_channel_transport.c b/aeron-driver/src/main/c/media/aeron_udp_channel_transport.c
@@ -102,7 +102,7 @@ int aeron_udp_channel_transport_init(
     {
         transport->interceptor_clientds[i] = NULL;
     }
-    
+
     if (NULL == params)
     {
         AERON_SET_ERR(EINVAL, "%s", "channel transport params is NULL");
@@ -584,12 +584,14 @@ static int aeron_udp_channel_transport_sendv(
     struct mmsghdr msg[AERON_NETWORK_PUBLICATION_MAX_MESSAGES_PER_SEND];
     size_t msg_i;
 
+    size_t msg_namelen = address == NULL ? 0 : AERON_ADDR_LEN(address);
+
     for (msg_i = 0; msg_i < iov_length && msg_i < AERON_NETWORK_PUBLICATION_MAX_MESSAGES_PER_SEND; msg_i++)
     {
         msg[msg_i].msg_hdr.msg_control = NULL;
         msg[msg_i].msg_hdr.msg_controllen = 0;
         msg[msg_i].msg_hdr.msg_name = address;
-        msg[msg_i].msg_hdr.msg_namelen = AERON_ADDR_LEN(address);
+        msg[msg_i].msg_hdr.msg_namelen = msg_namelen;
         msg[msg_i].msg_hdr.msg_flags = 0;
         msg[msg_i].msg_hdr.msg_iov = &iov[msg_i];
         msg[msg_i].msg_hdr.msg_iovlen = 1;
@@ -634,9 +636,16 @@ int aeron_udp_channel_transport_send(
     int64_t *bytes_sent)
 {
 #if defined(HAVE_SENDMMSG)
-    if (1 == iov_length && NULL != transport->connected_address)
+    if (NULL != transport->connected_address)
     {
-        return aeron_udp_channel_transport_send_connected(transport, iov, bytes_sent);
+        if (1 == iov_length)
+        {
+            return aeron_udp_channel_transport_send_connected(transport, iov, bytes_sent);
+        }
+        else
+        {
+            return aeron_udp_channel_transport_sendv(transport, NULL, iov, iov_length, bytes_sent);
+        }
     }
     else
     {

diff --git a/build.gradle b/build.gradle
@@ -1390,6 +1390,7 @@ tasks.register('copyTestLogs', Copy) {
     include '/var/coredump/core*'
     include '**/*.log'
     include '**/*.tlog'
+    include '**/*.PML'
     include '**/build/reports/tests/**'
     include '**/build/test-results/**/*'
     include 'LICENSE'

diff --git a/cppbuild/debug.ps1 b/cppbuild/debug.ps1