mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

builder: show timing info in bold; also add a checker summary: line with -stats

Browse Source
This commit is contained in:
Delyan Angelov 2020-07-25 10:32:29 +03:00
parent 3c1427a4e8
commit c1e14b451e
8 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vlib/v/builder/builder.v
View File

@ -237,7 +237,14 @@ pub fn (b &Builder) find_module_path(mod, fpath string) ?string {
return error('module "$mod" not found in:\n$smodule_lookup_paths') return error('module "$mod" not found in:\n$smodule_lookup_paths')
} }
fn (b &Builder) show_total_warns_and_errors_stats() {
if b.pref.is_stats {
println('checker summary: ${util.bold(b.checker.nr_errors.str())} V errors, ${util.bold(b.checker.nr_warnings.str())} V warnings')
}
}
fn (b &Builder) print_warnings_and_errors() { fn (b &Builder) print_warnings_and_errors() {
defer { b.show_total_warns_and_errors_stats() }
if b.pref.output_mode == .silent { if b.pref.output_mode == .silent {
if b.checker.nr_errors > 0 { if b.checker.nr_errors > 0 {
exit(1) exit(1)
@ -278,6 +285,7 @@ fn (b &Builder) print_warnings_and_errors() {
return return
} }
} }
b.show_total_warns_and_errors_stats()
exit(1) exit(1)
} }
if b.table.redefined_fns.len > 0 { if b.table.redefined_fns.len > 0 {
@ -295,6 +303,7 @@ fn (b &Builder) print_warnings_and_errors() {
} }
} }
} }
b.show_total_warns_and_errors_stats()
exit(1) exit(1)
} }
} }
@ -304,10 +313,11 @@ fn verror(s string) {
util.verror('builder error', s) util.verror('builder error', s)
} }
pub fn (mut b Builder) timing_message(msg string) { pub fn (mut b Builder) timing_message(msg string, ms int) {
formatted_message := '$msg: ${util.bold(ms.str())} ms'
if b.pref.show_timings { if b.pref.show_timings {
println(msg) println(formatted_message)
} else { } else {
b.info(msg) b.info(formatted_message)
} }
} }

6
vlib/v/builder/c.v
View File

@ -12,7 +12,7 @@ pub fn (mut b Builder) gen_c(v_files []string) string {
b.parse_imports() b.parse_imports()
t1 := time.ticks() t1 := time.ticks()
parse_time := t1 - t0 parse_time := t1 - t0
b.timing_message('PARSE: ${parse_time}ms') b.timing_message('PARSE', parse_time)
if b.pref.only_check_syntax { if b.pref.only_check_syntax {
return '' return ''
} }
@ -21,14 +21,14 @@ pub fn (mut b Builder) gen_c(v_files []string) string {
b.checker.check_files(b.parsed_files) b.checker.check_files(b.parsed_files)
t2 := time.ticks() t2 := time.ticks()
check_time := t2 - t1 check_time := t2 - t1
b.timing_message('CHECK: ${check_time}ms') b.timing_message('CHECK', check_time)
b.print_warnings_and_errors() b.print_warnings_and_errors()
// println('starting cgen...') // println('starting cgen...')
// TODO: move gen.cgen() to c.gen() // TODO: move gen.cgen() to c.gen()
res := gen.cgen(b.parsed_files, b.table, b.pref) res := gen.cgen(b.parsed_files, b.table, b.pref)
t3 := time.ticks() t3 := time.ticks()
gen_time := t3 - t2 gen_time := t3 - t2
b.timing_message('C GEN: ${gen_time}ms') b.timing_message('C GEN', gen_time)
// println('cgen done') // println('cgen done')
// println(res) // println(res)
return res return res

2
vlib/v/builder/cc.v
View File

@ -493,7 +493,7 @@ fn (mut v Builder) cc() {
println('$ccompiler took $diff ms') println('$ccompiler took $diff ms')
println('=========\n') println('=========\n')
} }
v.timing_message('C ${ccompiler:3}: ${diff}ms') v.timing_message('C ${ccompiler:3}', diff)
// Link it if we are cross compiling and need an executable // Link it if we are cross compiling and need an executable
/* /*
if v.os == .linux && !linux_host && v.pref.build_mode != .build { if v.os == .linux && !linux_host && v.pref.build_mode != .build {

3
vlib/v/builder/compile.v
View File

@ -6,6 +6,7 @@ module builder
import time import time
import os import os
import v.pref import v.pref
import v.util
fn get_vtmp_folder() string { fn get_vtmp_folder() string {
mut vtmp := os.getenv('VTMP') mut vtmp := os.getenv('VTMP')
@ -39,7 +40,7 @@ pub fn compile(command string, pref &pref.Preferences) {
.x64 { b.compile_x64() } .x64 { b.compile_x64() }
} }
if pref.is_stats { if pref.is_stats {
println('compilation took: $sw.elapsed().milliseconds() ms') println('compilation took: ${util.bold(sw.elapsed().milliseconds().str())} ms')
} }
// running does not require the parsers anymore // running does not require the parsers anymore
unsafe { unsafe {

6
vlib/v/builder/js.v
View File

@ -13,16 +13,16 @@ pub fn (mut b Builder) gen_js(v_files []string) string {
b.parse_imports() b.parse_imports()
t1 := time.ticks() t1 := time.ticks()
parse_time := t1 - t0 parse_time := t1 - t0
b.timing_message('PARSE: ${parse_time}ms') b.timing_message('PARSE', parse_time)
b.checker.check_files(b.parsed_files) b.checker.check_files(b.parsed_files)
t2 := time.ticks() t2 := time.ticks()
check_time := t2 - t1 check_time := t2 - t1
b.timing_message('CHECK: ${check_time}ms') b.timing_message('CHECK', check_time)
b.print_warnings_and_errors() b.print_warnings_and_errors()
res := js.gen(b.parsed_files, b.table, b.pref) res := js.gen(b.parsed_files, b.table, b.pref)
t3 := time.ticks() t3 := time.ticks()
gen_time := t3 - t2 gen_time := t3 - t2
b.timing_message('JS GEN: ${gen_time}ms') b.timing_message('JS GEN', gen_time)
return res return res
} }

2
vlib/v/builder/msvc.v
View File

@ -312,7 +312,7 @@ pub fn (mut v Builder) cc_msvc() {
return return
} }
diff := time.ticks() - ticks diff := time.ticks() - ticks
v.timing_message('C msvc: ${diff}ms') v.timing_message('C msvc', diff)
if res.exit_code != 0 { if res.exit_code != 0 {
verror(res.output) verror(res.output)
} }

6
vlib/v/builder/x64.v
View File

@ -16,16 +16,16 @@ pub fn (mut b Builder) build_x64(v_files []string, out_file string) {
b.parse_imports() b.parse_imports()
t1 := time.ticks() t1 := time.ticks()
parse_time := t1 - t0 parse_time := t1 - t0
b.timing_message('PARSE: ${parse_time}ms') b.timing_message('PARSE', parse_time)
b.checker.check_files(b.parsed_files) b.checker.check_files(b.parsed_files)
t2 := time.ticks() t2 := time.ticks()
check_time := t2 - t1 check_time := t2 - t1
b.timing_message('CHECK: ${check_time}ms') b.timing_message('CHECK', check_time)
x64.gen(b.parsed_files, out_file, b.pref) x64.gen(b.parsed_files, out_file, b.pref)
t3 := time.ticks() t3 := time.ticks()
gen_time := t3 - t2 gen_time := t3 - t2
b.timing_message('x64 GEN: ${gen_time}ms') b.timing_message('x64 GEN', gen_time)
} }
pub fn (mut b Builder) compile_x64() { pub fn (mut b Builder) compile_x64() {

4
vlib/v/util/errors.v
View File

@ -43,10 +43,10 @@ pub fn (e &EManager) set_support_color(b bool) {
unsafe { unsafe {
mut me := e mut me := e
me.support_color = b me.support_color = b
} }
} }
fn bold(msg string) string { pub fn bold(msg string) string {
if !emanager.support_color { if !emanager.support_color {
return msg return msg
} }