work

Author: asiegel-jt

src/discof/rpcserver/fd_rpc_history.c

@@ -95,9 +95,7 @@ typedef struct fd_rpc_reasm_map_elem fd_rpc_reasm_map_elem_t;
 #define FD_REASM_MAP_COL_HEIGHT (128UL)
 struct fd_rpc_reasm_map {
   struct fd_rpc_reasm_map_column {
-    ulong max_idx;   /* The max shred index set in this column + 1 */
-    ulong used_cnt;  /* The number of shreds received in this column */
-    uchar end_found; /* Whether the last slice of the slot has been found */
+    ulong ele_cnt;  /* The number of shreds received in this column */    uchar end_found; /* Whether the last slice of the slot has been found */
     fd_rpc_reasm_map_elem_t * ele[FD_REASM_MAP_COL_HEIGHT];
   } cols[FD_REASM_MAP_COL_CNT];
   ulong head; /* Next open column */
@@ -185,8 +183,8 @@ fd_rpc_history_debug(fd_rpc_history_t * hist) {
   for( ulong slot = reasm_map->tail; slot < reasm_map->head; slot++ ) {
     ulong col_idx = slot & (FD_REASM_MAP_COL_CNT - 1);
     struct fd_rpc_reasm_map_column * col = &reasm_map->cols[col_idx];
-    FD_LOG_NOTICE(( "slot %lu: %lu fecs, %lu max, %d end_found", slot, col->used_cnt, col->max_idx, (int)col->end_found ));
-    tot_cnt += col->used_cnt;
+    FD_LOG_NOTICE(( "slot %lu: %lu fecs", slot, col->ele_cnt ));
+    tot_cnt += col->ele_cnt;
   }
   FD_LOG_NOTICE(( "%lu head, %lu tail, %lu total fecs, %lu total blocks",
                   reasm_map->head, reasm_map->tail, tot_cnt, reasm_map->head - reasm_map->tail ));
@@ -269,13 +267,13 @@ fd_rpc_history_process_column(fd_rpc_history_t * hist, struct fd_rpc_reasm_map_c
     /* Assemble the block */
     ulong slot = fec->slot;
     ulong blk_sz = 0;
-    for( ulong i = 0; i < col->max_idx; i++ ) {
+    for( ulong i = 0; i < col->ele_cnt; i++ ) {
       fd_rpc_reasm_map_elem_t * ele = col->ele[i];
       blk_sz += ele->data.data_sz;
     }
     uchar * blk_data = fd_spad_alloc( hist->spad, alignof(ulong), blk_sz );
     ulong blk_off = 0;
-    for( ulong i = 0; i < col->max_idx; i++ ) {
+    for( ulong i = 0; i < col->ele_cnt; i++ ) {
       fd_rpc_reasm_map_elem_t * ele = col->ele[i];
       fd_memcpy( blk_data + blk_off, ele->data.data, ele->data.data_sz );
       blk_off += ele->data.data_sz;
@@ -304,16 +302,14 @@ static void
 fd_rpc_history_discard_column(fd_rpc_reasm_map_t * reasm_map, fd_rpc_reasm_map_elem_t * reasm_pool, ulong slot) {
   ulong col_idx = slot & (FD_REASM_MAP_COL_CNT - 1);
   struct fd_rpc_reasm_map_column * col = &reasm_map->cols[col_idx];
-  for( ulong i = 0; i < col->max_idx; i++ ) {
+  for( ulong i = 0; i < col->ele_cnt; i++ ) {
     fd_rpc_reasm_map_elem_t * ele = col->ele[i];
     if( ele ) {
       fd_rpc_reasm_pool_ele_release( reasm_pool, ele );
       col->ele[i] = NULL;
     }
   }
-  col->max_idx = 0;
-  col->used_cnt = 0;
-  col->end_found = 0;
+  col->ele_cnt = 0;
 }
 
 void
@@ -336,24 +332,16 @@ fd_rpc_history_save_fec(fd_rpc_history_t * hist, fd_store_t * store, fd_reasm_fe
   while( fec_msg->slot >= reasm_map->head ) {
     ulong col_idx = (reasm_map->head++) & (FD_REASM_MAP_COL_CNT - 1);
     struct fd_rpc_reasm_map_column * col = &reasm_map->cols[col_idx];
-    col->max_idx = 0;
-    col->used_cnt = 0;
-    col->end_found = 0;
+    col->ele_cnt = 0;
   }
   FD_TEST( fec_msg->slot >= reasm_map->tail && fec_msg->slot < reasm_map->head && reasm_map->head - reasm_map->tail <= FD_REASM_MAP_COL_CNT );
 
   ulong col_idx = fec_msg->slot & (FD_REASM_MAP_COL_CNT - 1);
   struct fd_rpc_reasm_map_column * col = &reasm_map->cols[col_idx];
 
-  FD_TEST( fec_msg->fec_set_idx < FD_REASM_MAP_COL_HEIGHT );
+  FD_TEST( col->ele_cnt < FD_REASM_MAP_COL_HEIGHT );
 
-  /* See if we've already received this fec */
-  if( col->max_idx > fec_msg->fec_set_idx && col->ele[fec_msg->fec_set_idx] != NULL ) return;
-  while( col->max_idx <= fec_msg->fec_set_idx ) {
-    col->ele[col->max_idx++] = NULL;
-  }
-
-  /* Acquire space for the shred. If we've run out of space, discard the oldest column */
+  /* Acquire space for the fec data. If we've run out of space, discard the oldest column */
   fd_rpc_reasm_map_elem_t * ele = NULL;
   do {
     ele = fd_rpc_reasm_pool_ele_acquire( reasm_pool );
@@ -364,11 +352,9 @@ fd_rpc_history_save_fec(fd_rpc_history_t * hist, fd_store_t * store, fd_reasm_fe
 
   ulong data_sz = ele->data.data_sz = fec_p->data_sz;
   fd_memcpy( ele->data.data, fec_p->data, data_sz );
-  col->ele[fec_msg->fec_set_idx] = ele;
-  col->used_cnt++;
-  if( FD_UNLIKELY( fec_msg->slot_complete ) ) col->end_found = 1;
+  col->ele[col->ele_cnt++] = ele;
 
-  if( col->end_found && col->used_cnt == col->max_idx ) {
+  if( fec_msg->slot_complete ) {
     /* We've received all the shreds for this slot. Process it. */
     fd_rpc_history_process_column( hist, col, fec_msg );
     fd_rpc_history_discard_column( reasm_map, reasm_pool, fec_msg->slot );