[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] Consolidate oom_check() functions
From: |
Jes . Sorensen |
Subject: |
[Qemu-devel] [PATCH 8/9] Consolidate oom_check() functions |
Date: |
Mon, 18 Oct 2010 10:15:53 +0200 |
From: Jes Sorensen <address@hidden>
This consolidates the duplicated oom_check() functions, as well as
splitting them into OS dependant versions to avoid the #ifdef
grossness that was present in the old osdep.c version.
Signed-off-by: Jes Sorensen <address@hidden>
---
Makefile.target | 2 +-
oslib-posix.c | 8 +++-----
oslib-win32.c | 6 +++---
qemu-common.h | 1 +
qemu-malloc.c | 14 +++-----------
5 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index c48cbcc..91e6e74 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -88,7 +88,7 @@ $(call set-vpath,
$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user
-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \
- qemu-malloc.o
+ qemu-malloc.o $(oslib-obj-y)
obj-$(TARGET_HAS_BFLT) += flatload.o
diff --git a/oslib-posix.c b/oslib-posix.c
index ad44b17..6e9b0c3 100644
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -31,8 +31,7 @@
#include "trace.h"
#include "qemu_socket.h"
-#if !defined(_POSIX_C_SOURCE) || defined(__sun__)
-static void *oom_check(void *ptr)
+void *qemu_oom_check(void *ptr)
{
if (ptr == NULL) {
fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno));
@@ -40,7 +39,6 @@ static void *oom_check(void *ptr)
}
return ptr;
}
-#endif
void *qemu_memalign(size_t alignment, size_t size)
{
@@ -54,9 +52,9 @@ void *qemu_memalign(size_t alignment, size_t size)
abort();
}
#elif defined(CONFIG_BSD)
- ptr = oom_check(valloc(size));
+ ptr = qemu_oom_check(valloc(size));
#else
- ptr = oom_check(memalign(alignment, size));
+ ptr = qemu_oom_check(memalign(alignment, size));
#endif
trace_qemu_memalign(alignment, size, ptr);
return ptr;
diff --git a/oslib-win32.c b/oslib-win32.c
index e03c472..ab29eae 100644
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -31,7 +31,7 @@
#include "trace.h"
#include "qemu_socket.h"
-static void *oom_check(void *ptr)
+void *qemu_oom_check(void *ptr)
{
if (ptr == NULL) {
fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError());
@@ -47,7 +47,7 @@ void *qemu_memalign(size_t alignment, size_t size)
if (!size) {
abort();
}
- ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
+ ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
trace_qemu_memalign(alignment, size, ptr);
return ptr;
}
@@ -62,7 +62,7 @@ void *qemu_vmalloc(size_t size)
if (!size) {
abort();
}
- ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
+ ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE));
trace_qemu_vmalloc(size, ptr);
return ptr;
}
diff --git a/qemu-common.h b/qemu-common.h
index 1f01a44..82fb59f 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -179,6 +179,7 @@ const char *path(const char *pathname);
int ffs(int i);
#endif
+void *qemu_oom_check(void *ptr);
void *qemu_malloc(size_t size);
void *qemu_realloc(void *ptr, size_t size);
void *qemu_mallocz(size_t size);
diff --git a/qemu-malloc.c b/qemu-malloc.c
index ecffb67..28fb05a 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -25,14 +25,6 @@
#include "trace.h"
#include <stdlib.h>
-static void *oom_check(void *ptr)
-{
- if (ptr == NULL) {
- abort();
- }
- return ptr;
-}
-
void qemu_free(void *ptr)
{
trace_qemu_free(ptr);
@@ -54,7 +46,7 @@ void *qemu_malloc(size_t size)
if (!size && !allow_zero_malloc()) {
abort();
}
- ptr = oom_check(malloc(size ? size : 1));
+ ptr = qemu_oom_check(malloc(size ? size : 1));
trace_qemu_malloc(size, ptr);
return ptr;
}
@@ -65,7 +57,7 @@ void *qemu_realloc(void *ptr, size_t size)
if (!size && !allow_zero_malloc()) {
abort();
}
- newptr = oom_check(realloc(ptr, size ? size : 1));
+ newptr = qemu_oom_check(realloc(ptr, size ? size : 1));
trace_qemu_realloc(ptr, size, newptr);
return newptr;
}
@@ -75,7 +67,7 @@ void *qemu_mallocz(size_t size)
if (!size && !allow_zero_malloc()) {
abort();
}
- return oom_check(calloc(1, size ? size : 1));
+ return qemu_oom_check(calloc(1, size ? size : 1));
}
char *qemu_strdup(const char *str)
--
1.7.2.3
- [Qemu-devel] [PATCH 2/9] Move osdep socket code to oslib-{posix, win32}.c, (continued)
- [Qemu-devel] [PATCH 2/9] Move osdep socket code to oslib-{posix, win32}.c, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 1/9] Move QEMU OS dependant library functions to OS specific files, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 3/9] qemu_pipe() is used only by POSIX code, so move to oslib-posix.c, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 4/9] We only support eventfd under POSIX, move qemu_eventfd() to os-posix.c, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 5/9] Move qemu_gettimeofday() to OS specific files, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 6/9] Do not redefine reserved key-words TRUE/FALSE, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 7/9] Separate qemu_pidfile() into OS specific versions, Jes . Sorensen, 2010/10/18
- [Qemu-devel] [PATCH 8/9] Consolidate oom_check() functions,
Jes . Sorensen <=
- [Qemu-devel] [PATCH 9/9] Remove unncessary includes, Jes . Sorensen, 2010/10/18
- [Qemu-devel] Re: [PATCH v3 0/9] Re-factor osdep code + macro and brace fixes, Paolo Bonzini, 2010/10/18