Commit 73bcb24d authored by Rutuja Shah's avatar Rutuja Shah Committed by Paolo Bonzini
Browse files

Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND 



This patch replaces get_ticks_per_sec() calls with the macro
NANOSECONDS_PER_SECOND. Also, as there are no callers, get_ticks_per_sec()
is then removed.  This replacement improves the readability and
understandability of code.

For example,

    timer_mod(fdctrl->result_timer,
	      qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (get_ticks_per_sec() / 50));

NANOSECONDS_PER_SECOND makes it obvious that qemu_clock_get_ns
matches the unit of the expression on the right side of the plus.

Signed-off-by: default avatarRutuja Shah <rutu.shah.26@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4771d756

audio/audio.c

+1 −2
Original line number Diff line number Diff line
@@ -1869,8 +1869,7 @@ static void audio_init (void) 
        }

        conf.period.ticks = 1;

    } else {

        conf.period.ticks =

            muldiv64 (1, get_ticks_per_sec (), conf.period.hertz);

        conf.period.ticks = NANOSECONDS_PER_SECOND / conf.period.hertz;

    }



    e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s);

audio/noaudio.c

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int no_run_out (HWVoiceOut *hw, int live) 


    now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    ticks = now - no->old_ticks;

    bytes = muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());

    bytes = muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);

    bytes = audio_MIN(bytes, INT_MAX);

    samples = bytes >> hw->info.shift;
@@ -106,7 +106,7 @@ static int no_run_in (HWVoiceIn *hw) 
        int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

        int64_t ticks = now - no->old_ticks;

        int64_t bytes =

            muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());

            muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);



        no->old_ticks = now;

        bytes = audio_MIN (bytes, INT_MAX);

audio/spiceaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int rate_get_samples (struct audio_pcm_info *info, SpiceRateCtl *rate) 


    now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    ticks = now - rate->start_ticks;

    bytes = muldiv64 (ticks, info->bytes_per_second, get_ticks_per_sec ());

    bytes = muldiv64(ticks, info->bytes_per_second, NANOSECONDS_PER_SECOND);

    samples = (bytes - rate->bytes_sent) >> info->shift;

    if (samples < 0 || samples > 65536) {

        error_report("Resetting rate control (%" PRId64 " samples)", samples);

audio/wavaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int wav_run_out (HWVoiceOut *hw, int live) 
    int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    int64_t ticks = now - wav->old_ticks;

    int64_t bytes =

        muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());

        muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);



    if (bytes > INT_MAX) {

        samples = INT_MAX >> hw->info.shift;

backends/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int baum_eat_packet(BaumDriverState *baum, const uint8_t *buf, int len) 


        /* Allow 100ms to complete the DisplayData packet */

        timer_mod(baum->cellCount_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +

                       get_ticks_per_sec() / 10);

                       NANOSECONDS_PER_SECOND / 10);

        for (i = 0; i < baum->x * baum->y ; i++) {

            EAT(c);

            cells[i] = c;