patchbot at xen
Apr 13, 2012, 9:33 AM
Views: 51
Permalink
|
|
[xen-unstable] libxl: Make libxl__zalloc et al tolerate a NULL gc
|
|
# HG changeset patch
# User Ian Jackson <ian.jackson [at] eu>
# Date 1334150054 -3600
# Node ID 6c3345d7e9d91e274c342d6687eae941163add5a
# Parent 26f72d923cb90fad0dd212348f5f8b85588780b0
libxl: Make libxl__zalloc et al tolerate a NULL gc
Arrange that if we pass NULL as a gc, we simply don't register the
pointer. This instantly gives us non-gc'ing but error-checking
versions of malloc, realloc, vasprintf, etc.
Signed-off-by: Ian Jackson <ian.jackson [at] eu>
Acked-by: Ian Campbell <ian.campbell [at] citrix>
Committed-by: Ian Jackson <Ian.Jackson [at] eu>
---
diff -r 26f72d923cb9 -r 6c3345d7e9d9 tools/libxl/libxl_internal.c
--- a/tools/libxl/libxl_internal.c Wed Apr 11 14:14:13 2012 +0100
+++ b/tools/libxl/libxl_internal.c Wed Apr 11 14:14:14 2012 +0100
@@ -34,6 +34,9 @@ void libxl__ptr_add(libxl__gc *gc, void
{
int i;
+ if (!gc)
+ return;
+
if (!ptr)
return;
@@ -101,7 +104,7 @@ void *libxl__realloc(libxl__gc *gc, void
if (ptr == NULL) {
libxl__ptr_add(gc, new_ptr);
- } else if (new_ptr != ptr) {
+ } else if (new_ptr != ptr && gc != NULL) {
for (i = 0; i < gc->alloc_maxsize; i++) {
if (gc->alloc_ptrs[i] == ptr) {
gc->alloc_ptrs[i] = new_ptr;
diff -r 26f72d923cb9 -r 6c3345d7e9d9 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Wed Apr 11 14:14:13 2012 +0100
+++ b/tools/libxl/libxl_internal.h Wed Apr 11 14:14:14 2012 +0100
@@ -384,30 +384,35 @@ static inline libxl_ctx *libxl__gc_owner
*
* All pointers returned by these functions are registered for garbage
* collection on exit from the outermost libxl callframe.
+ *
+ * However, where the argument is stated to be "gc_opt", NULL may be
+ * passed instead, in which case no garbage collection will occur; the
+ * pointer must later be freed with free(). This is for memory
+ * allocations of types (b) and (c).
*/
/* register @ptr in @gc for free on exit from outermost libxl callframe. */
-_hidden void libxl__ptr_add(libxl__gc *gc, void *ptr);
+_hidden void libxl__ptr_add(libxl__gc *gc_opt, void *ptr);
/* if this is the outermost libxl callframe then free all pointers in @gc */
_hidden void libxl__free_all(libxl__gc *gc);
/* allocate and zero @bytes. (similar to a gc'd malloc(3)+memzero()) */
-_hidden void *libxl__zalloc(libxl__gc *gc, int bytes);
+_hidden void *libxl__zalloc(libxl__gc *gc_opt, int bytes);
/* allocate and zero memory for an array of @nmemb members of @size each.
* (similar to a gc'd calloc(3)). */
-_hidden void *libxl__calloc(libxl__gc *gc, size_t nmemb, size_t size);
+_hidden void *libxl__calloc(libxl__gc *gc_opt, size_t nmemb, size_t size);
/* change the size of the memory block pointed to by @ptr to @new_size bytes.
* unlike other allocation functions here any additional space between the
* oldsize and @new_size is not initialised (similar to a gc'd realloc(3)). */
-_hidden void *libxl__realloc(libxl__gc *gc, void *ptr, size_t new_size);
+_hidden void *libxl__realloc(libxl__gc *gc_opt, void *ptr, size_t new_size);
/* print @fmt into an allocated string large enoughto contain the result.
* (similar to gc'd asprintf(3)). */
-_hidden char *libxl__sprintf(libxl__gc *gc, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3);
+_hidden char *libxl__sprintf(libxl__gc *gc_opt, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3);
/* duplicate the string @c (similar to a gc'd strdup(3)). */
-_hidden char *libxl__strdup(libxl__gc *gc, const char *c);
+_hidden char *libxl__strdup(libxl__gc *gc_opt, const char *c);
/* duplicate at most @n bytes of string @c (similar to a gc'd strndup(3)). */
-_hidden char *libxl__strndup(libxl__gc *gc, const char *c, size_t n);
+_hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n);
/* strip the last path component from @s and return as a newly allocated
* string. (similar to a gc'd dirname(3)). */
-_hidden char *libxl__dirname(libxl__gc *gc, const char *s);
+_hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s);
_hidden char **libxl__xs_kvs_of_flexarray(libxl__gc *gc, flexarray_t *array, int length);
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
[xen-unstable] libxl: Make libxl__zalloc et al tolerate a NULL gc