qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, david@redhat.com, lvivier@redhat.com,
	maozhongyi@cmss.chinamobile.com, mreitz@redhat.com,
	pannengyuan@huawei.com
Cc: stefanha@redhat.com, quintela@redhat.com
Subject: [PULL 04/12] tests/migration: mem leak fix
Date: Wed, 17 Jun 2020 19:37:25 +0100	[thread overview]
Message-ID: <20200617183733.186168-5-dgilbert@redhat.com> (raw)
In-Reply-To: <20200617183733.186168-1-dgilbert@redhat.com>

From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>

‘data’ has the possibility of memory leaks, so use the
glib macros g_autofree recommended by CODING_STYLE.rst
to automatically release the memory that returned from
g_malloc().

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200603080904.997083-2-maozhongyi@cmss.chinamobile.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 tests/migration/stress.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/tests/migration/stress.c b/tests/migration/stress.c
index 0c23964693..f9626d50ee 100644
--- a/tests/migration/stress.c
+++ b/tests/migration/stress.c
@@ -170,26 +170,14 @@ static unsigned long long now(void)
 static int stressone(unsigned long long ramsizeMB)
 {
     size_t pagesPerMB = 1024 * 1024 / PAGE_SIZE;
-    char *ram = malloc(ramsizeMB * 1024 * 1024);
+    g_autofree char *ram = g_malloc(ramsizeMB * 1024 * 1024);
     char *ramptr;
     size_t i, j, k;
-    char *data = malloc(PAGE_SIZE);
+    g_autofree char *data = g_malloc(PAGE_SIZE);
     char *dataptr;
     size_t nMB = 0;
     unsigned long long before, after;
 
-    if (!ram) {
-        fprintf(stderr, "%s (%05d): ERROR: cannot allocate %llu MB of RAM: %s\n",
-                argv0, gettid(), ramsizeMB, strerror(errno));
-        return -1;
-    }
-    if (!data) {
-        fprintf(stderr, "%s (%d): ERROR: cannot allocate %d bytes of RAM: %s\n",
-                argv0, gettid(), PAGE_SIZE, strerror(errno));
-        free(ram);
-        return -1;
-    }
-
     /* We don't care about initial state, but we do want
      * to fault it all into RAM, otherwise the first iter
      * of the loop below will be quite slow. We can't use
@@ -198,8 +186,6 @@ static int stressone(unsigned long long ramsizeMB)
     memset(ram, 0xfe, ramsizeMB * 1024 * 1024);
 
     if (random_bytes(data, PAGE_SIZE) < 0) {
-        free(ram);
-        free(data);
         return -1;
     }
 
@@ -227,9 +213,6 @@ static int stressone(unsigned long long ramsizeMB)
             }
         }
     }
-
-    free(data);
-    free(ram);
 }
 
 
-- 
2.26.2



  parent reply	other threads:[~2020-06-17 18:39 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-17 18:37 [PULL 00/12] migration, HMP and virtiofs queue Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 01/12] virtiofsd: Whitelist fchmod Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 02/12] qom-hmp-cmds: fix a memleak in hmp_qom_get Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 03/12] hmp: Make json format optional for qom-set Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` Dr. David Alan Gilbert (git) [this message]
2020-06-17 18:37 ` [PULL 05/12] tests/migration: fix unreachable path in stress test Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 06/12] monitor/hmp-cmds: add units for migrate_parameters Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 07/12] monitor/hmp-cmds: don't silently output when running 'migrate_set_downtime' fails Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 08/12] monitor/hmp-cmds: delete redundant Error check before invoke hmp_handle_error() Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 09/12] monitor/hmp-cmds: add 'goto end' to reduce duplicate code Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 10/12] monitor/hmp-cmds: improvements for the 'info migrate' Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 11/12] docs/xbzrle: update 'cache miss rate' and 'encoding rate' to docs Dr. David Alan Gilbert (git)
2020-06-17 18:37 ` [PULL 12/12] migration: fix multifd_send_pages() next channel Dr. David Alan Gilbert (git)
2020-06-17 19:09 ` [PULL 00/12] migration, HMP and virtiofs queue no-reply
2020-06-18 15:51 ` Peter Maydell

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=20200617183733.186168-5-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=david@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=maozhongyi@cmss.chinamobile.com \
    --cc=mreitz@redhat.com \
    --cc=pannengyuan@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --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).