blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removes duplicate connection-table arguments (#31172) 

prune_unstaked_connections_and_add_new_connection unnecessarily receives both
MutexGuard<ConnectionTable> and Arc<Mutex<ConnectionTable>>.
This commit is contained in:
behzad nouri 2023-04-12 20:39:29 +00:00 committed by GitHub
parent e39f7a318d
commit 8556a40ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
streamer/src/nonblocking/quic.rs
View File

@ -178,7 +178,7 @@ pub async fn run_server(
} }
fn prune_unstaked_connection_table( fn prune_unstaked_connection_table(
unstaked_connection_table: &mut MutexGuard<ConnectionTable>, unstaked_connection_table: &mut ConnectionTable,
max_unstaked_connections: usize, max_unstaked_connections: usize,
stats: Arc<StreamStats>, stats: Arc<StreamStats>,
) { ) {
@ -374,7 +374,6 @@ fn handle_and_cache_new_connection(
fn prune_unstaked_connections_and_add_new_connection( fn prune_unstaked_connections_and_add_new_connection(
connection: Connection, connection: Connection,
mut connection_table_l: MutexGuard<ConnectionTable>,
connection_table: Arc<Mutex<ConnectionTable>>, connection_table: Arc<Mutex<ConnectionTable>>,
max_connections: usize, max_connections: usize,
params: &NewConnectionHandlerParams, params: &NewConnectionHandlerParams,
@ -382,11 +381,13 @@ fn prune_unstaked_connections_and_add_new_connection(
) -> Result<(), ConnectionHandlerError> { ) -> Result<(), ConnectionHandlerError> {
let stats = params.stats.clone(); let stats = params.stats.clone();
if max_connections > 0 { if max_connections > 0 {
prune_unstaked_connection_table(&mut connection_table_l, max_connections, stats); let connection_table_clone = connection_table.clone();
let mut connection_table = connection_table.lock().unwrap();
prune_unstaked_connection_table(&mut connection_table, max_connections, stats);
handle_and_cache_new_connection( handle_and_cache_new_connection(
connection, connection,
connection_table_l,
connection_table, connection_table,
connection_table_clone,
params, params,
wait_for_chunk_timeout, wait_for_chunk_timeout,
) )
@ -509,7 +510,6 @@ async fn setup_connection(
// connection from the unstaked connection table. // connection from the unstaked connection table.
if let Ok(()) = prune_unstaked_connections_and_add_new_connection( if let Ok(()) = prune_unstaked_connections_and_add_new_connection(
new_connection, new_connection,
unstaked_connection_table.lock().unwrap(),
unstaked_connection_table.clone(), unstaked_connection_table.clone(),
max_unstaked_connections, max_unstaked_connections,
&params, &params,
@ -529,7 +529,6 @@ async fn setup_connection(
} }
} else if let Ok(()) = prune_unstaked_connections_and_add_new_connection( } else if let Ok(()) = prune_unstaked_connections_and_add_new_connection(
new_connection, new_connection,
unstaked_connection_table.lock().unwrap(),
unstaked_connection_table.clone(), unstaked_connection_table.clone(),
max_unstaked_connections, max_unstaked_connections,
&params, &params,