From: Paolo Bonzini <pbonzini@redhat.com>
To: Alex Bligh <alex@alex.org.uk>
Cc: Kevin Wolf <kwolf@redhat.com>,
Anthony Liguori <aliguori@us.ibm.com>,
liu ping fan <qemulist@gmail.com>,
qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>,
rth@twiddle.net
Subject: Re: [Qemu-devel] [RFC] [PATCHv8 28/30] aio / timers: Add scripts/switch-timer-api
Date: Fri, 09 Aug 2013 12:23:31 +0200 [thread overview]
Message-ID: <5204C323.7060204@redhat.com> (raw)
In-Reply-To: <1375998147-24292-29-git-send-email-alex@alex.org.uk>
Il 08/08/2013 23:42, Alex Bligh ha scritto:
> Add scripts/switch-timer-api to programatically rewrite source
> files to use the new timer system.
>
> Signed-off-by: Alex Bligh <alex@alex.org.uk>
> ---
> scripts/switch-timer-api | 178 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 178 insertions(+)
>
> diff --git a/scripts/switch-timer-api b/scripts/switch-timer-api
> new file mode 100755
> index 0000000..5a06069
> --- /dev/null
> +++ b/scripts/switch-timer-api
> @@ -0,0 +1,178 @@
> +#!/usr/bin/perl
> +
> +use strict;
> +use warnings;
> +use Getopt::Long;
> +use FindBin;
> +
> +my @legacy = qw(qemu_clock_ptr qemu_get_clock_ns qemu_get_clock_ms qemu_register_clock_reset_notifier qemu_unregister_clock_reset_notifier qemu_new_timer qemu_free_timer qemu_del_timer qemu_mod_timer_ns qemu_mod_timer qemu_run_timers qemu_new_timer_ns qemu_new_timer_us qemu_new_timer_ms);
> +my $legacyre = '\b('.join('|', @legacy).')\b';
> +my $option_git;
> +my $option_dryrun;
> +my $option_quiet;
> +my $option_rtc;
> +my $suffix=".tmp.$$";
> +my @files;
> +my $getfiles = 'git grep -l -E \'\b((host|rt|vm|rtc)_clock\b|qemu_\w*timer)\' | egrep \'\.[ch]$\' | egrep -v \'qemu-timer\.c$|include/qemu/timer\.h$\'';
> +
> +sub Syntax
> +{
> + print STDERR <<STOP;
> +Usage: $FindBin::Script [options] FILE ...
> +
> +Translate each FILE to the new Qemu timer API. If no files
> +are passed, a reasonable guess is taken.
> +
> +Options:
> + -q, --quiet Do not show warnings etc
> + -d, --dry-run Do a dry run
> + -g, --git Generate a git commit for each change
> + -r, --rtc Only fix up rtc usage
What is this option useful for?
Paolo
> + -h, --help Print this message
> +
> +STOP
> +return;
> +}
> +
> +sub ParseOptions
> +{
> + if (!GetOptions (
> + "dry-run|d" => \$option_dryrun,
> + "git|g" => \$option_git,
> + "quiet|q" => \$option_quiet,
> + "rtc|r" => \$option_rtc,
> + "help|h" => sub { Syntax(); exit(0); }
> + ))
> + {
> + Syntax();
> + die "Bad options";
> + }
> +
> + if ($#ARGV >=0)
> + {
> + @files = @ARGV;
> + }
> + else
> + {
> + @files = split(/\s+/, `$getfiles`);
> + }
> +
> + foreach my $file (@files)
> + {
> + die "Cannot find $file" unless (-f $file && -r $file);
> + }
> +}
> +
> +sub DoWarn
> +{
> + my $text = shift @_;
> + my $line = shift @_;
> + return if ($option_quiet);
> + chomp ($line);
> + print STDERR "$text\n";
> + print STDERR "$line\n\n";
> +}
> +
> +sub Process
> +{
> + my $ifn = shift @_;
> + my $ofn = $ifn.$suffix;
> +
> + my $intext;
> + my $outtext;
> + my $linenum = 0;
> +
> + open my $input, "<", $ifn || die "Cannot open $ifn for read: $!";
> +
> + while (<$input>)
> + {
> + my $line = $_;
> + $intext .= $line;
> + $linenum++;
> +
> + # fix the specific uses
> + unless ($option_rtc)
> + {
> + $line =~ s/\bqemu_new_timer(_[num]s)\s*\((vm_|rt_|host_)clock\b/qemu_timer_new$1(XXX_$2clock/g;
> + $line =~ s/\bqemu_new_timer\s*\((vm_|rt_|host_)clock\b/qemu_timer_new(XXX_$1clock/g;
> + $line =~ s/\bqemu_get_clock(_[num]s)\s*\((vm_|rt_|host_)clock\b/qemu_clock_get$1(XXX_$2clock/g;
> + }
> +
> + # rtc is different
> + $line =~ s/\bqemu_new_timer(_[num]s)\s*\(rtc_clock\b/qemu_timer_new$1(rtc_clock/g;
> + $line =~ s/\bqemu_new_timer\s*\(rtc_clock\b/qemu_timer_new(rtc_clock/g;
> + $line =~ s/\bqemu_get_clock(_[num]s)\s*\(rtc_clock\b/qemu_clock_get$1(rtc_clock/g;
> + $line =~ s/\bqemu_register_clock_reset_notifier\s*\(rtc_clock\b/qemu_register_clock_reset_notifier(qemu_clock_ptr(rtc_clock)/g;
> +
> + unless ($option_rtc)
> + {
> + # fix up comments
> + $line =~ s/\b(vm_|rt_|host_)clock\b/XXX_$1clock/g if ($line =~ m,^[/ ]+\*,);
> +
> + # spurious fprintf error reporting
> + $line =~ s/: qemu_new_timer_ns failed/: qemu_timer_new_ns failed/g;
> +
> + # these have just changed name
> + $line =~ s/\bqemu_mod_timer\b/qemu_timer_mod/g;
> + $line =~ s/\bqemu_mod_timer_(ns|us|ms)\b/qemu_timer_mod_$1/g;
> + $line =~ s/\bqemu_free_timer\b/qemu_timer_free/g;
> + $line =~ s/\bqemu_del_timer\b/qemu_timer_del/g;
> + }
> +
> + # fix up rtc_clock
> + $line =~ s/QEMUClock \*rtc_clock;/QEMUClockType rtc_clock;/g;
> + $line =~ s/\brtc_clock = (vm_|rt_|host_)clock\b/rtc_clock = XXX_$1clock/g;
> +
> + unless ($option_rtc)
> + {
> + # replace any more general uses
> + $line =~ s/\b(vm_|rt_|host_)clock\b/qemu_clock_ptr(XXX_$1clock)/g;
> + }
> +
> + # fix up the place holders
> + $line =~ s/\bXXX_vm_clock\b/QEMU_CLOCK_VIRTUAL/g;
> + $line =~ s/\bXXX_rt_clock\b/QEMU_CLOCK_REALTIME/g;
> + $line =~ s/\bXXX_host_clock\b/QEMU_CLOCK_HOST/g;
> +
> + unless ($option_rtc)
> + {
> + DoWarn("$ifn:$linenum WARNING: timer $1 not fixed up", $line) if ($line =~ /\b((vm_|rt_|host_)clock)\b/);
> + DoWarn("$ifn:$linenum WARNING: function $1 not fixed up", $line) if ($line =~ /\b(qemu_new_timer\w+)\b/);
> + DoWarn("$ifn:$linenum WARNING: legacy function $1 remains", $line) if ($line =~ /$legacyre/o);
> + }
> +
> + $outtext .= $line;
> + }
> +
> + close $input;
> +
> + if ($intext ne $outtext)
> + {
> + print STDERR "Patching $ifn\n" unless ($option_quiet);
> + unless ($option_dryrun)
> + {
> + open my $output, ">", $ofn || die "Cannot open $ofn for write: $!";
> + print $output $outtext;
> + close $output;
> + rename ($ofn, $ifn) || die "Cannot rename temp file to $ifn: $!";
> + return 1;
> + }
> + }
> + return 0;
> +}
> +
> +sub DoCommit
> +{
> + my $file = shift @_;
> + open (my $git, "| git commit -F - $file") || die "Cannot run git commit on $file: $!";
> + print $git "timers api: use new timer api in $file\n\nConvert $file to use new timer API.\nThis is an automated commit made by scripts/switch-timer-api\n";
> + close ($git);
> +}
> +
> +ParseOptions;
> +
> +foreach my $file (@files)
> +{
> + my $changed = Process ($file);
> + DoCommit($file) if ($changed && $option_git);
> +}
>
next prev parent reply other threads:[~2013-08-09 10:24 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 21:41 [Qemu-devel] [RFC] [PATCHv8 00/30] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-08-08 21:41 ` [Qemu-devel] [RFC] [PATCHv8 01/30] aio / timers: Rename qemu_new_clock and expose clock types Alex Bligh
2013-08-08 21:41 ` [Qemu-devel] [RFC] [PATCHv8 02/30] aio / timers: add qemu-timer.c utility functions Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 03/30] aio / timers: Consistent treatment of disabled clocks for deadlines Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 04/30] aio / timers: add ppoll support with qemu_poll_ns Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 05/30] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Alex Bligh
2013-08-09 8:53 ` Stefan Hajnoczi
2013-08-09 14:10 ` Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 06/30] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 07/30] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Alex Bligh
2013-08-09 10:03 ` Paolo Bonzini
2013-08-09 14:23 ` Alex Bligh
2013-08-09 14:28 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 08/30] aio / timers: Untangle include files Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 09/30] aio / timers: Add QEMUTimerListGroup and helper functions Alex Bligh
2013-08-09 10:02 ` Paolo Bonzini
2013-08-09 14:27 ` Alex Bligh
2013-08-09 14:35 ` Paolo Bonzini
2013-08-09 14:47 ` Alex Bligh
2013-08-09 14:59 ` Paolo Bonzini
2013-08-10 11:05 ` Alex Bligh
2013-08-11 7:53 ` Paolo Bonzini
2013-08-11 8:29 ` Alex Bligh
2013-08-12 17:27 ` Paolo Bonzini
2013-08-12 17:32 ` Alex Bligh
2013-08-12 6:53 ` Wenchao Xia
2013-08-12 7:08 ` Alex Bligh
2013-08-09 15:09 ` Stefan Hajnoczi
2013-08-09 15:15 ` Paolo Bonzini
2013-08-10 3:27 ` liu ping fan
2013-08-10 8:38 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 10/30] aio / timers: Add QEMUTimerListGroup to AioContext Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 11/30] aio / timers: Add a notify callback to QEMUTimerList Alex Bligh
2013-08-09 9:02 ` Stefan Hajnoczi
2013-08-09 14:16 ` Alex Bligh
2013-08-09 10:03 ` Paolo Bonzini
2013-08-09 14:28 ` Alex Bligh
2013-08-10 11:13 ` Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 12/30] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Alex Bligh
2013-08-09 10:04 ` Paolo Bonzini
2013-08-09 14:30 ` Alex Bligh
2013-08-09 14:41 ` Paolo Bonzini
2013-08-09 14:55 ` Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 13/30] aio / timers: Add aio_timer_new wrapper Alex Bligh
2013-08-09 10:06 ` Paolo Bonzini
2013-08-09 14:32 ` Alex Bligh
2013-08-09 14:36 ` Paolo Bonzini
2013-08-09 14:51 ` Alex Bligh
2013-08-09 14:51 ` Paolo Bonzini
2013-08-09 14:57 ` Alex Bligh
2013-08-09 14:58 ` Paolo Bonzini
2013-08-09 22:57 ` Alex Bligh
2013-08-10 8:36 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 14/30] aio / timers: Convert aio_poll to use AioContext timers' deadline Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 15/30] aio / timers: Convert mainloop to use timeout Alex Bligh
2013-08-09 10:07 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 16/30] aio / timers: On timer modification, qemu_notify or aio_notify Alex Bligh
2013-08-09 10:08 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 17/30] aio / timers: Introduce new API qemu_timer_new and friends Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 18/30] aio / timers: Use all timerlists in icount warp calculations Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 19/30] aio / timers: Add documentation and new format calls Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 20/30] aio / timers: Remove alarm timers Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 21/30] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 22/30] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 23/30] aio / timers: Rearrange timer.h & make legacy functions call non-legacy Alex Bligh
2013-08-08 22:12 ` Alex Bligh
2013-08-09 9:23 ` Stefan Hajnoczi
2013-08-09 14:18 ` Alex Bligh
2013-08-09 14:26 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 24/30] aio / timers: Remove main_loop_timerlist Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 25/30] aio / timers: Convert rtc_clock to be a QEMUClockType Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 26/30] aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 27/30] aio / timers: Add test harness for AioContext timers Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 28/30] aio / timers: Add scripts/switch-timer-api Alex Bligh
2013-08-09 10:23 ` Paolo Bonzini [this message]
2013-08-09 14:34 ` Alex Bligh
2013-08-09 10:26 ` Paolo Bonzini
2013-08-09 14:35 ` Alex Bligh
2013-08-09 14:37 ` Paolo Bonzini
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 29/30] aio / timers: Switch entire codebase to the new timer API Alex Bligh
2013-08-08 21:42 ` [Qemu-devel] [RFC] [PATCHv8 30/30] aio / timers: Remove legacy interface Alex Bligh
2013-08-08 21:46 ` [Qemu-devel] [RFC] [PATCHv8 00/30] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-08-09 8:12 ` Jan Kiszka
2013-08-09 8:24 ` liu ping fan
2013-08-09 8:33 ` Jan Kiszka
2013-08-09 10:35 ` Alex Bligh
2013-08-09 9:41 ` Stefan Hajnoczi
2013-08-09 14:19 ` Alex Bligh
2013-08-09 14:27 ` Paolo Bonzini
2013-08-09 10:27 ` Paolo Bonzini
2013-08-09 11:18 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5204C323.7060204@redhat.com \
--to=pbonzini@redhat.com \
--cc=alex@alex.org.uk \
--cc=aliguori@us.ibm.com \
--cc=kwolf@redhat.com \
--cc=morita.kazutaka@lab.ntt.co.jp \
--cc=qemu-devel@nongnu.org \
--cc=qemulist@gmail.com \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).