[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -V4 28/28] use readdir_r instead of readdir for reen
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH -V4 28/28] use readdir_r instead of readdir for reentrancy |
Date: |
Mon, 8 Aug 2011 22:36:55 +0530 |
From: Harsh Prateek Bora <address@hidden>
Signed-off-by: Harsh Prateek Bora <address@hidden>
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
fsdev/file-op-9p.h | 2 +-
hw/9pfs/codir.c | 8 ++++----
hw/9pfs/virtio-9p-coth.h | 4 ++--
hw/9pfs/virtio-9p-local.c | 7 ++++---
hw/9pfs/virtio-9p.c | 22 ++++++++++++++++------
5 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h
index af9daf7..1eda342 100644
--- a/fsdev/file-op-9p.h
+++ b/fsdev/file-op-9p.h
@@ -78,7 +78,7 @@ typedef struct FileOperations
int (*open2)(FsContext *, const char *, int, FsCred *);
void (*rewinddir)(FsContext *, DIR *);
off_t (*telldir)(FsContext *, DIR *);
- struct dirent *(*readdir)(FsContext *, DIR *);
+ int (*readdir_r)(FsContext *, DIR *, struct dirent *, struct dirent **);
void (*seekdir)(FsContext *, DIR *, off_t);
ssize_t (*preadv)(FsContext *, int, const struct iovec *, int, off_t);
ssize_t (*pwritev)(FsContext *, int, const struct iovec *, int, off_t);
diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c
index 0c31db3..3a257b9 100644
--- a/hw/9pfs/codir.c
+++ b/hw/9pfs/codir.c
@@ -17,16 +17,16 @@
#include "qemu-coroutine.h"
#include "virtio-9p-coth.h"
-int v9fs_co_readdir(V9fsState *s, V9fsFidState *fidp, struct dirent **dent)
+int v9fs_co_readdir_r(V9fsState *s, V9fsFidState *fidp, struct dirent *dent,
+ struct dirent **result)
{
int err;
v9fs_co_run_in_worker(
{
errno = 0;
- /*FIXME!! need to switch to readdir_r */
- *dent = s->ops->readdir(&s->ctx, fidp->fs.dir);
- if (!*dent && errno) {
+ err = s->ops->readdir_r(&s->ctx, fidp->fs.dir, dent, result);
+ if (!*result && errno) {
err = -errno;
} else {
err = 0;
diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h
index 5fa2972..48defb7 100644
--- a/hw/9pfs/virtio-9p-coth.h
+++ b/hw/9pfs/virtio-9p-coth.h
@@ -57,8 +57,8 @@ typedef struct V9fsThPool {
extern void co_run_in_worker_bh(void *);
extern int v9fs_init_worker_threads(void);
extern int v9fs_co_readlink(V9fsState *, V9fsString *, V9fsString *);
-extern int v9fs_co_readdir(V9fsState *, V9fsFidState *,
- struct dirent **);
+extern int v9fs_co_readdir_r(V9fsState *, V9fsFidState *,
+ struct dirent *, struct dirent **result);
extern off_t v9fs_co_telldir(V9fsState *, V9fsFidState *);
extern void v9fs_co_seekdir(V9fsState *, V9fsFidState *, off_t);
extern void v9fs_co_rewinddir(V9fsState *, V9fsFidState *);
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index 77904c3..61cbf8d 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -165,9 +165,10 @@ static off_t local_telldir(FsContext *ctx, DIR *dir)
return telldir(dir);
}
-static struct dirent *local_readdir(FsContext *ctx, DIR *dir)
+static int local_readdir_r(FsContext *ctx, DIR *dir, struct dirent *entry,
+ struct dirent **result)
{
- return readdir(dir);
+ return readdir_r(dir, entry, result);
}
static void local_seekdir(FsContext *ctx, DIR *dir, off_t off)
@@ -532,7 +533,7 @@ FileOperations local_ops = {
.opendir = local_opendir,
.rewinddir = local_rewinddir,
.telldir = local_telldir,
- .readdir = local_readdir,
+ .readdir_r = local_readdir_r,
.seekdir = local_seekdir,
.preadv = local_preadv,
.pwritev = local_pwritev,
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index f64083e..e2aa863 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1498,17 +1498,20 @@ static int v9fs_do_readdir_with_stat(V9fsState *s,
V9fsPDU *pdu,
int32_t count = 0;
struct stat stbuf;
off_t saved_dir_pos;
- struct dirent *dent;
+ struct dirent *dent, *result;
/* save the directory position */
saved_dir_pos = v9fs_co_telldir(s, fidp);
if (saved_dir_pos < 0) {
return saved_dir_pos;
}
+
+ dent = qemu_malloc(sizeof(struct dirent));
+
while (1) {
v9fs_string_init(&name);
- err = v9fs_co_readdir(s, fidp, &dent);
- if (err || !dent) {
+ err = v9fs_co_readdir_r(s, fidp, dent, &result);
+ if (err || !result) {
break;
}
v9fs_string_sprintf(&name, "%s/%s", fidp->path.data, dent->d_name);
@@ -1527,6 +1530,7 @@ static int v9fs_do_readdir_with_stat(V9fsState *s,
V9fsPDU *pdu,
v9fs_co_seekdir(s, fidp, saved_dir_pos);
v9fs_stat_free(&v9stat);
v9fs_string_free(&name);
+ qemu_free(dent);
return count;
}
count += len;
@@ -1535,6 +1539,7 @@ static int v9fs_do_readdir_with_stat(V9fsState *s,
V9fsPDU *pdu,
saved_dir_pos = dent->d_off;
}
out:
+ qemu_free(dent);
v9fs_string_free(&name);
if (err < 0) {
return err;
@@ -1632,16 +1637,19 @@ static int v9fs_do_readdir(V9fsState *s, V9fsPDU *pdu,
int len, err = 0;
int32_t count = 0;
off_t saved_dir_pos;
- struct dirent *dent;
+ struct dirent *dent, *result;
/* save the directory position */
saved_dir_pos = v9fs_co_telldir(s, fidp);
if (saved_dir_pos < 0) {
return saved_dir_pos;
}
+
+ dent = qemu_malloc(sizeof(struct dirent));
+
while (1) {
- err = v9fs_co_readdir(s, fidp, &dent);
- if (err || !dent) {
+ err = v9fs_co_readdir_r(s, fidp, dent, &result);
+ if (err || !result) {
break;
}
v9fs_string_init(&name);
@@ -1650,6 +1658,7 @@ static int v9fs_do_readdir(V9fsState *s, V9fsPDU *pdu,
/* Ran out of buffer. Set dir back to old position and return */
v9fs_co_seekdir(s, fidp, saved_dir_pos);
v9fs_string_free(&name);
+ qemu_free(dent);
return count;
}
/*
@@ -1671,6 +1680,7 @@ static int v9fs_do_readdir(V9fsState *s, V9fsPDU *pdu,
v9fs_string_free(&name);
saved_dir_pos = dent->d_off;
}
+ qemu_free(dent);
if (err < 0) {
return err;
}
--
1.7.4.1
- [Qemu-devel] [PATCH -V4 25/28] hw/9pfs: Update v9fs_attach to use coroutines, (continued)
- [Qemu-devel] [PATCH -V4 25/28] hw/9pfs: Update v9fs_attach to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 15/28] hw/9pfs: Update v9fs_fsync to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 19/28] [virtio-9p] clean up v9fs_symlink, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 04/28] hw/9pfs: Update v9fs_getlock to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 13/28] hw/9pfs: Update v9fs_clunk to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 05/28] hw/9pfs: Add yield support for open and opendir coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 17/28] [virtio-9p] clean up v9fs_create Rearrange the code, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 12/28] hw/9pfs: Add yeild support for clunk related coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 21/28] [virtio-9p] coroutine and threading for v9fs_do_link, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 20/28] [virtio-9p] coroutine and threading for v9fs_do_symlink, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 28/28] use readdir_r instead of readdir for reentrancy,
Aneesh Kumar K.V <=
- [Qemu-devel] [PATCH -V4 24/28] hw/9pfs: Update v9fs_wstat to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 01/28] hw/9pfs: Update vfs_rename to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 08/28] [virtio-9p] clean up v9fs_lcreate, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 23/28] hw/9pfs: Update v9fs_write to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 14/28] hw/9pfs: Add yield support for fsync coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 22/28] hw/9pfs: Add yield support for pwritev coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 03/28] hw/9pfs: Update v9fs_lock to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 16/28] [virtio-9p] Remove post functions for v9fs_create, Aneesh Kumar K.V, 2011/08/08
- Re: [Qemu-devel] [PATCHSET 2] VirtFS coroutine changes, Aneesh Kumar K.V, 2011/08/11