From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3Mio-00012n-2W for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:34:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3Mij-00056d-UT for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:34:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3Mij-00055k-Nu for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:34:13 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 78280688 for ; Mon, 30 Nov 2015 11:34:13 +0000 (UTC) From: Peter Xu Date: Mon, 30 Nov 2015 19:32:17 +0800 Message-Id: <1448883140-20249-10-git-send-email-peterx@redhat.com> In-Reply-To: <1448883140-20249-1-git-send-email-peterx@redhat.com> References: <1448883140-20249-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v3 09/12] DumpState: adding total_size and written_size fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: drjones@redhat.com, lersek@redhat.com, armbru@redhat.com, peterx@redhat.com, lcapitulino@redhat.com, famz@redhat.com, pbonzini@redhat.com Here, total_size is the size in bytes to be dumped (raw data, which means before compression), while written_size are bytes handled (raw size too). Signed-off-by: Peter Xu --- dump.c | 32 ++++++++++++++++++++++++++++++++ include/sysemu/dump.h | 9 +++++++++ 2 files changed, 41 insertions(+) diff --git a/dump.c b/dump.c index 43f565d..56a2d7e 100644 --- a/dump.c +++ b/dump.c @@ -333,6 +333,8 @@ static void write_data(DumpState *s, void *buf, int length, Error **errp) if (ret < 0) { error_setg(errp, "dump: failed to save memory"); } + + s->written_size += length; } /* write the memory to vmcore. 1 page per I/O. */ @@ -1301,6 +1303,7 @@ static void write_dump_pages(DumpState *s, Error **errp) goto out; } } + s->written_size += TARGET_PAGE_SIZE; } ret = write_cache(&page_desc, NULL, 0, true); @@ -1443,6 +1446,30 @@ bool dump_in_progress(void) return (state->status == DUMP_STATUS_ACTIVE); } +/* calculate total size of memory to be dumped (taking filter into + * acoount.) */ +static size_t dump_calculate_size(DumpState *s) +{ + GuestPhysBlock *block; + int64_t size = 0, total = 0, left = 0, right = 0; + + QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) { + if (s->has_filter) { + /* calculate the overlapped region. */ + left = MAX(s->begin, block->target_start); + right = MIN(s->begin + s->length, block->target_end); + size = right - left; + size = size > 0 ? size : 0; + } else { + /* count the whole region in */ + size = (block->target_end - block->target_start); + } + total += size; + } + + return total; +} + static void dump_init(DumpState *s, int fd, bool has_format, DumpGuestMemoryFormat format, bool paging, bool has_filter, int64_t begin, int64_t length, Error **errp) @@ -1454,6 +1481,7 @@ static void dump_init(DumpState *s, int fd, bool has_format, s->has_format = has_format; s->format = format; + s->written_size = 0; /* kdump-compressed is conflict with paging and filter */ if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) { @@ -1485,6 +1513,10 @@ static void dump_init(DumpState *s, int fd, bool has_format, guest_phys_blocks_init(&s->guest_phys_blocks); guest_phys_blocks_append(&s->guest_phys_blocks); + s->total_size = dump_calculate_size(s); +#ifdef DEBUG_DUMP_GUEST_MEMORY + fprintf(stderr, "DUMP: total memory to dump: %lu\n", s->total_size); +#endif s->start = get_start_block(s); if (s->start == -1) { diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h index 31930c6..9c5a46b 100644 --- a/include/sysemu/dump.h +++ b/include/sysemu/dump.h @@ -189,6 +189,15 @@ typedef struct DumpState { bool has_format; /* whether format is provided */ DumpGuestMemoryFormat format; /* valid only if has_format == true */ QemuThread dump_thread; /* thread for detached dump */ + + size_t total_size; /* total memory size (in bytes) to + * be dumped. When filter is + * enabled, this will only count + * those to be written. */ + size_t written_size; /* written memory size (in bytes), + * this could be used to calculate + * how many work we have + * finished. */ } DumpState; uint16_t cpu_to_dump16(DumpState *s, uint16_t val); -- 2.4.3