[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/7] virtiofsd: Changed allocations of fv_VuDev & its internal
From: |
Mahmoud Mandour |
Subject: |
[PATCH v2 5/7] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions |
Date: |
Tue, 20 Apr 2021 17:46:40 +0200 |
Changed the allocations of fv_VuDev structs, VuDev structs, and
fv_QueueInfo strcuts from using calloc()/realloc() & free() to using
the equivalent functions from GLib.
In instances, removed the pair of allocation and assertion for
non-NULL checking with a GLib function that aborts on error.
Removed NULL-checking for fv_VuDev struct allocation and used
a GLib function that crashes on error; namely, g_new0(). This
is because allocating one struct should not be a problem on an
healthy system. Also following the pattern of aborting-on-null
behaviour that is taken with allocating VuDev structs and
fv_QueueInfo structs.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tools/virtiofsd/fuse_virtio.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 07e5d91a9f..5828b9a76f 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -729,7 +729,7 @@ static void fv_queue_cleanup_thread(struct fv_VuDev *vud,
int qidx)
pthread_mutex_destroy(&ourqi->vq_lock);
close(ourqi->kill_fd);
ourqi->kick_fd = -1;
- free(vud->qi[qidx]);
+ g_free(vud->qi[qidx]);
vud->qi[qidx] = NULL;
}
@@ -760,15 +760,13 @@ static void fv_queue_set_started(VuDev *dev, int qidx,
bool started)
if (started) {
/* Fire up a thread to watch this queue */
if (qidx >= vud->nqueues) {
- vud->qi = realloc(vud->qi, (qidx + 1) * sizeof(vud->qi[0]));
- assert(vud->qi);
+ vud->qi = g_realloc_n(vud->qi, qidx + 1, sizeof(vud->qi[0]));
memset(vud->qi + vud->nqueues, 0,
sizeof(vud->qi[0]) * (1 + (qidx - vud->nqueues)));
vud->nqueues = qidx + 1;
}
if (!vud->qi[qidx]) {
- vud->qi[qidx] = calloc(sizeof(struct fv_QueueInfo), 1);
- assert(vud->qi[qidx]);
+ vud->qi[qidx] = g_new0(struct fv_QueueInfo, 1);
vud->qi[qidx]->virtio_dev = vud;
vud->qi[qidx]->qidx = qidx;
} else {
@@ -1034,12 +1032,7 @@ int virtio_session_mount(struct fuse_session *se)
__func__);
/* TODO: Some cleanup/deallocation! */
- se->virtio_dev = calloc(sizeof(struct fv_VuDev), 1);
- if (!se->virtio_dev) {
- fuse_log(FUSE_LOG_ERR, "%s: virtio_dev calloc failed\n", __func__);
- close(data_sock);
- return -1;
- }
+ se->virtio_dev = g_new0(struct fv_VuDev, 1);
se->vu_socketfd = data_sock;
se->virtio_dev->se = se;
@@ -1061,8 +1054,8 @@ void virtio_session_close(struct fuse_session *se)
return;
}
- free(se->virtio_dev->qi);
+ g_free(se->virtio_dev->qi);
pthread_rwlock_destroy(&se->virtio_dev->vu_dispatch_rwlock);
- free(se->virtio_dev);
+ g_free(se->virtio_dev);
se->virtio_dev = NULL;
}
--
2.25.1
- Re: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions, (continued)
- Re: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions, Mahmoud Mandour, 2021/04/27
- Re: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions, Dr. David Alan Gilbert, 2021/04/27
- [PATCH v3 2/7] virtiofsd: Changed allocations of iovec to GLib's functions, Mahmoud Mandour, 2021/04/27
- Re: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions, Mahmoud Mandour, 2021/04/27
- Re: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions, Dr. David Alan Gilbert, 2021/04/27
- Re: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions, Daniel P . Berrangé, 2021/04/27
[PATCH v2 3/7] virtiofsd: Changed allocations of fuse_session to GLib's functions, Mahmoud Mandour, 2021/04/20
[PATCH v2 4/7] virtiofsd: Changed allocation of lo_map_elems to GLib's functions, Mahmoud Mandour, 2021/04/20
[PATCH v2 6/7] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions, Mahmoud Mandour, 2021/04/20
[PATCH v2 7/7] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib, Mahmoud Mandour, 2021/04/20
[PATCH v2 5/7] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions,
Mahmoud Mandour <=