[PULL 00/39] Logging cleanup and per-thread logfiles

Richard Henderson posted 39 patches 2 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220420180618.1183855-1-richard.henderson@linaro.org
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Yanan Wang <wangyanan55@huawei.com>, Pavel Pisa <pisa@cmp.felk.cvut.cz>, Vikram Garhwal <fnu.vikram@xilinx.com>, Jason Wang <jasowang@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Stefan Weil <sw@weilnetz.de>, Laurent Vivier <laurent@vivier.eu>, Markus Armbruster <armbru@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>, Fam Zheng <fam@euphon.net>, Peter Maydell <peter.maydell@linaro.org>, Michael Rolnik <mrolnik@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Taylor Simpson <tsimpson@quicinc.com>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Chris Wulff <crwulff@gmail.com>, Marek Vasut <marex@denx.de>, Stafford Horne <shorne@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, Daniel Henrique Barboza <danielhb413@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Filippov <jcmvbkbc@gmail.com>
There is a newer version of this series
meson.build                          |  12 ++
include/exec/log.h                   |  52 +----
include/exec/translator.h            |   2 +-
include/qemu/log-for-trace.h         |   2 +-
include/qemu/log.h                   |  93 +--------
include/sysemu/os-win32.h            |  16 +-
accel/tcg/cpu-exec.c                 |  18 +-
accel/tcg/translate-all.c            | 118 +++++------
accel/tcg/translator.c               |  12 +-
bsd-user/main.c                      |  54 ++---
cpu.c                                |  16 +-
hw/net/can/can_sja1000.c             |  25 +--
hw/xen/xen_pvdev.c                   |  45 +++--
linux-user/main.c                    |  55 +++--
linux-user/mmap.c                    |   7 +-
monitor/misc.c                       |   9 +-
net/can/can_socketcan.c              |  24 ++-
os-posix.c                           |   2 +-
qemu-img.c                           |   2 +-
qemu-io.c                            |   2 +-
qemu-nbd.c                           |   2 +-
scsi/qemu-pr-helper.c                |   2 +-
softmmu/vl.c                         |  21 +-
storage-daemon/qemu-storage-daemon.c |   2 +-
target/alpha/translate.c             |   7 +-
target/arm/translate-a64.c           |   6 +-
target/arm/translate.c               |   7 +-
target/avr/translate.c               |   7 +-
target/cris/translate.c              |   7 +-
target/hexagon/translate.c           |  13 +-
target/hppa/translate.c              |  15 +-
target/i386/tcg/translate.c          |  22 +-
target/m68k/translate.c              |   7 +-
target/microblaze/translate.c        |   7 +-
target/mips/tcg/translate.c          |   7 +-
target/nios2/cpu.c                   |   5 -
target/nios2/translate.c             |   7 +-
target/openrisc/translate.c          |   7 +-
target/ppc/translate.c               |   7 +-
target/riscv/translate.c             |  10 +-
target/rx/translate.c                |   7 +-
target/s390x/tcg/translate.c         |  11 +-
target/sh4/translate.c               |   7 +-
target/sparc/translate.c             |   7 +-
target/tricore/translate.c           |   7 +-
target/xtensa/translate.c            |   7 +-
tcg/tcg.c                            | 184 ++++++++---------
tests/unit/test-logging.c            |  42 ++--
util/log.c                           | 377 +++++++++++++++++++++++------------
49 files changed, 724 insertions(+), 659 deletions(-)
[PULL 00/39] Logging cleanup and per-thread logfiles
Posted by Richard Henderson 2 years ago
The following changes since commit 40a4b96eb08b3a3e83895f46b2394748dac7a641:

  Merge tag 'pull-block-2022-04-20' of https://gitlab.com/hreitz/qemu into staging (2022-04-20 09:39:33 -0700)

are available in the Git repository at:

  https://gitlab.com/rth7680/qemu.git tags/pull-log-20220420

for you to fetch changes up to 4e51069d679348d2617512e56e28cdc7bb34c833:

  util/log: Support per-thread log files (2022-04-20 10:51:11 -0700)

----------------------------------------------------------------
Clean up log locking.
Use the FILE* from qemu_log_trylock more often.
Support per-thread log files with -d tid.

----------------------------------------------------------------
Richard Henderson (39):
      util/log: Drop manual log buffering
      target/hexagon: Remove qemu_set_log in hexagon_translate_init
      util/log: Return bool from qemu_set_log_filename
      util/log: Pass Error pointer to qemu_set_log
      os-posix: Use qemu_log_enabled
      util/log: Move qemu_log_lock, qemu_log_unlock out of line
      util/log: Rename qemu_log_lock to qemu_log_trylock
      hw/xen: Split out xen_pv_output_msg
      *: Use fprintf between qemu_log_trylock/unlock
      util/log: Remove qemu_log_vprintf
      tcg: Pass the locked filepointer to tcg_dump_ops
      exec/translator: Pass the locked filepointer to disas_log hook
      exec/log: Remove log_disas and log_target_disas
      accel/tcg: Use cpu_dump_state between qemu_log_trylock/unlock
      target/nios2: Remove log_cpu_state from reset
      util/log: Use qemu_log_trylock/unlock in qemu_log
      util/log: Drop return value from qemu_log
      util/log: Mark qemu_log_trylock as G_GNUC_WARN_UNUSED_RESULT
      util/log: Remove qemu_log_flush
      util/log: Drop call to setvbuf
      bsd-user: Expand log_page_dump inline
      linux-user: Expand log_page_dump inline
      tests/unit: Do not reference QemuLogFile directly
      include/exec/log: Do not reference QemuLogFile directly
      include/qemu/log: Move entire implementation out-of-line
      sysemu/os-win32: Test for and use _lock_file/_unlock_file
      util/log: Introduce qemu_set_log_filename_flags
      bsd-user: Use qemu_set_log_filename_flags
      linux-user: Use qemu_set_log_filename_flags
      softmmu: Use qemu_set_log_filename_flags
      util/log: Remove qemu_log_close
      util/log: Rename logfilename to global_filename
      util/log: Rename qemu_logfile to global_file
      util/log: Rename qemu_logfile_mutex to global_mutex
      util/log: Hoist the eval of is_daemonized in qemu_set_log_internal
      util/log: Combine two logfile closes
      util/log: Rename QemuLogFile to RCUCloseFILE
      util/log: Limit RCUCloseFILE to file closing
      util/log: Support per-thread log files

 meson.build                          |  12 ++
 include/exec/log.h                   |  52 +----
 include/exec/translator.h            |   2 +-
 include/qemu/log-for-trace.h         |   2 +-
 include/qemu/log.h                   |  93 +--------
 include/sysemu/os-win32.h            |  16 +-
 accel/tcg/cpu-exec.c                 |  18 +-
 accel/tcg/translate-all.c            | 118 +++++------
 accel/tcg/translator.c               |  12 +-
 bsd-user/main.c                      |  54 ++---
 cpu.c                                |  16 +-
 hw/net/can/can_sja1000.c             |  25 +--
 hw/xen/xen_pvdev.c                   |  45 +++--
 linux-user/main.c                    |  55 +++--
 linux-user/mmap.c                    |   7 +-
 monitor/misc.c                       |   9 +-
 net/can/can_socketcan.c              |  24 ++-
 os-posix.c                           |   2 +-
 qemu-img.c                           |   2 +-
 qemu-io.c                            |   2 +-
 qemu-nbd.c                           |   2 +-
 scsi/qemu-pr-helper.c                |   2 +-
 softmmu/vl.c                         |  21 +-
 storage-daemon/qemu-storage-daemon.c |   2 +-
 target/alpha/translate.c             |   7 +-
 target/arm/translate-a64.c           |   6 +-
 target/arm/translate.c               |   7 +-
 target/avr/translate.c               |   7 +-
 target/cris/translate.c              |   7 +-
 target/hexagon/translate.c           |  13 +-
 target/hppa/translate.c              |  15 +-
 target/i386/tcg/translate.c          |  22 +-
 target/m68k/translate.c              |   7 +-
 target/microblaze/translate.c        |   7 +-
 target/mips/tcg/translate.c          |   7 +-
 target/nios2/cpu.c                   |   5 -
 target/nios2/translate.c             |   7 +-
 target/openrisc/translate.c          |   7 +-
 target/ppc/translate.c               |   7 +-
 target/riscv/translate.c             |  10 +-
 target/rx/translate.c                |   7 +-
 target/s390x/tcg/translate.c         |  11 +-
 target/sh4/translate.c               |   7 +-
 target/sparc/translate.c             |   7 +-
 target/tricore/translate.c           |   7 +-
 target/xtensa/translate.c            |   7 +-
 tcg/tcg.c                            | 184 ++++++++---------
 tests/unit/test-logging.c            |  42 ++--
 util/log.c                           | 377 +++++++++++++++++++++++------------
 49 files changed, 724 insertions(+), 659 deletions(-)
Re: [PULL 00/39] Logging cleanup and per-thread logfiles
Posted by Richard Henderson 2 years ago
On 4/20/22 11:05, Richard Henderson wrote:
> The following changes since commit 40a4b96eb08b3a3e83895f46b2394748dac7a641:
> 
>    Merge tag 'pull-block-2022-04-20' of https://gitlab.com/hreitz/qemu into staging (2022-04-20 09:39:33 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/rth7680/qemu.git tags/pull-log-20220420
> 
> for you to fetch changes up to 4e51069d679348d2617512e56e28cdc7bb34c833:
> 
>    util/log: Support per-thread log files (2022-04-20 10:51:11 -0700)
> 
> ----------------------------------------------------------------
> Clean up log locking.
> Use the FILE* from qemu_log_trylock more often.
> Support per-thread log files with -d tid.

Applied, thanks.  Please update the wiki changelog for 7.1 as appropriate.


r~

> 
> ----------------------------------------------------------------
> Richard Henderson (39):
>        util/log: Drop manual log buffering
>        target/hexagon: Remove qemu_set_log in hexagon_translate_init
>        util/log: Return bool from qemu_set_log_filename
>        util/log: Pass Error pointer to qemu_set_log
>        os-posix: Use qemu_log_enabled
>        util/log: Move qemu_log_lock, qemu_log_unlock out of line
>        util/log: Rename qemu_log_lock to qemu_log_trylock
>        hw/xen: Split out xen_pv_output_msg
>        *: Use fprintf between qemu_log_trylock/unlock
>        util/log: Remove qemu_log_vprintf
>        tcg: Pass the locked filepointer to tcg_dump_ops
>        exec/translator: Pass the locked filepointer to disas_log hook
>        exec/log: Remove log_disas and log_target_disas
>        accel/tcg: Use cpu_dump_state between qemu_log_trylock/unlock
>        target/nios2: Remove log_cpu_state from reset
>        util/log: Use qemu_log_trylock/unlock in qemu_log
>        util/log: Drop return value from qemu_log
>        util/log: Mark qemu_log_trylock as G_GNUC_WARN_UNUSED_RESULT
>        util/log: Remove qemu_log_flush
>        util/log: Drop call to setvbuf
>        bsd-user: Expand log_page_dump inline
>        linux-user: Expand log_page_dump inline
>        tests/unit: Do not reference QemuLogFile directly
>        include/exec/log: Do not reference QemuLogFile directly
>        include/qemu/log: Move entire implementation out-of-line
>        sysemu/os-win32: Test for and use _lock_file/_unlock_file
>        util/log: Introduce qemu_set_log_filename_flags
>        bsd-user: Use qemu_set_log_filename_flags
>        linux-user: Use qemu_set_log_filename_flags
>        softmmu: Use qemu_set_log_filename_flags
>        util/log: Remove qemu_log_close
>        util/log: Rename logfilename to global_filename
>        util/log: Rename qemu_logfile to global_file
>        util/log: Rename qemu_logfile_mutex to global_mutex
>        util/log: Hoist the eval of is_daemonized in qemu_set_log_internal
>        util/log: Combine two logfile closes
>        util/log: Rename QemuLogFile to RCUCloseFILE
>        util/log: Limit RCUCloseFILE to file closing
>        util/log: Support per-thread log files
> 
>   meson.build                          |  12 ++
>   include/exec/log.h                   |  52 +----
>   include/exec/translator.h            |   2 +-
>   include/qemu/log-for-trace.h         |   2 +-
>   include/qemu/log.h                   |  93 +--------
>   include/sysemu/os-win32.h            |  16 +-
>   accel/tcg/cpu-exec.c                 |  18 +-
>   accel/tcg/translate-all.c            | 118 +++++------
>   accel/tcg/translator.c               |  12 +-
>   bsd-user/main.c                      |  54 ++---
>   cpu.c                                |  16 +-
>   hw/net/can/can_sja1000.c             |  25 +--
>   hw/xen/xen_pvdev.c                   |  45 +++--
>   linux-user/main.c                    |  55 +++--
>   linux-user/mmap.c                    |   7 +-
>   monitor/misc.c                       |   9 +-
>   net/can/can_socketcan.c              |  24 ++-
>   os-posix.c                           |   2 +-
>   qemu-img.c                           |   2 +-
>   qemu-io.c                            |   2 +-
>   qemu-nbd.c                           |   2 +-
>   scsi/qemu-pr-helper.c                |   2 +-
>   softmmu/vl.c                         |  21 +-
>   storage-daemon/qemu-storage-daemon.c |   2 +-
>   target/alpha/translate.c             |   7 +-
>   target/arm/translate-a64.c           |   6 +-
>   target/arm/translate.c               |   7 +-
>   target/avr/translate.c               |   7 +-
>   target/cris/translate.c              |   7 +-
>   target/hexagon/translate.c           |  13 +-
>   target/hppa/translate.c              |  15 +-
>   target/i386/tcg/translate.c          |  22 +-
>   target/m68k/translate.c              |   7 +-
>   target/microblaze/translate.c        |   7 +-
>   target/mips/tcg/translate.c          |   7 +-
>   target/nios2/cpu.c                   |   5 -
>   target/nios2/translate.c             |   7 +-
>   target/openrisc/translate.c          |   7 +-
>   target/ppc/translate.c               |   7 +-
>   target/riscv/translate.c             |  10 +-
>   target/rx/translate.c                |   7 +-
>   target/s390x/tcg/translate.c         |  11 +-
>   target/sh4/translate.c               |   7 +-
>   target/sparc/translate.c             |   7 +-
>   target/tricore/translate.c           |   7 +-
>   target/xtensa/translate.c            |   7 +-
>   tcg/tcg.c                            | 184 ++++++++---------
>   tests/unit/test-logging.c            |  42 ++--
>   util/log.c                           | 377 +++++++++++++++++++++++------------
>   49 files changed, 724 insertions(+), 659 deletions(-)