qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
	Alex Bligh <alex@alex.org.uk>,
	Anthony Liguori <anthony@codemonkey.ws>
Subject: [Qemu-devel] [PULL 37/42] aio / timers: Add scripts/switch-timer-api
Date: Thu, 22 Aug 2013 22:11:33 +0200	[thread overview]
Message-ID: <1377202298-22896-38-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1377202298-22896-1-git-send-email-stefanha@redhat.com>

From: Alex Bligh <alex@alex.org.uk>

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>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/switch-timer-api | 178 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100755 scripts/switch-timer-api

diff --git a/scripts/switch-timer-api b/scripts/switch-timer-api
new file mode 100755
index 0000000..a369a08
--- /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
+  -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/timer_new$1(XXX_$2clock/g;
+	    $line =~ s/\bqemu_new_timer\s*\((vm_|rt_|host_)clock\b/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/timer_new$1(rtc_clock/g;
+	$line =~ s/\bqemu_new_timer\s*\(rtc_clock\b/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/: timer_new_ns failed/g;
+
+	    # these have just changed name
+	    $line =~ s/\bqemu_mod_timer\b/timer_mod/g;
+	    $line =~ s/\bqemu_mod_timer_(ns|us|ms)\b/timer_mod_$1/g;
+	    $line =~ s/\bqemu_free_timer\b/timer_free/g;
+	    $line =~ s/\bqemu_del_timer\b/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);
+}
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-22 20:13 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-22 20:10 [Qemu-devel] [PULL 00/42] Block patches Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 01/42] qcow2: Change default for new images to compat=1.1 Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 02/42] block: Introduce bs->zero_beyond_eof Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 03/42] block: Produce zeros when protocols reading beyond end of file Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 04/42] block: better error message for read only format name Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 05/42] vmdk: Move l1_size check into vmdk_add_extent() Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 06/42] vmdk: fix L1 and L2 table size in vmdk3 open Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 07/42] vmdk: support vmfsSparse files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 08/42] vmdk: support vmfs files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 09/42] aio / timers: Rename qemu_timer_* functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 10/42] aio / timers: Rename qemu_new_clock and expose clock types Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 11/42] aio / timers: add qemu-timer.c utility functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 12/42] aio / timers: Consistent treatment of disabled clocks for deadlines Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 13/42] aio / timers: add ppoll support with qemu_poll_ns Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 14/42] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 15/42] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 16/42] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 17/42] aio / timers: Untangle include files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 18/42] aio / timers: Add QEMUTimerListGroup and helper functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 19/42] aio / timers: Add QEMUTimerListGroup to AioContext Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 20/42] aio / timers: Add a notify callback to QEMUTimerList Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 21/42] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 22/42] aio / timers: Add aio_timer_init & aio_timer_new wrappers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 23/42] aio / timers: Convert aio_poll to use AioContext timers' deadline Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 24/42] aio / timers: Convert mainloop to use timeout Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 25/42] aio / timers: On timer modification, qemu_notify or aio_notify Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 26/42] aio / timers: Introduce new API timer_new and friends Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 27/42] aio / timers: Use all timerlists in icount warp calculations Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 28/42] aio / timers: Add documentation and new format calls Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 29/42] aio / timers: Remove alarm timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 30/42] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 31/42] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 32/42] aio / timers: Rearrange timer.h & make legacy functions call non-legacy Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 33/42] aio / timers: Remove main_loop_timerlist Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 34/42] aio / timers: Convert rtc_clock to be a QEMUClockType Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 35/42] aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 36/42] aio / timers: Add test harness for AioContext timers Stefan Hajnoczi
2013-08-22 20:11 ` Stefan Hajnoczi [this message]
2013-08-22 20:11 ` [Qemu-devel] [PULL 38/42] aio / timers: Switch entire codebase to the new timer API Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 39/42] aio / timers: Remove legacy interface Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 40/42] aio / timers: remove dummy_io_handler_flush from tests/test-aio.c Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 41/42] aio-win32: replace incorrect AioHandler->opaque usage with ->e Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 42/42] win32-aio: drop win32_aio_flush_cb() 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=1377202298-22896-38-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=alex@alex.org.uk \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /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).