fix build

Author: kbhargava-jump

.github/workflows/tests.yml

@@ -141,13 +141,6 @@ jobs:
           source /opt/${{ matrix.compiler }}/${{ matrix.compiler }}-${{ matrix.compiler-version }}/activate
           make run-test-vectors
 
-      - name: run solcap tests
-        if: ${{ matrix.run-unit-tests && matrix.test-case == 'native' }}
-        run: |
-          sudo prlimit --pid $$ --memlock=-1:-1
-          source /opt/${{ matrix.compiler }}/${{ matrix.compiler }}-${{ matrix.compiler-version }}/activate
-          DUMP=../dump make run-solcap-tests
-
       - name: run integration tests
         if: ${{ matrix.run-integration-tests }}
         run: |

config/everything.mk

@@ -463,11 +463,6 @@ LLVM_PROFILE_FILE="$(OBJDIR)/cov/raw/test_vectors-%p.profraw" \
 LOG_PATH="$(OBJDIR)/log/fd-test-vectors-report" \
 contrib/test/run_test_vectors.sh
 
-run-solcap-tests: bin unit-test
-	OBJDIR=$(OBJDIR) \
-	MACHINE=$(MACHINE) \
-	contrib/test/run_solcap_tests.sh
-
 seccomp-policies:
 	$(FIND) . -name '*.seccomppolicy' -exec $(PYTHON) contrib/codegen/generate_filters.py {} \;
 

contrib/test/run_solcap_tests.sh

@@ -1411,7 +1411,7 @@ fd_topo_configure_tile( fd_topo_tile_t * tile,
     tile->bundle.tls_cert_verify = !!config->tiles.bundle.tls_cert_verify;
 
   } else if( FD_UNLIKELY( !strcmp( tile->name, "vinyl" ) ) ) {
-  
+
   } else if( FD_UNLIKELY( !strcmp( tile->name, "captur" ) ) ) {
 
     tile->capctx.capture_start_slot = config->capture.capture_start_slot;

src/app/firedancer/topology.c

@@ -60,7 +60,7 @@
    recent_slots_per_file configuration. The default is 128 slots per
    file. The files are named recent_0.solcap, recent_1.solcap,. The
    files are rotated when the current file reaches the number of slots
-   per file. 
+   per file.
 */
 
 struct fd_capture_tile_ctx {
@@ -122,10 +122,10 @@ populate_allowed_seccomp( fd_topo_t const *      topo,
                           struct sock_filter *   out ) {
   void * scratch = fd_topo_obj_laddr( topo, tile->tile_obj_id );
   fd_capture_tile_ctx_t const * ctx = (fd_capture_tile_ctx_t const *)scratch;
-  
+
   uint solcap_fd_0 = ctx->recent_only ? (uint)ctx->recent_fds[0] : (uint)ctx->fd;
   uint solcap_fd_1 = ctx->recent_only ? (uint)ctx->recent_fds[1] : (uint)ctx->fd;
-  
+
   populate_sock_filter_policy_fd_capture_tile( out_cnt,
                                                out,
                                                (uint)fd_log_private_logfile_fd(),
@@ -141,13 +141,13 @@ populate_allowed_fds( fd_topo_t const *      topo,
                       int *                  out_fds ) {
   void * scratch = fd_topo_obj_laddr( topo, tile->tile_obj_id );
   fd_capture_tile_ctx_t const * ctx = (fd_capture_tile_ctx_t const *)scratch;
-  
+
   ulong out_cnt = 0UL;
 
   out_fds[ out_cnt++ ] = 2; /* stderr */
   if( FD_LIKELY( -1!=fd_log_private_logfile_fd() ) )
     out_fds[ out_cnt++ ] = fd_log_private_logfile_fd();
-  
+
   if( ctx->recent_only ) {
     /* In recent_only mode, allow both flip-flop file descriptors */
     if( FD_LIKELY( -1!=ctx->recent_fds[0] ) )
@@ -226,7 +226,7 @@ fd_capctx_buf_process_msg(fd_capture_tile_ctx_t * ctx,
    - SOM (Start of Message): Set on the first fragment of a message
    - EOM (End of Message):   Set on the last fragment of a message
 
-   For a single-fragment message: 
+   For a single-fragment message:
      Single Fragment:       SOM=1, EOM=1
    For a multi-fragment message:
      First fragment:        SOM=1, EOM=0
@@ -310,8 +310,8 @@ returnable_frag( fd_capture_tile_ctx_t * ctx,
         int next_fd = ctx->recent_fds[next_idx];
 
         /* The following is a series of checks to ensure the file is
-            synced and truncated correctly. This occurs via: 
-            1. Syncing the current file 
+            synced and truncated correctly. This occurs via:
+            1. Syncing the current file
             2. Syncing the next file
             3. Truncating the next file
             4. Resetting the file descriptor position to 0
@@ -321,7 +321,7 @@ returnable_frag( fd_capture_tile_ctx_t * ctx,
         FD_TEST( fsync( next_fd ) == 0 );
         FD_TEST( ftruncate( next_fd, 0L ) == 0 );
         FD_TEST( lseek( next_fd, 0L, SEEK_SET ) == 0L );
-        
+
         fd_solcap_writer_init( ctx->capture_ctx->capture, next_fd );
         ctx->recent_current_idx = next_idx;
         ctx->recent_file_start_slot = msg_hdr->slot;
@@ -386,41 +386,41 @@ privileged_init( fd_topo_t *      topo,
     /* recent_only=1: Ensure path is a directory, create if not exists */
     if( stat_result != 0 ) {
       if( FD_UNLIKELY( mkdir(tile->capctx.solcap_capture, 0755) != 0 ) ) {
-        FD_LOG_ERR(( "solcap_recent_only=1 but could not create directory: %s (%i-%s)", 
+        FD_LOG_ERR(( "solcap_recent_only=1 but could not create directory: %s (%i-%s)",
                    tile->capctx.solcap_capture, errno, strerror(errno) ));
       }
     } else if( FD_UNLIKELY( !S_ISDIR(path_stat.st_mode) ) ) {
       FD_LOG_ERR(( "solcap_recent_only=1 but path is not a directory: %s", tile->capctx.solcap_capture ));
     }
-    
+
     ctx->recent_current_idx = 0;
     ctx->recent_file_start_slot = 0UL;  /* Will be set on first fragment */
-    
+
     for( ulong i = 0; i < 2; i++ ) {
       char filepath[PATH_MAX];
       int ret = snprintf( filepath, PATH_MAX, "%s/recent_%lu.solcap", tile->capctx.solcap_capture, i );
       if( FD_UNLIKELY( ret<0 || ret>=PATH_MAX ) ) {
         FD_LOG_ERR(( "snprintf failed or path too long for recent file %lu", i ));
       }
-      
+
       ctx->recent_fds[i] = open( filepath, O_RDWR | O_CREAT | O_TRUNC, 0644 );
       if( FD_UNLIKELY( ctx->recent_fds[i] == -1 ) ) {
-        FD_LOG_ERR(( "failed to open or create solcap recent file %s (%i-%s)", 
+        FD_LOG_ERR(( "failed to open or create solcap recent file %s (%i-%s)",
                      filepath, errno, strerror(errno) ));
       }
     }
-    
+
     ctx->fd = ctx->recent_fds[0];
-    
+
   } else {
     /* recent_only=0: Validate that path is a file*/
     if( FD_UNLIKELY( stat_result == 0 && S_ISDIR(path_stat.st_mode) ) ) {
       FD_LOG_ERR(( "solcap_recent_only=0 but path is a directory: %s (should be a file path)", tile->capctx.solcap_capture ));
     }
-    
+
     ctx->fd = open( tile->capctx.solcap_capture, O_RDWR | O_CREAT | O_TRUNC, 0644 );
     if( FD_UNLIKELY( ctx->fd == -1 ) ) {
-      FD_LOG_ERR(( "failed to open or create solcap capture file %s (%i-%s)", 
+      FD_LOG_ERR(( "failed to open or create solcap capture file %s (%i-%s)",
                    tile->capctx.solcap_capture, errno, strerror(errno) ));
     }
   }

src/discof/capture/fd_capture_tile.c

@@ -22,7 +22,7 @@ struct fd_exec_txn_exec_msg {
   ulong      txn_idx;
   fd_txn_p_t txn;
 
-  /* Used currently by solcap to maintain ordering of messages 
+  /* Used currently by solcap to maintain ordering of messages
      this is a hack for v2.0, will change to using txn sigs eventually */
   ulong      capture_txn_idx;
 };

src/discof/replay/fd_exec.h

@@ -45,9 +45,9 @@ sol_compat_setup_runner( fd_solfuzz_runner_options_t const * options ) {
     FD_LOG_NOTICE(( "Logging to solcap file %s", solcap_path ));
 
     void * solcap_mem = fd_wksp_alloc_laddr( runner->wksp, fd_solcap_writer_align(), fd_solcap_writer_footprint(), 1UL );
-    runner->solcap = fd_solcap_writer_new( solcap_mem );
+    runner->solcap = (fd_solcap_writer_t *)solcap_mem;
     FD_TEST( runner->solcap );
-    FD_TEST( fd_solcap_writer_init( solcap_mem, fd ) );
+    FD_TEST( fd_solcap_writer_init( runner->solcap, fd ) );
   }
 
   return runner;
@@ -57,7 +57,7 @@ static void
 sol_compat_cleanup_runner( fd_solfuzz_runner_t * runner ) {
   /* Cleanup test runner */
   if( runner->solcap ) {
-    fd_wksp_free_laddr( fd_solcap_writer_delete( runner->solcap ) );
+    fd_wksp_free_laddr( runner->solcap );
     runner->solcap = NULL;
     if( runner->solcap_file ) {
       close( (int)(ulong)runner->solcap_file );