Commit c57c846a authored by Blue Swirl's avatar Blue Swirl
Browse files

qemu-timer: move commonly used timer code to qemu-timer-common 



Move timer init functions to a new file, qemu-timer-common.c. Make other
critical timer functions inlined to preserve performance in
qemu-timer.c, also move muldiv64() (used by the inline functions)
to qemu-timer.h.

Adjust block/raw-posix.c and simpletrace.c to use get_clock() directly.
Remove a similar/duplicate definition in qemu-tool.c.

Adjust hw/omap_clk.c to include qemu-timer.h because muldiv64() is used
there.

After this change, tracing can be used also for user code and
simpletrace on Win32.

Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 2b2e59e6

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ version-obj-$(CONFIG_WIN32) += version.o 
qemu-img.o: qemu-img-cmds.h

qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)



qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)

qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o



qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)

qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o



qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)

qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o



qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx

	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")

Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ common-obj-y += iov.o acl.o 
common-obj-$(CONFIG_THREAD) += qemu-thread.o

common-obj-$(CONFIG_IOTHREAD) += compatfd.o

common-obj-y += notify.o event_notifier.o

common-obj-y += qemu-timer.o

common-obj-y += qemu-timer.o qemu-timer-common.o



slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o

slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
@@ -278,6 +278,7 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o 
trace-obj-y = trace.o

ifeq ($(TRACE_BACKEND),simple)

trace-obj-y += simpletrace.o

user-obj-y += qemu-timer-common.o

endif



vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)

block/raw-posix.c

+6 −6
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ 
#define FTYPE_CD     1

#define FTYPE_FD     2



/* if the FD is not accessed during that time (in ms), we try to

/* if the FD is not accessed during that time (in ns), we try to

   reopen it to see if the disk has been changed */

#define FD_OPEN_TIMEOUT 1000

#define FD_OPEN_TIMEOUT (1000000000)



#define MAX_BLOCKSIZE	4096
@@ -908,7 +908,7 @@ static int fd_open(BlockDriverState *bs) 
        return 0;

    last_media_present = (s->fd >= 0);

    if (s->fd >= 0 &&

        (qemu_get_clock(rt_clock) - s->fd_open_time) >= FD_OPEN_TIMEOUT) {

        (get_clock() - s->fd_open_time) >= FD_OPEN_TIMEOUT) {

        close(s->fd);

        s->fd = -1;

#ifdef DEBUG_FLOPPY
@@ -917,7 +917,7 @@ static int fd_open(BlockDriverState *bs) 
    }

    if (s->fd < 0) {

        if (s->fd_got_error &&

            (qemu_get_clock(rt_clock) - s->fd_error_time) < FD_OPEN_TIMEOUT) {

            (get_clock() - s->fd_error_time) < FD_OPEN_TIMEOUT) {

#ifdef DEBUG_FLOPPY

            printf("No floppy (open delayed)\n");

#endif
@@ -925,7 +925,7 @@ static int fd_open(BlockDriverState *bs) 
        }

        s->fd = open(bs->filename, s->open_flags & ~O_NONBLOCK);

        if (s->fd < 0) {

            s->fd_error_time = qemu_get_clock(rt_clock);

            s->fd_error_time = get_clock();

            s->fd_got_error = 1;

            if (last_media_present)

                s->fd_media_changed = 1;
@@ -940,7 +940,7 @@ static int fd_open(BlockDriverState *bs) 
    }

    if (!last_media_present)

        s->fd_media_changed = 1;

    s->fd_open_time = qemu_get_clock(rt_clock);

    s->fd_open_time = get_clock();

    s->fd_got_error = 0;

    return 0;

}

hw/omap_clk.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */

#include "hw.h"

#include "omap.h"

#include "qemu-timer.h" /* for muldiv64() */



struct clk {

    const char *name;

qemu-common.h

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ void qemu_bh_delete(QEMUBH *bh); 
int qemu_bh_poll(void);

void qemu_bh_update_timeout(int *timeout);



uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);



void qemu_get_timedate(struct tm *tm, int offset);

int qemu_timedate_diff(struct tm *tm);