tools: save the modified content more frequently in v reduce, fix timeout leaks (#24405)

Eliyaan · web-flow · commit cf36360023de · 2025-05-04T12:24:05.000+03:00
diff --git a/cmd/tools/vreduce.v b/cmd/tools/vreduce.v
@@ -106,6 +106,7 @@ fn string_reproduces(file_content string, pattern string, command string, file_p
 	} else {
 		split := command.split(' ')
 		mut prog := os.new_process(split[0])
+		prog.use_pgroup = true
 		prog.set_args(split[1..])
 		prog.set_redirect_stdio()
 		prog.run()
@@ -129,14 +130,21 @@ fn string_reproduces(file_content string, pattern string, command string, file_p
 						b = true
 					}
 				}
+				if sw.elapsed().seconds() > f32(timeout) {
+					break
+				}
 			}
 			if sw.elapsed().seconds() > f32(timeout) {
 				if debug {
 					println('Timeout')
 				}
+				prog.signal_pgkill()
+				prog.close()
+				prog.wait()
 				return false
 			}
 		}
+		prog.signal_pgkill()
 		prog.close()
 		prog.wait()
 	}
@@ -304,6 +312,7 @@ fn reduce_scope(content string, error_msg string, command string, do_fmt bool, f
 	log.info('Cleaning the scopes')
 	mut text_code := content
 	mut outer_modified_smth := true
+	rpdc_file_path := 'rpdc_${os.file_name(file_path)#[..-2]}.v'
 	for outer_modified_smth {
 		sc = parse(text_code)
 		outer_modified_smth = false
@@ -341,10 +350,17 @@ fn reduce_scope(content string, error_msg string, command string, do_fmt bool, f
 					}
 				}
 			}
-		}
-		println('')
+			println('')
 
-		text_code = create_code(sc)
+			text_code = create_code(sc)
+			os.write_file(rpdc_file_path, text_code) or { panic(err) }
+			if do_fmt {
+				os.execute('v fmt -w ${rpdc_file_path}')
+				final_content := os.read_file(rpdc_file_path) or { panic(err) }
+				show_code_stats(final_content, label: 'Code size after formatting')
+			}
+			println('The WIP reduced code is now in ${rpdc_file_path}')
+		}
 
 		log.info('Processing remaining lines')
 		split_code := text_code.split_into_lines() // dont forget to add back the \n
@@ -413,14 +429,20 @@ fn reduce_scope(content string, error_msg string, command string, do_fmt bool, f
 					}
 				}
 			}
+			println('')
+			text_code = create_code(line_tree)
+			os.write_file(rpdc_file_path, text_code) or { panic(err) }
+			if do_fmt {
+				os.execute('v fmt -w ${rpdc_file_path}')
+				final_content := os.read_file(rpdc_file_path) or { panic(err) }
+				show_code_stats(final_content, label: 'Code size after formatting')
+			}
+			println('The WIP reduced code is now in ${rpdc_file_path}')
 		}
-		println('')
-		text_code = create_code(line_tree)
 	}
 
 	warn_on_false(string_reproduces(text_code, error_msg, command, file_path, true, timeout),
 		'string_reproduces', @LOCATION)
-	rpdc_file_path := 'rpdc_${os.file_name(file_path)#[..-2]}.v'
 	os.write_file(rpdc_file_path, text_code) or { panic(err) }
 	if do_fmt {
 		os.execute('v fmt -w ${rpdc_file_path}')

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ fn string_reproduces(file_content string, pattern string, command string, file_p`
`106`	`106`	`} else {`
`107`	`107`	`split := command.split(' ')`
`108`	`108`	`mut prog := os.new_process(split[0])`
	`109`	`+ prog.use_pgroup = true`
`109`	`110`	`prog.set_args(split[1..])`
`110`	`111`	`prog.set_redirect_stdio()`
`111`	`112`	`prog.run()`
`@@ -129,14 +130,21 @@ fn string_reproduces(file_content string, pattern string, command string, file_p`
`129`	`130`	`b = true`
`130`	`131`	`}`
`131`	`132`	`}`
	`133`	`+ if sw.elapsed().seconds() > f32(timeout) {`
	`134`	`+ break`
	`135`	`+ }`
`132`	`136`	`}`
`133`	`137`	`if sw.elapsed().seconds() > f32(timeout) {`
`134`	`138`	`if debug {`
`135`	`139`	`println('Timeout')`
`136`	`140`	`}`
	`141`	`+ prog.signal_pgkill()`
	`142`	`+ prog.close()`
	`143`	`+ prog.wait()`
`137`	`144`	`return false`
`138`	`145`	`}`
`139`	`146`	`}`
	`147`	`+ prog.signal_pgkill()`
`140`	`148`	`prog.close()`
`141`	`149`	`prog.wait()`
`142`	`150`	`}`
`@@ -304,6 +312,7 @@ fn reduce_scope(content string, error_msg string, command string, do_fmt bool, f`
`304`	`312`	`log.info('Cleaning the scopes')`
`305`	`313`	`mut text_code := content`
`306`	`314`	`mut outer_modified_smth := true`
	`315`	`+ rpdc_file_path := 'rpdc_${os.file_name(file_path)#[..-2]}.v'`
`307`	`316`	`for outer_modified_smth {`
`308`	`317`	`sc = parse(text_code)`
`309`	`318`	`outer_modified_smth = false`
`@@ -341,10 +350,17 @@ fn reduce_scope(content string, error_msg string, command string, do_fmt bool, f`
`341`	`350`	`}`
`342`	`351`	`}`
`343`	`352`	`}`
`344`		`- }`
`345`		`- println('')`
	`353`	`+ println('')`
`346`	`354`
`347`		`- text_code = create_code(sc)`
	`355`	`+ text_code = create_code(sc)`
	`356`	`+ os.write_file(rpdc_file_path, text_code) or { panic(err) }`
	`357`	`+ if do_fmt {`
	`358`	`+ os.execute('v fmt -w ${rpdc_file_path}')`
	`359`	`+ final_content := os.read_file(rpdc_file_path) or { panic(err) }`
	`360`	`+ show_code_stats(final_content, label: 'Code size after formatting')`
	`361`	`+ }`
	`362`	`+ println('The WIP reduced code is now in ${rpdc_file_path}')`
	`363`	`+ }`
`348`	`364`
`349`	`365`	`log.info('Processing remaining lines')`
`350`	`366`	`split_code := text_code.split_into_lines() // dont forget to add back the \n`
`@@ -413,14 +429,20 @@ fn reduce_scope(content string, error_msg string, command string, do_fmt bool, f`
`413`	`429`	`}`
`414`	`430`	`}`
`415`	`431`	`}`
	`432`	`+ println('')`
	`433`	`+ text_code = create_code(line_tree)`
	`434`	`+ os.write_file(rpdc_file_path, text_code) or { panic(err) }`
	`435`	`+ if do_fmt {`
	`436`	`+ os.execute('v fmt -w ${rpdc_file_path}')`
	`437`	`+ final_content := os.read_file(rpdc_file_path) or { panic(err) }`
	`438`	`+ show_code_stats(final_content, label: 'Code size after formatting')`
	`439`	`+ }`
	`440`	`+ println('The WIP reduced code is now in ${rpdc_file_path}')`
`416`	`441`	`}`
`417`		`- println('')`
`418`		`- text_code = create_code(line_tree)`
`419`	`442`	`}`
`420`	`443`
`421`	`444`	`warn_on_false(string_reproduces(text_code, error_msg, command, file_path, true, timeout),`
`422`	`445`	`'string_reproduces', @LOCATION)`
`423`		`- rpdc_file_path := 'rpdc_${os.file_name(file_path)#[..-2]}.v'`
`424`	`446`	`os.write_file(rpdc_file_path, text_code) or { panic(err) }`
`425`	`447`	`if do_fmt {`
`426`	`448`	`os.execute('v fmt -w ${rpdc_file_path}')`