@@ -1164,9 +1164,6 @@ impl MsgQueueManager {
11641164 if ordered_cleaning_timeout_nanos > 0 {
11651165 let max_processed_lt = self . get_max_processed_lt_from_queue_info ( ) ;
11661166
1167- let mut clean_timeout_check = 50_000_000 ;
1168- let max_clean_timeout_check = 550_000_000 ;
1169-
11701167 partial = out_msg_queue_cleaner:: hashmap_filter_ordered_by_lt_hash (
11711168 & mut queue,
11721169 max_processed_lt,
@@ -1178,15 +1175,6 @@ impl MsgQueueManager {
11781175 return Ok ( HashmapFilterResult :: Stop ) ;
11791176 }
11801177
1181- let elapsed_nanos = timer. elapsed ( ) . as_nanos ( ) as i128 ;
1182- if clean_timeout_check <= max_clean_timeout_check && elapsed_nanos >= clean_timeout_check {
1183- log:: debug!(
1184- "{}: clean_out_msg_queue: ordered cleaning time elapsed {} nanos: processed = {}, deleted = {}, skipped = {}" ,
1185- self . block_descr, elapsed_nanos, deleted + skipped, deleted, skipped,
1186- ) ;
1187- clean_timeout_check += 50_000_000 ;
1188- }
1189-
11901178 let lt = node_obj. lt ( ) ;
11911179 let mut data_and_refs = node_obj. data_and_refs ( ) ?;
11921180 let enq = MsgEnqueueStuff :: construct_from ( & mut data_and_refs, lt) ?;
@@ -1237,28 +1225,15 @@ impl MsgQueueManager {
12371225
12381226 let random_clean_timer = std:: time:: Instant :: now ( ) ;
12391227
1240- let mut clean_timeout_check = 50_000_000 ;
1241- let max_clean_timeout_check = 550_000_000 ;
1242-
12431228 queue. hashmap_filter ( |_key, mut slice| {
12441229 if block_full {
12451230 log:: debug!( "{}: BLOCK FULL (>= Soft) when random cleaning output queue, cleanup is partial" , self . block_descr) ;
12461231 partial = true ;
12471232 return Ok ( HashmapFilterResult :: Stop )
12481233 }
12491234
1250- let elapsed_nanos = random_clean_timer. elapsed ( ) . as_nanos ( ) as i128 ;
1251-
1252- if clean_timeout_check <= max_clean_timeout_check && elapsed_nanos >= clean_timeout_check {
1253- log:: debug!(
1254- "{}: clean_out_msg_queue: random cleaning time elapsed {} nanos: processed = {}, deleted = {}, skipped = {}" ,
1255- self . block_descr, elapsed_nanos,
1256- random_deleted + random_skipped, random_deleted, random_skipped,
1257- ) ;
1258- clean_timeout_check += 50_000_000 ;
1259- }
1260-
12611235 // stop when reached the time limit
1236+ let elapsed_nanos = random_clean_timer. elapsed ( ) . as_nanos ( ) as i128 ;
12621237 if elapsed_nanos >= random_cleaning_timeout_nanos {
12631238 log:: debug!(
12641239 "{}: clean_out_msg_queue: stopped random cleaning output queue because of time elapsed {} nanos >= {} nanos limit" ,
0 commit comments