Merge remote-tracking branch 'origin/master'

aeron-io · Jun 25, 2022 · 2307c57 · 2307c57
2 parents 70c244b + 5adc4ce
commit 2307c57
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/aeron-client/src/main/c/aeron_counters.h b/aeron-client/src/main/c/aeron_counters.h
@@ -62,7 +62,7 @@
 
 // Name Resolver 15-16
 
-#define AERON_COUNTER_MIN_FC_NUM_RECEIVERS_TYPE_ID (17)
+#define AERON_COUNTER_FC_NUM_RECEIVERS_TYPE_ID (17)
 
 #define AERON_COUNTER_CHANNEL_MDC_NUM_DESTINATIONS_NAME "mdc-num-dest"
 #define AERON_COUNTER_CHANNEL_NUM_DESTINATIONS_TYPE_ID (18)

diff --git a/aeron-driver/src/main/c/aeron_min_flow_control.c b/aeron-driver/src/main/c/aeron_min_flow_control.c
@@ -376,7 +376,7 @@ int aeron_tagged_flow_control_strategy_allocate_receiver_counter(
     const int32_t counter_id = aeron_stream_counter_allocate(
         counters_manager,
         AERON_MIN_FLOW_CONTROL_RECEIVERS_COUNTER_NAME,
-        AERON_COUNTER_MIN_FC_NUM_RECEIVERS_TYPE_ID,
+        AERON_COUNTER_FC_NUM_RECEIVERS_TYPE_ID,
         registration_id,
         session_id,
         stream_id,

diff --git a/aeron-driver/src/main/c/media/aeron_send_channel_endpoint.c b/aeron-driver/src/main/c/media/aeron_send_channel_endpoint.c
@@ -425,16 +425,6 @@ void aeron_send_channel_endpoint_on_status_message(
     if (NULL != endpoint->destination_tracker)
     {
         aeron_udp_destination_tracker_on_status_message(endpoint->destination_tracker, buffer, length, addr);
-
-//        if (0 == sm_header->session_id &&
-//            0 == sm_header->stream_id &&
-//            (sm_header->frame_header.flags & AERON_STATUS_MESSAGE_HEADER_SEND_SETUP_FLAG))
-//        {
-//            aeron_int64_to_ptr_hash_map_for_each(
-//                &endpoint->publication_dispatch_map,
-//                aeron_send_channel_endpoint_publication_trigger_send_setup_frame,
-//                endpoint);
-//        }
     }
 
     if (NULL != publication)