From f146eff73786ae2be36952f2227c79ecf38a01cf Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Mon, 21 Oct 2024 11:29:07 -0400 Subject: [PATCH 1/4] add indicator to stderr recompiles to survive copy-paste from color prompt --- src/gf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gf.c b/src/gf.c index e77c950c38ae4..feb1286e3f99e 100644 --- a/src/gf.c +++ b/src/gf.c @@ -2560,8 +2560,15 @@ static void record_precompile_statement(jl_method_instance_t *mi, double compila if (!jl_has_free_typevars(mi->specTypes)) { if (is_recompile && s_precompile == JL_STDERR && jl_options.color != JL_OPTIONS_COLOR_OFF) jl_printf(s_precompile, "\e[33m"); - if (force_trace_compile || jl_options.trace_compile_timing) - jl_printf(s_precompile, "#= %6.1f ms =# ", compilation_time / 1e6); + if (force_trace_compile || jl_options.trace_compile_timing) { + jl_printf(s_precompile, "#= %6.1f ms", compilation_time / 1e6); + if (is_recompile) { + jl_printf(s_precompile, "*=# "); + } + else { + jl_printf(s_precompile, " =# "); + } + } jl_printf(s_precompile, "precompile("); jl_static_show(s_precompile, mi->specTypes); jl_printf(s_precompile, ")"); From f3bd1e992c9ead4d109a6052d711bfd3fdb2f348 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Mon, 21 Oct 2024 14:47:59 -0400 Subject: [PATCH 2/4] Revert "add indicator to stderr recompiles to survive copy-paste from color prompt" This reverts commit f146eff73786ae2be36952f2227c79ecf38a01cf. --- src/gf.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gf.c b/src/gf.c index feb1286e3f99e..e77c950c38ae4 100644 --- a/src/gf.c +++ b/src/gf.c @@ -2560,15 +2560,8 @@ static void record_precompile_statement(jl_method_instance_t *mi, double compila if (!jl_has_free_typevars(mi->specTypes)) { if (is_recompile && s_precompile == JL_STDERR && jl_options.color != JL_OPTIONS_COLOR_OFF) jl_printf(s_precompile, "\e[33m"); - if (force_trace_compile || jl_options.trace_compile_timing) { - jl_printf(s_precompile, "#= %6.1f ms", compilation_time / 1e6); - if (is_recompile) { - jl_printf(s_precompile, "*=# "); - } - else { - jl_printf(s_precompile, " =# "); - } - } + if (force_trace_compile || jl_options.trace_compile_timing) + jl_printf(s_precompile, "#= %6.1f ms =# ", compilation_time / 1e6); jl_printf(s_precompile, "precompile("); jl_static_show(s_precompile, mi->specTypes); jl_printf(s_precompile, ")"); From 5cf51be6611dfe3230d17a58e0758df885cd5068 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Mon, 21 Oct 2024 14:49:33 -0400 Subject: [PATCH 3/4] just add # recompile in color mode too --- src/gf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gf.c b/src/gf.c index e77c950c38ae4..78be59738ea1b 100644 --- a/src/gf.c +++ b/src/gf.c @@ -2565,14 +2565,8 @@ static void record_precompile_statement(jl_method_instance_t *mi, double compila jl_printf(s_precompile, "precompile("); jl_static_show(s_precompile, mi->specTypes); jl_printf(s_precompile, ")"); - if (is_recompile) { - if (s_precompile == JL_STDERR && jl_options.color != JL_OPTIONS_COLOR_OFF) { - jl_printf(s_precompile, "\e[0m"); - } - else { - jl_printf(s_precompile, " # recompile"); - } - } + if (is_recompile) + jl_printf(s_precompile, " # recompile\e[0m"); jl_printf(s_precompile, "\n"); if (s_precompile != JL_STDERR) ios_flush(&f_precompile); From 2edc9077c3687ae51f316d0860fb6bf6fe85c8dd Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Mon, 21 Oct 2024 15:06:46 -0400 Subject: [PATCH 4/4] fix --- src/gf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gf.c b/src/gf.c index 78be59738ea1b..285942cd157c5 100644 --- a/src/gf.c +++ b/src/gf.c @@ -2565,8 +2565,12 @@ static void record_precompile_statement(jl_method_instance_t *mi, double compila jl_printf(s_precompile, "precompile("); jl_static_show(s_precompile, mi->specTypes); jl_printf(s_precompile, ")"); - if (is_recompile) - jl_printf(s_precompile, " # recompile\e[0m"); + if (is_recompile) { + jl_printf(s_precompile, " # recompile"); + if (s_precompile == JL_STDERR && jl_options.color != JL_OPTIONS_COLOR_OFF) { + jl_printf(s_precompile, "\e[0m"); + } + } jl_printf(s_precompile, "\n"); if (s_precompile != JL_STDERR) ios_flush(&f_precompile);