Ian Campbell
2012-Oct-16 15:49 UTC
[PATCH] libxl: Use libxl__realloc in a couple of places in libxl_events.c
# HG changeset patch
# User Ian Campbell <ijc@hellion.org.uk>
# Date 1350402378 -3600
# Node ID fd0989ae4407fe630b93e9dd8ec15eea07c7825b
# Parent 33487389f7f24f91ee4ff03bddfd8eb0b2c47ce1
libxl: Use libxl__realloc in a couple of places in libxl_events.c
This avoids us having to think about the error handling on failure.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
diff -r 33487389f7f2 -r fd0989ae4407 tools/libxl/libxl_event.c
--- a/tools/libxl/libxl_event.c Tue Oct 16 16:45:43 2012 +0100
+++ b/tools/libxl/libxl_event.c Tue Oct 16 16:46:18 2012 +0100
@@ -489,7 +489,8 @@ int libxl__ev_xswatch_register(libxl__gc
int newarraysize = (CTX->watch_nslots + 1) << 2;
int i;
libxl__ev_watch_slot *newarray -
realloc(CTX->watch_slots, sizeof(*newarray) * newarraysize);
+ libxl__realloc(NOGC,
+ CTX->watch_slots, sizeof(*newarray) *
newarraysize);
if (!newarray) goto out_nomem;
for (i = CTX->watch_nslots; i < newarraysize; i++)
LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots,
@@ -1343,7 +1344,7 @@ static int eventloop_iteration(libxl__eg
struct pollfd *newarray (nfds > INT_MAX / sizeof(struct
pollfd) / 2) ? 0 :
- realloc(poller->fd_polls, sizeof(*newarray) * nfds);
+ libxl__realloc(NOGC, poller->fd_polls, sizeof(*newarray) *
nfds);
if (!newarray) { rc = ERROR_NOMEM; goto out; }
Ian Jackson
2012-Oct-19 10:54 UTC
Re: [PATCH] libxl: Use libxl__realloc in a couple of places in libxl_events.c
Ian Campbell writes ("[PATCH] libxl: Use libxl__realloc in a couple of
places in libxl_events.c"):> libxl: Use libxl__realloc in a couple of places in libxl_events.c
>
> This avoids us having to think about the error handling on failure.
As far as it goes,
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
But...
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>
> diff -r 33487389f7f2 -r fd0989ae4407 tools/libxl/libxl_event.c
> --- a/tools/libxl/libxl_event.c Tue Oct 16 16:45:43 2012 +0100
> +++ b/tools/libxl/libxl_event.c Tue Oct 16 16:46:18 2012 +0100
> @@ -489,7 +489,8 @@ int libxl__ev_xswatch_register(libxl__gc
> int newarraysize = (CTX->watch_nslots + 1) << 2;
> int i;
> libxl__ev_watch_slot *newarray > -
realloc(CTX->watch_slots, sizeof(*newarray) * newarraysize);
> + libxl__realloc(NOGC,
> + CTX->watch_slots, sizeof(*newarray) *
newarraysize);
> if (!newarray) goto out_nomem;
So did you want to remove the error exits then too ?
> - realloc(poller->fd_polls, sizeof(*newarray) * nfds);
> + libxl__realloc(NOGC, poller->fd_polls, sizeof(*newarray) *
nfds);
>
> if (!newarray) { rc = ERROR_NOMEM; goto out; }
And here.
Ian.
Ian Jackson
2012-Oct-25 16:05 UTC
Re: [PATCH] libxl: Use libxl__realloc in a couple of places in libxl_events.c
Ian Jackson writes ("Re: [Xen-devel] [PATCH] libxl: Use libxl__realloc in a
couple of places in libxl_events.c"):> Ian Campbell writes ("[PATCH] libxl: Use libxl__realloc in a couple of
places in libxl_events.c"):
> > libxl: Use libxl__realloc in a couple of places in libxl_events.c
> >
> > This avoids us having to think about the error handling on failure.
>
> As far as it goes,
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian.