bundle: improve busy reporting

Author: riptl

src/disco/bundle/fd_bundle_client.c

@@ -256,13 +256,13 @@ fd_bundle_client_step( fd_bundle_tile_t * ctx,
       FD_LOG_INFO(( "Bundle gRPC connect attempt failed (%i-%s)", connect_err, fd_io_strerror( connect_err ) ));
       fd_bundle_client_reset( ctx );
       ctx->metrics.transport_fail_cnt++;
-      *charge_busy =1 ;
+      *charge_busy = 1;
       return;
     }
     if( pfds[0].revents & POLLOUT ) {
       FD_LOG_DEBUG(( "Bundle TCP socket connected" ));
       ctx->tcp_sock_connected = 1;
-      *charge_busy =1 ;
+      *charge_busy = 1;
       return;
     }
     return;
@@ -301,33 +301,34 @@ fd_bundle_client_step( fd_bundle_tile_t * ctx,
   }
   if( FD_UNLIKELY( ctx->auther.state!=FD_BUNDLE_AUTH_STATE_DONE_WAIT ) ) return;
 
-  *charge_busy = 1;
-
   /* Request block builder info */
   if( FD_UNLIKELY( !ctx->builder_info_live && !ctx->builder_info_wait ) ) {
     fd_bundle_client_request_builder_info( ctx );
-    return;
+    goto busy_exit;
   }
 
   /* Subscribe to packets */
   if( FD_UNLIKELY( !ctx->packet_subscription_live && !ctx->packet_subscription_wait ) ) {
     fd_bundle_client_subscribe_packets( ctx );
-    return;
+    goto busy_exit;
   }
 
   /* Subscribe to bundles */
   if( FD_UNLIKELY( !ctx->bundle_subscription_live && !ctx->bundle_subscription_wait ) ) {
     fd_bundle_client_subscribe_bundles( ctx );
-    return;
+    goto busy_exit;
   }
 
   /* Send a PING */
   if( FD_UNLIKELY( fd_bundle_client_keepalive_due( ctx, io_ts ) ) ) {
     fd_bundle_client_send_ping( ctx );
-    return;
+    goto busy_exit;
   }
 
-  *charge_busy = 0;
+  return;
+busy_exit:
+  *charge_busy = 1;
+  return;
 }
 
 void

src/disco/bundle/fd_bundle_tile.c

@@ -477,8 +477,9 @@ unprivileged_init( fd_topo_t *      topo,
   }
 
   /* Set socket receive buffer size */
-  ulong so_rcvbuf = tile->bundle.buf_sz + 65536UL;
-  if( so_rcvbuf > INT_MAX ) FD_LOG_ERR(( "Invalid [development.bundle.buffer_size_kib]: too large" ));
+  ulong so_rcvbuf = tile->bundle.buf_sz;
+  if( FD_UNLIKELY( so_rcvbuf < 2048UL  ) ) FD_LOG_ERR(( "Invalid [development.bundle.buffer_size_kib]: too small" ));
+  if( FD_UNLIKELY( so_rcvbuf > INT_MAX ) ) FD_LOG_ERR(( "Invalid [development.bundle.buffer_size_kib]: too large" ));
   ctx->so_rcvbuf = (int)so_rcvbuf;
 
   /* Set idle ping timer */

src/waltz/grpc/fd_grpc_client.c

@@ -194,29 +194,37 @@ fd_grpc_client_rxtx_socket( fd_grpc_client_t * client,
                             int                sock_fd,
                             int *              charge_busy ) {
   fd_h2_conn_t * conn = client->conn;
+  ulong const frame_rx_lo_0 = client->frame_rx->lo_off;
+  ulong const frame_rx_hi_0 = client->frame_rx->hi_off;
+  ulong const frame_tx_lo_1 = client->frame_tx->lo_off;
+  ulong const frame_tx_hi_1 = client->frame_tx->hi_off;
 
-  ulong frame_rx_0 = client->frame_rx->hi_off;
   int rx_err = fd_h2_rbuf_recvmsg( client->frame_rx, sock_fd, MSG_NOSIGNAL|MSG_DONTWAIT );
   if( FD_UNLIKELY( rx_err ) ) {
     FD_LOG_INFO(( "Disconnected: recvmsg error (%i-%s)", rx_err, fd_io_strerror( rx_err ) ));
     return 0;
   }
-  ulong frame_rx_1 = client->frame_rx->hi_off;
-  if( frame_rx_0!=frame_rx_1 ) *charge_busy = 1;
 
   if( FD_UNLIKELY( conn->flags ) ) fd_h2_tx_control( conn, client->frame_tx, &fd_grpc_client_h2_callbacks );
   fd_h2_rx( conn, client->frame_rx, client->frame_tx, client->frame_scratch, FD_GRPC_CLIENT_BUFSZ, &fd_grpc_client_h2_callbacks );
   fd_grpc_client_send_stream_window_updates( client );
 
-  ulong frame_tx_0 = client->frame_tx->lo_off;
   int tx_err = fd_h2_rbuf_sendmsg( client->frame_tx, sock_fd, MSG_NOSIGNAL|MSG_DONTWAIT );
   if( FD_UNLIKELY( tx_err ) ) {
     FD_LOG_WARNING(( "fd_h2_rbuf_sendmsg failed (%i-%s)", tx_err, fd_io_strerror( tx_err ) ));
     return 0;
   }
-  ulong frame_tx_1 = client->frame_tx->lo_off;
 
-  if( frame_rx_0!=frame_rx_1 || frame_tx_0!=frame_tx_1 ) *charge_busy = 1;
+  ulong const frame_rx_lo_1 = client->frame_rx->lo_off;
+  ulong const frame_rx_hi_1 = client->frame_rx->hi_off;
+  ulong const frame_tx_lo_0 = client->frame_tx->lo_off;
+  ulong const frame_tx_hi_0 = client->frame_tx->hi_off;
+
+  if( frame_rx_lo_0!=frame_rx_lo_1 || frame_rx_hi_0!=frame_rx_hi_1 ||
+      frame_tx_lo_0!=frame_tx_lo_1 || frame_tx_hi_0!=frame_tx_hi_1 ) {
+    *charge_busy = 1;
+  }
+
   return 1;
 }