[PULL,for-7.1,18/36] bsd-user: Expand log_page_dump inline

Message ID	20220320171135.2704502-19-richard.henderson@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL for-7.1 18/36] bsd-user: Expand log_page_dump inline Date: Sun, 20 Mar 2022 10:11:17 -0700 Message-Id: <20220320171135.2704502-19-richard.henderson@linaro.org> In-Reply-To: <20220320171135.2704502-1-richard.henderson@linaro.org> References: <20220320171135.2704502-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action Precedence: list Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	Logging cleanup and per-thread logfiles \| expand [PULL,for-7.1,00/36] Logging cleanup and per-thread logfiles [PULL,for-7.1,01/36] util/log: Drop manual log buffering [PULL,for-7.1,02/36] target/hexagon: Remove qemu_set_log in hexagon_translate_init [PULL,for-7.1,03/36] util/log: Pass Error pointer to qemu_set_log [PULL,for-7.1,04/36] os-posix: Use qemu_log_enabled [PULL,for-7.1,05/36] util/log: Move qemu_log_lock, qemu_log_unlock out of line [PULL,for-7.1,06/36] util/log: Treat qemu_log_lock like trylock [PULL,for-7.1,07/36] hw/xen: Split out xen_pv_output_msg [PULL,for-7.1,08/36] *: Use fprintf between qemu_log_lock/unlock [PULL,for-7.1,09/36] util/log: Remove qemu_log_vprintf [PULL,for-7.1,10/36] tcg: Pass the locked filepointer to tcg_dump_ops [PULL,for-7.1,11/36] exec/translator: Pass the locked filepointer to disas_log hook [PULL,for-7.1,12/36] exec/log: Remove log_disas and log_target_disas [PULL,for-7.1,13/36] accel/tcg: Use cpu_dump_state between qemu_log_lock/unlock [PULL,for-7.1,14/36] target/nios2: Remove log_cpu_state from reset [PULL,for-7.1,15/36] util/log: Use qemu_log_lock/unlock in qemu_log [PULL,for-7.1,16/36] util/log: Remove qemu_log_flush [PULL,for-7.1,17/36] util/log: Drop call to setvbuf [PULL,for-7.1,18/36] bsd-user: Expand log_page_dump inline [PULL,for-7.1,19/36] linux-user: Expand log_page_dump inline [PULL,for-7.1,20/36] tests/unit: Do not reference QemuLogFile directly [PULL,for-7.1,21/36] include/exec/log: Do not reference QemuLogFile directly [PULL,for-7.1,22/36] include/qemu/log: Move entire implementation out-of-line [PULL,for-7.1,23/36] sysemu/os-win32: Test for and use _lock_file/_unlock_file [PULL,for-7.1,24/36] util/log: Introduce qemu_set_log_filename_flags [PULL,for-7.1,25/36] bsd-user: Use qemu_set_log_filename_flags [PULL,for-7.1,26/36] linux-user: Use qemu_set_log_filename_flags [PULL,for-7.1,27/36] softmmu: Use qemu_set_log_filename_flags [PULL,for-7.1,28/36] util/log: Remove qemu_log_close [PULL,for-7.1,29/36] util/log: Rename logfilename to global_filename [PULL,for-7.1,30/36] util/log: Rename qemu_logfile to global_file [PULL,for-7.1,31/36] util/log: Rename qemu_logfile_mutex to global_mutex [PULL,for-7.1,32/36] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal [PULL,for-7.1,33/36] util/log: Combine two logfile closes [PULL,for-7.1,34/36] util/log: Rename QemuLogFile to RCUCloseFILE [PULL,for-7.1,35/36] util/log: Limit RCUCloseFILE to file closing [PULL,for-7.1,36/36] util/log: Support per-thread log files

Message ID

20220320171135.2704502-19-richard.henderson@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of
 qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as
 permitted sender) client-ip=209.51.188.17;
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL for-7.1 18/36] bsd-user: Expand log_page_dump inline
Date: Sun, 20 Mar 2022 10:11:17 -0700
Message-Id: <20220320171135.2704502-19-richard.henderson@linaro.org>
In-Reply-To: <20220320171135.2704502-1-richard.henderson@linaro.org>
References: <20220320171135.2704502-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::631;
 envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com
X-Spam_score_int: -6
X-Spam_score: -0.7
X-Spam_bar: /
X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: alex.bennee@linaro.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

Logging cleanup and per-thread logfiles | expand

Commit Message

Richard Henderson March 20, 2022, 5:11 p.m. UTC

We have extra stuff to log at the same time.
Hoist the qemu_log_lock/unlock to the caller and use fprintf.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 bsd-user/main.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0c8aa1ae90..d25d1c6015 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -503,20 +503,25 @@  int main(int argc, char **argv)
     g_free(target_environ);
 
     if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
-        qemu_log("guest_base  %p\n", (void *)guest_base);
-        log_page_dump("binary load");
+        FILE *f = qemu_log_lock();
 
-        qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
-        qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
-        qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n",
+        fprintf(f, "guest_base  %p\n", (void *)guest_base);
+        fprintf(f, "page layout changed following binary load\n");
+        page_dump(f);
+
+        fprintf(f, "start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
+        fprintf(f, "end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
+        fprintf(f, "start_code  0x" TARGET_ABI_FMT_lx "\n",
                  info->start_code);
-        qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
+        fprintf(f, "start_data  0x" TARGET_ABI_FMT_lx "\n",
                  info->start_data);
-        qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
-        qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n",
+        fprintf(f, "end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
+        fprintf(f, "start_stack 0x" TARGET_ABI_FMT_lx "\n",
                  info->start_stack);
-        qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
-        qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+        fprintf(f, "brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
+        fprintf(f, "entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+
+        qemu_log_unlock(f);
     }
 
     /* build Task State */

[PULL,for-7.1,18/36] bsd-user: Expand log_page_dump inline

Commit Message

Patch