mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: switch from g_slice allocator to malloc

Browse Source 
Simplify memory allocation by sticking with a single API.  GSlice
is not that fast anyway (tcmalloc/jemalloc are better).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-10-01 13:04:39 +02:00 committed by Stefan Hajnoczi
parent a9718ef000
commit c84b31926f
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/io.c
View File

@ -2218,7 +2218,7 @@ void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
{ {
BlockAIOCB *acb; BlockAIOCB *acb;
acb = g_slice_alloc(aiocb_info->aiocb_size); acb = g_malloc(aiocb_info->aiocb_size);
acb->aiocb_info = aiocb_info; acb->aiocb_info = aiocb_info;
acb->bs = bs; acb->bs = bs;
acb->cb = cb; acb->cb = cb;
@ -2238,7 +2238,7 @@ void qemu_aio_unref(void *p)
BlockAIOCB *acb = p; BlockAIOCB *acb = p;
assert(acb->refcnt > 0); assert(acb->refcnt > 0);
if (--acb->refcnt == 0) { if (--acb->refcnt == 0) {
g_slice_free1(acb->aiocb_info->aiocb_size, acb); g_free(acb);
} }
} }

4
block/mirror.c
View File

@ -113,7 +113,7 @@ static void mirror_iteration_done(MirrorOp *op, int ret)
} }
qemu_iovec_destroy(&op->qiov); qemu_iovec_destroy(&op->qiov);
g_slice_free(MirrorOp, op); g_free(op);
if (s->waiting_for_io) { if (s->waiting_for_io) {
qemu_coroutine_enter(s->common.co, NULL); qemu_coroutine_enter(s->common.co, NULL);
@ -264,7 +264,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
} while (delay_ns == 0 && next_sector < end); } while (delay_ns == 0 && next_sector < end);
/* Allocate a MirrorOp that is used as an AIO callback. */ /* Allocate a MirrorOp that is used as an AIO callback. */
op = g_slice_new(MirrorOp); op = g_new(MirrorOp, 1);
op->s = s; op->s = s;
op->sector_num = sector_num; op->sector_num = sector_num;
op->nb_sectors = nb_sectors; op->nb_sectors = nb_sectors;

8
block/raw-posix.c
View File

@ -1259,7 +1259,7 @@ static int aio_worker(void *arg)
break; break;
} }
g_slice_free(RawPosixAIOData, aiocb); g_free(aiocb);
return ret; return ret;
} }
@ -1267,7 +1267,7 @@ static int paio_submit_co(BlockDriverState *bs, int fd,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
int type) int type)
{ {
RawPosixAIOData *acb = g_slice_new(RawPosixAIOData); RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
ThreadPool *pool; ThreadPool *pool;
acb->bs = bs; acb->bs = bs;
@ -1292,7 +1292,7 @@ static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
BlockCompletionFunc *cb, void *opaque, int type) BlockCompletionFunc *cb, void *opaque, int type)
{ {
RawPosixAIOData *acb = g_slice_new(RawPosixAIOData); RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);
ThreadPool *pool; ThreadPool *pool;
acb->bs = bs; acb->bs = bs;
@ -2237,7 +2237,7 @@ static BlockAIOCB *hdev_aio_ioctl(BlockDriverState *bs,
if (fd_open(bs) < 0) if (fd_open(bs) < 0)
return NULL; return NULL;
acb = g_slice_new(RawPosixAIOData); acb = g_new(RawPosixAIOData, 1);
acb->bs = bs; acb->bs = bs;
acb->aio_type = QEMU_AIO_IOCTL; acb->aio_type = QEMU_AIO_IOCTL;
acb->aio_fildes = s->fd; acb->aio_fildes = s->fd;

4
block/raw-win32.c
View File

@ -135,7 +135,7 @@ static int aio_worker(void *arg)
break; break;
} }
g_slice_free(RawWin32AIOData, aiocb); g_free(aiocb);
return ret; return ret;
} }
@ -143,7 +143,7 @@ static BlockAIOCB *paio_submit(BlockDriverState *bs, HANDLE hfile,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
BlockCompletionFunc *cb, void *opaque, int type) BlockCompletionFunc *cb, void *opaque, int type)
{ {
RawWin32AIOData *acb = g_slice_new(RawWin32AIOData); RawWin32AIOData *acb = g_new(RawWin32AIOData, 1);
ThreadPool *pool; ThreadPool *pool;
acb->bs = bs; acb->bs = bs;

4
hw/block/virtio-blk.c
View File

@ -30,7 +30,7 @@
VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s) VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s)
{ {
VirtIOBlockReq *req = g_slice_new(VirtIOBlockReq); VirtIOBlockReq *req = g_new(VirtIOBlockReq, 1);
req->dev = s; req->dev = s;
req->qiov.size = 0; req->qiov.size = 0;
req->in_len = 0; req->in_len = 0;
@ -42,7 +42,7 @@ VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s)
void virtio_blk_free_request(VirtIOBlockReq *req) void virtio_blk_free_request(VirtIOBlockReq *req)
{ {
if (req) { if (req) {
g_slice_free(VirtIOBlockReq, req); g_free(req);
} }
} }