You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2021/07/04 21:51:23 UTC
[incubator-nuttx] branch master updated (ce20211 -> 7b54b75)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from ce20211 Fix various typos in comments and documentation
new c406e03 fs/tmpfs: Fix the memory corruption when reallocate tmpfs_directory_s
new 6a09ed0 fs/tmpfs: Remove the temporary strdup in all place
new 7b54b75 fs/tmpfs: Account the filename in the allocation block
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
fs/tmpfs/fs_tmpfs.c | 365 +++++++++++++++++++---------------------------------
fs/tmpfs/fs_tmpfs.h | 18 +--
2 files changed, 140 insertions(+), 243 deletions(-)
[incubator-nuttx] 03/03: fs/tmpfs: Account the filename in the
allocation block
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7b54b7502c2165b4628cf40438ef8681d1feeb0d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Jun 25 14:35:01 2021 +0800
fs/tmpfs: Account the filename in the allocation block
and caclulate the available block more accurately
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: Ia6382239f422970771ccefbd6e461241a5f995a5
---
fs/tmpfs/fs_tmpfs.c | 31 +++++++++++++++----------------
fs/tmpfs/fs_tmpfs.h | 2 +-
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index a60d70c..2fb5013 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -1094,7 +1094,8 @@ static int tmpfs_statfs_callout(FAR struct tmpfs_directory_s *tdo,
* for this object.
*/
- tmpbuf->tsf_alloc += to->to_alloc;
+ tmpbuf->tsf_alloc += to->to_alloc +
+ strlen(tdo->tdo_entry[index].tde_name) + 1;
/* Is this directory entry a file object? */
@@ -1108,13 +1109,12 @@ static int tmpfs_statfs_callout(FAR struct tmpfs_directory_s *tdo,
tmptfo = (FAR struct tmpfs_file_s *)to;
tmpbuf->tsf_alloc += sizeof(struct tmpfs_file_s);
- tmpbuf->tsf_inuse += tmptfo->tfo_size;
+ tmpbuf->tsf_avail += to->to_alloc - tmptfo->tfo_size;
tmpbuf->tsf_files++;
}
else /* if (to->to_type == TMPFS_DIRECTORY) */
{
FAR struct tmpfs_directory_s *tmptdo;
- size_t inuse;
size_t avail;
/* It is a directory object. Update the amount of memory in use
@@ -1122,11 +1122,11 @@ static int tmpfs_statfs_callout(FAR struct tmpfs_directory_s *tdo,
*/
tmptdo = (FAR struct tmpfs_directory_s *)to;
- inuse = SIZEOF_TMPFS_DIRECTORY(tmptdo->tdo_nentries);
- avail = tmptdo->tdo_alloc - inuse;
+ avail = tmptdo->tdo_alloc -
+ SIZEOF_TMPFS_DIRECTORY(tmptdo->tdo_nentries);
tmpbuf->tsf_alloc += sizeof(struct tmpfs_directory_s);
- tmpbuf->tsf_inuse += inuse;
+ tmpbuf->tsf_avail += avail;
tmpbuf->tsf_ffree += avail / sizeof(struct tmpfs_dirent_s);
}
@@ -2101,10 +2101,9 @@ static int tmpfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
FAR struct tmpfs_s *fs;
FAR struct tmpfs_directory_s *tdo;
struct tmpfs_statfs_s tmpbuf;
- size_t inuse;
size_t avail;
off_t blkalloc;
- off_t blkused;
+ off_t blkavail;
int ret;
finfo("mountpt: %p buf: %p\n", mountpt, buf);
@@ -2126,13 +2125,13 @@ static int tmpfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
/* Set up the memory use for the file system and root directory object */
tdo = (FAR struct tmpfs_directory_s *)fs->tfs_root.tde_object;
- inuse = sizeof(struct tmpfs_s) +
+ avail = tdo->tdo_alloc -
SIZEOF_TMPFS_DIRECTORY(tdo->tdo_nentries);
- avail = sizeof(struct tmpfs_s) +
- tdo->tdo_alloc - inuse;
- tmpbuf.tsf_alloc = tdo->tdo_alloc;
- tmpbuf.tsf_inuse = inuse;
+ tmpbuf.tsf_alloc = sizeof(struct tmpfs_s) +
+ sizeof(struct tmpfs_directory_s) +
+ tdo->tdo_alloc;
+ tmpbuf.tsf_avail = avail;
tmpbuf.tsf_files = 0;
tmpbuf.tsf_ffree = avail / sizeof(struct tmpfs_dirent_s);
@@ -2148,15 +2147,15 @@ static int tmpfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
blkalloc = (tmpbuf.tsf_alloc + CONFIG_FS_TMPFS_BLOCKSIZE - 1) /
CONFIG_FS_TMPFS_BLOCKSIZE;
- blkused = (tmpbuf.tsf_inuse + CONFIG_FS_TMPFS_BLOCKSIZE - 1) /
+ blkavail = (tmpbuf.tsf_avail + CONFIG_FS_TMPFS_BLOCKSIZE - 1) /
CONFIG_FS_TMPFS_BLOCKSIZE;
buf->f_type = TMPFS_MAGIC;
buf->f_namelen = NAME_MAX;
buf->f_bsize = CONFIG_FS_TMPFS_BLOCKSIZE;
buf->f_blocks = blkalloc;
- buf->f_bfree = blkalloc - blkused;
- buf->f_bavail = blkalloc - blkused;
+ buf->f_bfree = blkavail;
+ buf->f_bavail = blkavail;
buf->f_files = tmpbuf.tsf_files;
buf->f_ffree = tmpbuf.tsf_ffree;
diff --git a/fs/tmpfs/fs_tmpfs.h b/fs/tmpfs/fs_tmpfs.h
index 1ff08c3..27c1eb7 100644
--- a/fs/tmpfs/fs_tmpfs.h
+++ b/fs/tmpfs/fs_tmpfs.h
@@ -156,7 +156,7 @@ struct tmpfs_s
struct tmpfs_statfs_s
{
size_t tsf_alloc; /* Total memory allocated */
- size_t tsf_inuse; /* Total memory in use */
+ size_t tsf_avail; /* Total memory available */
off_t tsf_files; /* Total file nodes in the file system */
off_t tsf_ffree; /* Free directory nodes in the file system */
};
[incubator-nuttx] 01/03: fs/tmpfs: Fix the memory corruption when
reallocate tmpfs_directory_s
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c406e03cfe8a847061f0f59a4dcdc1b33c2e7651
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jun 24 22:55:08 2021 +0800
fs/tmpfs: Fix the memory corruption when reallocate tmpfs_directory_s
since it's hard to adjust all childern to point back the new parent
location. Let's allocate the dynamical part(e.g. tdo_entry) separately
and remove the back pointer.
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I53afb8336360b7845bd8ecb5aa908acea20e7797
---
fs/tmpfs/fs_tmpfs.c | 164 ++++++++++++++++++----------------------------------
fs/tmpfs/fs_tmpfs.h | 16 ++---
2 files changed, 61 insertions(+), 119 deletions(-)
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index 089156a..a360c6e 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -76,9 +76,9 @@ static void tmpfs_unlock_reentrant(FAR struct tmpfs_sem_s *sem);
static void tmpfs_unlock(FAR struct tmpfs_s *fs);
static int tmpfs_lock_object(FAR struct tmpfs_object_s *to);
static void tmpfs_unlock_object(FAR struct tmpfs_object_s *to);
-static int tmpfs_realloc_directory(FAR struct tmpfs_directory_s **tdo,
+static int tmpfs_realloc_directory(FAR struct tmpfs_directory_s *tdo,
unsigned int nentries);
-static int tmpfs_realloc_file(FAR struct tmpfs_file_s **tfo,
+static int tmpfs_realloc_file(FAR struct tmpfs_file_s *tfo,
size_t newsize);
static void tmpfs_release_lockedobject(FAR struct tmpfs_object_s *to);
static void tmpfs_release_lockedfile(FAR struct tmpfs_file_s *tfo);
@@ -86,7 +86,7 @@ static int tmpfs_find_dirent(FAR struct tmpfs_directory_s *tdo,
FAR const char *name);
static int tmpfs_remove_dirent(FAR struct tmpfs_directory_s *tdo,
FAR const char *name);
-static int tmpfs_add_dirent(FAR struct tmpfs_directory_s **tdo,
+static int tmpfs_add_dirent(FAR struct tmpfs_directory_s *tdo,
FAR struct tmpfs_object_s *to, FAR const char *name);
static FAR struct tmpfs_file_s *tmpfs_alloc_file(void);
static int tmpfs_create_file(FAR struct tmpfs_s *fs,
@@ -293,24 +293,23 @@ static void tmpfs_unlock_object(FAR struct tmpfs_object_s *to)
* Name: tmpfs_realloc_directory
****************************************************************************/
-static int tmpfs_realloc_directory(FAR struct tmpfs_directory_s **tdo,
+static int tmpfs_realloc_directory(FAR struct tmpfs_directory_s *tdo,
unsigned int nentries)
{
- FAR struct tmpfs_directory_s *oldtdo = *tdo;
- FAR struct tmpfs_directory_s *newtdo;
+ FAR struct tmpfs_dirent_s *newentry;
size_t objsize;
- int ret = oldtdo->tdo_nentries;
+ int ret = tdo->tdo_nentries;
/* Get the new object size */
objsize = SIZEOF_TMPFS_DIRECTORY(nentries);
- if (objsize <= oldtdo->tdo_alloc)
+ if (objsize <= tdo->tdo_alloc)
{
/* Already big enough.
* REVISIT: Missing logic to shrink directory objects.
*/
- oldtdo->tdo_nentries = nentries;
+ tdo->tdo_nentries = nentries;
return ret;
}
@@ -322,22 +321,17 @@ static int tmpfs_realloc_directory(FAR struct tmpfs_directory_s **tdo,
/* Realloc the directory object */
- newtdo = (FAR struct tmpfs_directory_s *)kmm_realloc(oldtdo, objsize);
- if (newtdo == NULL)
+ newentry = kmm_realloc(tdo->tdo_entry, objsize);
+ if (newentry == NULL)
{
return -ENOMEM;
}
- /* Adjust the reference in the parent directory entry */
-
- DEBUGASSERT(newtdo->tdo_dirent);
- newtdo->tdo_dirent->tde_object = (FAR struct tmpfs_object_s *)newtdo;
-
/* Return the new address of the reallocated directory object */
- newtdo->tdo_alloc = objsize;
- newtdo->tdo_nentries = nentries;
- *tdo = newtdo;
+ tdo->tdo_alloc = objsize;
+ tdo->tdo_nentries = nentries;
+ tdo->tdo_entry = newentry;
/* Return the index to the first, newly allocated directory entry */
@@ -348,22 +342,16 @@ static int tmpfs_realloc_directory(FAR struct tmpfs_directory_s **tdo,
* Name: tmpfs_realloc_file
****************************************************************************/
-static int tmpfs_realloc_file(FAR struct tmpfs_file_s **tfo,
+static int tmpfs_realloc_file(FAR struct tmpfs_file_s *tfo,
size_t newsize)
{
- FAR struct tmpfs_file_s *oldtfo = *tfo;
- FAR struct tmpfs_file_s *newtfo;
- size_t objsize;
+ FAR uint8_t *newdata;
size_t allocsize;
size_t delta;
- /* Check if the current allocation is sufficient */
-
- objsize = SIZEOF_TMPFS_FILE(newsize);
-
/* Are we growing or shrinking the object? */
- if (objsize <= oldtfo->tfo_alloc)
+ if (newsize <= tfo->tfo_alloc)
{
/* Shrinking ... Shrink unconditionally if the size is shrinking to
* zero.
@@ -375,12 +363,12 @@ static int tmpfs_realloc_file(FAR struct tmpfs_file_s **tfo,
* lot.
*/
- delta = oldtfo->tfo_alloc - objsize;
+ delta = tfo->tfo_alloc - newsize;
if (delta <= CONFIG_FS_TMPFS_FILE_FREEGUARD)
{
/* Hasn't shrunk enough.. Return doing nothing for now */
- oldtfo->tfo_size = newsize;
+ tfo->tfo_size = newsize;
return OK;
}
}
@@ -390,26 +378,21 @@ static int tmpfs_realloc_file(FAR struct tmpfs_file_s **tfo,
* reallocations.
*/
- allocsize = objsize + CONFIG_FS_TMPFS_FILE_ALLOCGUARD;
+ allocsize = newsize + CONFIG_FS_TMPFS_FILE_ALLOCGUARD;
/* Realloc the file object */
- newtfo = (FAR struct tmpfs_file_s *)kmm_realloc(oldtfo, allocsize);
- if (newtfo == NULL)
+ newdata = kmm_realloc(tfo->tfo_data, allocsize);
+ if (newdata == NULL)
{
return -ENOMEM;
}
- /* Adjust the reference in the parent directory entry */
-
- DEBUGASSERT(newtfo->tfo_dirent);
- newtfo->tfo_dirent->tde_object = (FAR struct tmpfs_object_s *)newtfo;
-
/* Return the new address of the reallocated file object */
- newtfo->tfo_alloc = allocsize;
- newtfo->tfo_size = newsize;
- *tfo = newtfo;
+ tfo->tfo_alloc = allocsize;
+ tfo->tfo_size = newsize;
+ tfo->tfo_data = newdata;
return OK;
}
@@ -449,6 +432,7 @@ static void tmpfs_release_lockedfile(FAR struct tmpfs_file_s *tfo)
if (tfo->tfo_refs == 1 && (tfo->tfo_flags & TFO_FLAG_UNLINKED) != 0)
{
nxsem_destroy(&tfo->tfo_exclsem.ts_sem);
+ kmm_free(tfo->tfo_data);
kmm_free(tfo);
}
@@ -512,22 +496,7 @@ static int tmpfs_remove_dirent(FAR struct tmpfs_directory_s *tdo,
last = tdo->tdo_nentries - 1;
if (index != last)
{
- FAR struct tmpfs_dirent_s *newtde;
- FAR struct tmpfs_dirent_s *oldtde;
- FAR struct tmpfs_object_s *to;
-
- /* Move the directory entry */
-
- newtde = &tdo->tdo_entry[index];
- oldtde = &tdo->tdo_entry[last];
- to = oldtde->tde_object;
-
- newtde->tde_object = to;
- newtde->tde_name = oldtde->tde_name;
-
- /* Reset the backward link to the directory entry */
-
- to->to_dirent = newtde;
+ tdo->tdo_entry[index] = tdo->tdo_entry[last];
}
/* And decrement the count of directory entries */
@@ -540,12 +509,10 @@ static int tmpfs_remove_dirent(FAR struct tmpfs_directory_s *tdo,
* Name: tmpfs_add_dirent
****************************************************************************/
-static int tmpfs_add_dirent(FAR struct tmpfs_directory_s **tdo,
+static int tmpfs_add_dirent(FAR struct tmpfs_directory_s *tdo,
FAR struct tmpfs_object_s *to,
FAR const char *name)
{
- FAR struct tmpfs_directory_s *oldtdo;
- FAR struct tmpfs_directory_s *newtdo;
FAR struct tmpfs_dirent_s *tde;
FAR char *newname;
unsigned int nentries;
@@ -563,8 +530,7 @@ static int tmpfs_add_dirent(FAR struct tmpfs_directory_s **tdo,
/* Get the new number of entries */
- oldtdo = *tdo;
- nentries = oldtdo->tdo_nentries + 1;
+ nentries = tdo->tdo_nentries + 1;
/* Reallocate the directory object (if necessary) */
@@ -577,14 +543,10 @@ static int tmpfs_add_dirent(FAR struct tmpfs_directory_s **tdo,
/* Save the new object info in the new directory entry */
- newtdo = *tdo;
- tde = &newtdo->tdo_entry[index];
+ tde = &tdo->tdo_entry[index];
tde->tde_object = to;
tde->tde_name = newname;
- /* Add backward link to the directory entry to the object */
-
- to->to_dirent = tde;
return OK;
}
@@ -595,12 +557,10 @@ static int tmpfs_add_dirent(FAR struct tmpfs_directory_s **tdo,
static FAR struct tmpfs_file_s *tmpfs_alloc_file(void)
{
FAR struct tmpfs_file_s *tfo;
- size_t allocsize;
/* Create a new zero length file object */
- allocsize = SIZEOF_TMPFS_FILE(CONFIG_FS_TMPFS_FILE_ALLOCGUARD);
- tfo = (FAR struct tmpfs_file_s *)kmm_malloc(allocsize);
+ tfo = (FAR struct tmpfs_file_s *)kmm_malloc(sizeof(*tfo));
if (tfo == NULL)
{
return NULL;
@@ -610,11 +570,12 @@ static FAR struct tmpfs_file_s *tmpfs_alloc_file(void)
* locked with one reference count.
*/
- tfo->tfo_alloc = allocsize;
+ tfo->tfo_alloc = 0;
tfo->tfo_type = TMPFS_REGULAR;
tfo->tfo_refs = 1;
tfo->tfo_flags = 0;
tfo->tfo_size = 0;
+ tfo->tfo_data = NULL;
tfo->tfo_exclsem.ts_holder = getpid();
tfo->tfo_exclsem.ts_count = 1;
@@ -718,7 +679,7 @@ static int tmpfs_create_file(FAR struct tmpfs_s *fs,
/* Then add the new, empty file to the directory */
- ret = tmpfs_add_dirent(&parent, (FAR struct tmpfs_object_s *)newtfo, name);
+ ret = tmpfs_add_dirent(parent, (FAR struct tmpfs_object_s *)newtfo, name);
if (ret < 0)
{
goto errout_with_file;
@@ -757,19 +718,10 @@ errout_with_copy:
static FAR struct tmpfs_directory_s *tmpfs_alloc_directory(void)
{
FAR struct tmpfs_directory_s *tdo;
- size_t allocsize;
- unsigned int nentries;
-
- /* Convert the pre-allocated memory to a number of directory entries */
-
- nentries = (CONFIG_FS_TMPFS_DIRECTORY_ALLOCGUARD +
- sizeof(struct tmpfs_dirent_s) - 1) /
- sizeof(struct tmpfs_dirent_s);
/* Create a new zero length directory object */
- allocsize = SIZEOF_TMPFS_DIRECTORY(nentries);
- tdo = (FAR struct tmpfs_directory_s *)kmm_malloc(allocsize);
+ tdo = (FAR struct tmpfs_directory_s *)kmm_malloc(sizeof(*tdo));
if (tdo == NULL)
{
return NULL;
@@ -777,10 +729,11 @@ static FAR struct tmpfs_directory_s *tmpfs_alloc_directory(void)
/* Initialize the new directory object */
- tdo->tdo_alloc = allocsize;
+ tdo->tdo_alloc = 0;
tdo->tdo_type = TMPFS_DIRECTORY;
tdo->tdo_refs = 0;
tdo->tdo_nentries = 0;
+ tdo->tdo_entry = NULL;
tdo->tdo_exclsem.ts_holder = TMPFS_NO_HOLDER;
tdo->tdo_exclsem.ts_count = 0;
@@ -880,7 +833,7 @@ static int tmpfs_create_directory(FAR struct tmpfs_s *fs,
/* Then add the new, empty file to the directory */
- ret = tmpfs_add_dirent(&parent, (FAR struct tmpfs_object_s *)newtdo, name);
+ ret = tmpfs_add_dirent(parent, (FAR struct tmpfs_object_s *)newtdo, name);
if (ret < 0)
{
goto errout_with_directory;
@@ -1189,6 +1142,7 @@ static int tmpfs_statfs_callout(FAR struct tmpfs_directory_s *tdo,
*/
tmptfo = (FAR struct tmpfs_file_s *)to;
+ tmpbuf->tsf_alloc += sizeof(struct tmpfs_file_s);
tmpbuf->tsf_inuse += tmptfo->tfo_size;
tmpbuf->tsf_files++;
}
@@ -1206,6 +1160,7 @@ static int tmpfs_statfs_callout(FAR struct tmpfs_directory_s *tdo,
inuse = SIZEOF_TMPFS_DIRECTORY(tmptdo->tdo_nentries);
avail = tmptdo->tdo_alloc - inuse;
+ tmpbuf->tsf_alloc += sizeof(struct tmpfs_directory_s);
tmpbuf->tsf_inuse += inuse;
tmpbuf->tsf_ffree += avail / sizeof(struct tmpfs_dirent_s);
}
@@ -1240,20 +1195,9 @@ static int tmpfs_free_callout(FAR struct tmpfs_directory_s *tdo,
if (index != last)
{
- FAR struct tmpfs_dirent_s *oldtde;
- FAR struct tmpfs_object_s *oldto;
-
/* Move the directory entry */
- oldtde = &tdo->tdo_entry[last];
- oldto = oldtde->tde_object;
-
- tde->tde_object = oldto;
- tde->tde_name = oldtde->tde_name;
-
- /* Reset the backward link to the directory entry */
-
- oldto->to_dirent = tde;
+ *tde = tdo->tdo_entry[last];
}
/* And decrement the count of directory entries */
@@ -1275,6 +1219,14 @@ static int tmpfs_free_callout(FAR struct tmpfs_directory_s *tdo,
tfo->tfo_flags |= TFO_FLAG_UNLINKED;
return TMPFS_UNLINKED;
}
+
+ kmm_free(tfo->tfo_data);
+ }
+ else /* if (to->to_type == TMPFS_DIRECTORY) */
+ {
+ tdo = (FAR struct tmpfs_directory_s *)to;
+
+ kmm_free(tdo->tdo_entry);
}
/* Free the object now */
@@ -1441,7 +1393,7 @@ static int tmpfs_open(FAR struct file *filep, FAR const char *relpath,
if (tfo->tfo_size > 0)
{
- ret = tmpfs_realloc_file(&tfo, 0);
+ ret = tmpfs_realloc_file(tfo, 0);
if (ret < 0)
{
goto errout_with_filelock;
@@ -1561,6 +1513,7 @@ static int tmpfs_close(FAR struct file *filep)
* have any other references.
*/
+ kmm_free(tfo->tfo_data);
kmm_free(tfo);
return OK;
}
@@ -1662,13 +1615,11 @@ static ssize_t tmpfs_write(FAR struct file *filep, FAR const char *buffer,
{
/* Reallocate the file to handle the write past the end of the file. */
- ret = tmpfs_realloc_file(&tfo, (size_t)endpos);
+ ret = tmpfs_realloc_file(tfo, (size_t)endpos);
if (ret < 0)
{
goto errout_with_lock;
}
-
- filep->f_priv = tfo;
}
/* Copy data from the memory object to the user buffer */
@@ -1892,14 +1843,12 @@ static int tmpfs_truncate(FAR struct file *filep, off_t length)
{
/* The size is changing.. up or down. Reallocate the file memory. */
- ret = tmpfs_realloc_file(&tfo, (size_t)length);
+ ret = tmpfs_realloc_file(tfo, (size_t)length);
if (ret < 0)
{
goto errout_with_lock;
}
- filep->f_priv = tfo;
-
/* If the size has increased, then we need to zero the newly added
* memory.
*/
@@ -2127,10 +2076,6 @@ static int tmpfs_bind(FAR struct inode *blkdriver, FAR const void *data,
fs->tfs_root.tde_object = (FAR struct tmpfs_object_s *)tdo;
fs->tfs_root.tde_name = "";
- /* Set up the backward link (to support reallocation) */
-
- tdo->tdo_dirent = &fs->tfs_root;
-
/* Initialize the file system state */
fs->tfs_exclsem.ts_holder = TMPFS_NO_HOLDER;
@@ -2174,6 +2119,7 @@ static int tmpfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
/* Now we can destroy the root file system and the file system itself. */
nxsem_destroy(&tdo->tdo_exclsem.ts_sem);
+ kmm_free(tdo->tdo_entry);
kmm_free(tdo);
nxsem_destroy(&fs->tfs_exclsem.ts_sem);
@@ -2341,6 +2287,7 @@ static int tmpfs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
else
{
nxsem_destroy(&tfo->tfo_exclsem.ts_sem);
+ kmm_free(tfo->tfo_data);
kmm_free(tfo);
}
@@ -2475,6 +2422,7 @@ static int tmpfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
/* Free the directory object */
nxsem_destroy(&tdo->tdo_exclsem.ts_sem);
+ kmm_free(tdo->tdo_entry);
kmm_free(tdo);
/* Release the reference and lock on the parent directory */
@@ -2629,7 +2577,7 @@ static int tmpfs_rename(FAR struct inode *mountpt,
/* Add an entry to the new parent directory. */
- ret = tmpfs_add_dirent(&newparent, to, newname);
+ ret = tmpfs_add_dirent(newparent, to, newname);
errout_with_oldparent:
oldparent->tdo_refs--;
diff --git a/fs/tmpfs/fs_tmpfs.h b/fs/tmpfs/fs_tmpfs.h
index 9c3d330..1ff08c3 100644
--- a/fs/tmpfs/fs_tmpfs.h
+++ b/fs/tmpfs/fs_tmpfs.h
@@ -87,7 +87,6 @@ struct tmpfs_dirent_s
struct tmpfs_object_s
{
- FAR struct tmpfs_dirent_s *to_dirent;
struct tmpfs_sem_s to_exclsem;
size_t to_alloc; /* Allocated size of the memory object */
@@ -101,7 +100,6 @@ struct tmpfs_directory_s
{
/* First fields must match common TMPFS object layout */
- FAR struct tmpfs_dirent_s *tdo_dirent;
struct tmpfs_sem_s tdo_exclsem;
size_t tdo_alloc; /* Allocated size of the directory object */
@@ -111,11 +109,10 @@ struct tmpfs_directory_s
/* Remaining fields are unique to a directory object */
uint16_t tdo_nentries; /* Number of directory entries */
- struct tmpfs_dirent_s tdo_entry[1];
+ FAR struct tmpfs_dirent_s *tdo_entry;
};
-#define SIZEOF_TMPFS_DIRECTORY(n) \
- (sizeof(struct tmpfs_directory_s) + ((n) - 1) * sizeof(struct tmpfs_dirent_s))
+#define SIZEOF_TMPFS_DIRECTORY(n) ((n) * sizeof(struct tmpfs_dirent_s))
/* The form of a regular file memory object
*
@@ -129,7 +126,6 @@ struct tmpfs_file_s
{
/* First fields must match common TMPFS object layout */
- FAR struct tmpfs_dirent_s *tfo_dirent;
struct tmpfs_sem_s tfo_exclsem;
size_t tfo_alloc; /* Allocated size of the file object */
@@ -138,13 +134,11 @@ struct tmpfs_file_s
/* Remaining fields are unique to a directory object */
- uint8_t tfo_flags; /* See TFO_FLAG_* definitions */
- size_t tfo_size; /* Valid file size */
- uint8_t tfo_data[1]; /* File data starts here */
+ uint8_t tfo_flags; /* See TFO_FLAG_* definitions */
+ size_t tfo_size; /* Valid file size */
+ FAR uint8_t *tfo_data; /* File data starts here */
};
-#define SIZEOF_TMPFS_FILE(n) (sizeof(struct tmpfs_file_s) + (n) - 1)
-
/* This structure represents one instance of a TMPFS file system */
struct tmpfs_s
[incubator-nuttx] 02/03: fs/tmpfs: Remove the temporary strdup in
all place
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6a09ed09f1d5fd8dcc28c08b9109883d6b2149e7
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Jun 25 00:21:08 2021 +0800
fs/tmpfs: Remove the temporary strdup in all place
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I224cc9d4ec5fd08937f9f2ddfff022866090be29
---
fs/tmpfs/fs_tmpfs.c | 170 +++++++++++++++++++---------------------------------
1 file changed, 63 insertions(+), 107 deletions(-)
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index a360c6e..a60d70c 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -83,7 +83,7 @@ static int tmpfs_realloc_file(FAR struct tmpfs_file_s *tfo,
static void tmpfs_release_lockedobject(FAR struct tmpfs_object_s *to);
static void tmpfs_release_lockedfile(FAR struct tmpfs_file_s *tfo);
static int tmpfs_find_dirent(FAR struct tmpfs_directory_s *tdo,
- FAR const char *name);
+ FAR const char *name, size_t len);
static int tmpfs_remove_dirent(FAR struct tmpfs_directory_s *tdo,
FAR const char *name);
static int tmpfs_add_dirent(FAR struct tmpfs_directory_s *tdo,
@@ -95,14 +95,15 @@ static FAR struct tmpfs_directory_s *tmpfs_alloc_directory(void);
static int tmpfs_create_directory(FAR struct tmpfs_s *fs,
FAR const char *relpath, FAR struct tmpfs_directory_s **tdo);
static int tmpfs_find_object(FAR struct tmpfs_s *fs,
- FAR const char *relpath, FAR struct tmpfs_object_s **object,
+ FAR const char *relpath, size_t len,
+ FAR struct tmpfs_object_s **object,
FAR struct tmpfs_directory_s **parent);
static int tmpfs_find_file(FAR struct tmpfs_s *fs,
FAR const char *relpath,
FAR struct tmpfs_file_s **tfo,
FAR struct tmpfs_directory_s **parent);
static int tmpfs_find_directory(FAR struct tmpfs_s *fs,
- FAR const char *relpath,
+ FAR const char *relpath, size_t len,
FAR struct tmpfs_directory_s **tdo,
FAR struct tmpfs_directory_s **parent);
static int tmpfs_statfs_callout(FAR struct tmpfs_directory_s *tdo,
@@ -450,7 +451,7 @@ static void tmpfs_release_lockedfile(FAR struct tmpfs_file_s *tfo)
****************************************************************************/
static int tmpfs_find_dirent(FAR struct tmpfs_directory_s *tdo,
- FAR const char *name)
+ FAR const char *name, size_t len)
{
int i;
@@ -458,7 +459,8 @@ static int tmpfs_find_dirent(FAR struct tmpfs_directory_s *tdo,
for (i = 0;
i < tdo->tdo_nentries &&
- strcmp(tdo->tdo_entry[i].tde_name, name) != 0;
+ (strncmp(tdo->tdo_entry[i].tde_name, name, len) != 0 ||
+ tdo->tdo_entry[i].tde_name[len] != 0);
i++);
/* Return what we found, if anything */
@@ -478,7 +480,7 @@ static int tmpfs_remove_dirent(FAR struct tmpfs_directory_s *tdo,
/* Search the list of directory entries for a match */
- index = tmpfs_find_dirent(tdo, name);
+ index = tmpfs_find_dirent(tdo, name, strlen(name));
if (index < 0)
{
return index;
@@ -594,28 +596,19 @@ static int tmpfs_create_file(FAR struct tmpfs_s *fs,
{
FAR struct tmpfs_directory_s *parent;
FAR struct tmpfs_file_s *newtfo;
- FAR char *copy;
- FAR char *name;
+ FAR const char *name;
int ret;
- /* Duplicate the path variable so that we can modify it */
-
- copy = strdup(relpath);
- if (copy == NULL)
- {
- return -ENOMEM;
- }
-
/* Separate the path into the file name and the path to the parent
* directory.
*/
- name = strrchr(copy, '/');
+ name = strrchr(relpath, '/');
if (name == NULL)
{
/* No subdirectories... use the root directory */
- name = copy;
+ name = relpath;
parent = (FAR struct tmpfs_directory_s *)fs->tfs_root.tde_object;
/* Lock the root directory to emulate the behavior of
@@ -625,7 +618,6 @@ static int tmpfs_create_file(FAR struct tmpfs_s *fs,
ret = tmpfs_lock_directory(parent);
if (ret < 0)
{
- kmm_free(copy);
return ret;
}
@@ -633,25 +625,25 @@ static int tmpfs_create_file(FAR struct tmpfs_s *fs,
}
else
{
- /* Terminate the parent directory path */
-
- *name++ = '\0';
-
/* Locate the parent directory that should contain this name.
* On success, tmpfs_find_directory() will lock the parent
* directory and increment the reference count.
*/
- ret = tmpfs_find_directory(fs, copy, &parent, NULL);
+ ret = tmpfs_find_directory(fs, relpath, name - relpath, &parent, NULL);
if (ret < 0)
{
- goto errout_with_copy;
+ return ret;
}
+
+ /* Skip the '/' path separator */
+
+ name++;
}
/* Verify that no object of this name already exists in the directory */
- ret = tmpfs_find_dirent(parent, name);
+ ret = tmpfs_find_dirent(parent, name, strlen(name));
if (ret != -ENOENT)
{
/* Something with this name already exists in the directory.
@@ -690,9 +682,8 @@ static int tmpfs_create_file(FAR struct tmpfs_s *fs,
parent->tdo_refs--;
tmpfs_unlock_directory(parent);
- /* Free the copy of the relpath and return success */
+ /* Return success */
- kmm_free(copy);
*tfo = newtfo;
return OK;
@@ -705,9 +696,6 @@ errout_with_file:
errout_with_parent:
parent->tdo_refs--;
tmpfs_unlock_directory(parent);
-
-errout_with_copy:
- kmm_free(copy);
return ret;
}
@@ -752,34 +740,24 @@ static int tmpfs_create_directory(FAR struct tmpfs_s *fs,
{
FAR struct tmpfs_directory_s *parent;
FAR struct tmpfs_directory_s *newtdo;
- FAR char *copy;
- FAR char *name;
+ FAR const char *name;
int ret;
- /* Duplicate the path variable so that we can modify it */
-
- copy = strdup(relpath);
- if (copy == NULL)
- {
- return -ENOMEM;
- }
-
/* Separate the path into the file name and the path to the parent
* directory.
*/
- name = strrchr(copy, '/');
+ name = strrchr(relpath, '/');
if (name == NULL)
{
/* No subdirectories... use the root directory */
- name = copy;
+ name = relpath;
parent = (FAR struct tmpfs_directory_s *)fs->tfs_root.tde_object;
ret = tmpfs_lock_directory(parent);
if (ret < 0)
{
- kmm_free(copy);
return ret;
}
@@ -787,25 +765,25 @@ static int tmpfs_create_directory(FAR struct tmpfs_s *fs,
}
else
{
- /* Terminate the parent directory path */
-
- *name++ = '\0';
-
/* Locate the parent directory that should contain this name.
* On success, tmpfs_find_directory() will lockthe parent
* directory and increment the reference count.
*/
- ret = tmpfs_find_directory(fs, copy, &parent, NULL);
+ ret = tmpfs_find_directory(fs, relpath, name - relpath, &parent, NULL);
if (ret < 0)
{
- goto errout_with_copy;
+ return ret;
}
+
+ /* Skip the '/' path separator */
+
+ name++;
}
/* Verify that no object of this name already exists in the directory */
- ret = tmpfs_find_dirent(parent, name);
+ ret = tmpfs_find_dirent(parent, name, strlen(name));
if (ret != -ENOENT)
{
/* Something with this name already exists in the directory.
@@ -845,7 +823,6 @@ static int tmpfs_create_directory(FAR struct tmpfs_s *fs,
parent->tdo_refs--;
tmpfs_unlock_directory(parent);
- kmm_free(copy);
/* Return the (unlocked, unreferenced) directory object to the caller */
@@ -865,9 +842,6 @@ errout_with_directory:
errout_with_parent:
parent->tdo_refs--;
tmpfs_unlock_directory(parent);
-
-errout_with_copy:
- kmm_free(copy);
return ret;
}
@@ -876,43 +850,40 @@ errout_with_copy:
****************************************************************************/
static int tmpfs_find_object(FAR struct tmpfs_s *fs,
- FAR const char *relpath,
+ FAR const char *relpath, size_t len,
FAR struct tmpfs_object_s **object,
FAR struct tmpfs_directory_s **parent)
{
FAR struct tmpfs_object_s *to = NULL;
FAR struct tmpfs_directory_s *tdo = NULL;
FAR struct tmpfs_directory_s *next_tdo;
- FAR char *segment;
- FAR char *next_segment;
- FAR char *tkptr;
- FAR char *copy;
+ FAR const char *segment;
+ FAR const char *next_segment;
int index;
int ret;
- /* Make a copy of the path (so that we can modify it via strtok) */
-
- copy = strdup(relpath);
- if (copy == NULL)
- {
- return -ENOMEM;
- }
-
/* Traverse the file system for any object with the matching name */
to = fs->tfs_root.tde_object;
next_tdo = (FAR struct tmpfs_directory_s *)fs->tfs_root.tde_object;
- for (segment = strtok_r(copy, "/", &tkptr);
- segment != NULL;
- segment = next_segment)
+ for (segment = relpath; len != 0; segment = next_segment + 1)
{
/* Get the next segment after the one we are currently working on.
* This will be NULL is we are working on the final segment of the
* relpath.
*/
- next_segment = strtok_r(NULL, "/", &tkptr);
+ next_segment = memchr(segment, '/', len);
+ if (next_segment)
+ {
+ len -= next_segment + 1 - segment;
+ }
+ else
+ {
+ next_segment = segment + len;
+ len = 0;
+ }
/* Search the next directory. */
@@ -922,12 +893,11 @@ static int tmpfs_find_object(FAR struct tmpfs_s *fs,
* directory.
*/
- index = tmpfs_find_dirent(tdo, segment);
+ index = tmpfs_find_dirent(tdo, segment, next_segment - segment);
if (index < 0)
{
/* No object with this name exists in the directory. */
- kmm_free(copy);
return index;
}
@@ -939,7 +909,7 @@ static int tmpfs_find_object(FAR struct tmpfs_s *fs,
{
/* No. Was this the final segment in the path? */
- if (next_segment == NULL)
+ if (len == 0)
{
/* Then we can break out of the loop now */
@@ -951,7 +921,6 @@ static int tmpfs_find_object(FAR struct tmpfs_s *fs,
* segments do no correspond to directories.
*/
- kmm_free(copy);
return -ENOTDIR;
}
@@ -968,10 +937,6 @@ static int tmpfs_find_object(FAR struct tmpfs_s *fs,
* Increment the reference count on the located object.
*/
- /* Free the dup'ed string */
-
- kmm_free(copy);
-
/* Return what we found */
if (parent)
@@ -1034,7 +999,7 @@ static int tmpfs_find_file(FAR struct tmpfs_s *fs,
* reference count on both.
*/
- ret = tmpfs_find_object(fs, relpath, &to, parent);
+ ret = tmpfs_find_object(fs, relpath, strlen(relpath), &to, parent);
if (ret >= 0)
{
/* We found it... but is it a regular file? */
@@ -1069,7 +1034,7 @@ static int tmpfs_find_file(FAR struct tmpfs_s *fs,
****************************************************************************/
static int tmpfs_find_directory(FAR struct tmpfs_s *fs,
- FAR const char *relpath,
+ FAR const char *relpath, size_t len,
FAR struct tmpfs_directory_s **tdo,
FAR struct tmpfs_directory_s **parent)
{
@@ -1078,7 +1043,7 @@ static int tmpfs_find_directory(FAR struct tmpfs_s *fs,
/* Find the object at this path */
- ret = tmpfs_find_object(fs, relpath, &to, parent);
+ ret = tmpfs_find_object(fs, relpath, len, &to, parent);
if (ret >= 0)
{
/* We found it... but is it a regular file? */
@@ -1907,7 +1872,7 @@ static int tmpfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
* lock on the returned directory.
*/
- ret = tmpfs_find_directory(fs, relpath, &tdo, NULL);
+ ret = tmpfs_find_directory(fs, relpath, strlen(relpath), &tdo, NULL);
if (ret >= 0)
{
dir->u.tmpfs.tf_tdo = tdo;
@@ -2377,7 +2342,7 @@ static int tmpfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
* on each.
*/
- ret = tmpfs_find_directory(fs, relpath, &tdo, &parent);
+ ret = tmpfs_find_directory(fs, relpath, strlen(relpath), &tdo, &parent);
if (ret < 0)
{
goto errout_with_lock;
@@ -2458,8 +2423,7 @@ static int tmpfs_rename(FAR struct inode *mountpt,
FAR struct tmpfs_object_s *to;
FAR struct tmpfs_s *fs;
FAR const char *oldname;
- FAR char *newname;
- FAR char *copy;
+ FAR const char *newname;
int ret;
finfo("mountpt: %p oldrelpath: %s newrelpath: %s\n",
@@ -2471,20 +2435,11 @@ static int tmpfs_rename(FAR struct inode *mountpt,
fs = mountpt->i_private;
DEBUGASSERT(fs != NULL && fs->tfs_root.tde_object != NULL);
- /* Duplicate the newpath variable so that we can modify it */
-
- copy = strdup(newrelpath);
- if (copy == NULL)
- {
- return -ENOMEM;
- }
-
/* Get exclusive access to the file system */
ret = tmpfs_lock(fs);
if (ret < 0)
{
- kmm_free(copy);
return ret;
}
@@ -2492,12 +2447,12 @@ static int tmpfs_rename(FAR struct inode *mountpt,
* parent directory.
*/
- newname = strrchr(copy, '/');
+ newname = strrchr(newrelpath, '/');
if (newname == NULL)
{
/* No subdirectories... use the root directory */
- newname = copy;
+ newname = newrelpath;
newparent = (FAR struct tmpfs_directory_s *)fs->tfs_root.tde_object;
tmpfs_lock_directory(newparent);
@@ -2505,27 +2460,28 @@ static int tmpfs_rename(FAR struct inode *mountpt,
}
else
{
- /* Terminate the parent directory path */
-
- *newname++ = '\0';
-
/* Locate the parent directory that should contain this name.
* On success, tmpfs_find_directory() will lockthe parent
* directory and increment the reference count.
*/
- ret = tmpfs_find_directory(fs, copy, &newparent, NULL);
+ ret = tmpfs_find_directory(fs, newrelpath, newname - newrelpath,
+ &newparent, NULL);
if (ret < 0)
{
goto errout_with_lock;
}
+
+ /* Skip the '/' path separator */
+
+ newname++;
}
/* Verify that no object of this name already exists in the destination
* directory.
*/
- ret = tmpfs_find_dirent(newparent, newname);
+ ret = tmpfs_find_dirent(newparent, newname, strlen(newname));
if (ret != -ENOENT)
{
/* Something with this name already exists in the directory.
@@ -2545,7 +2501,8 @@ static int tmpfs_rename(FAR struct inode *mountpt,
* the reference count on both.
*/
- ret = tmpfs_find_object(fs, oldrelpath, &to, &oldparent);
+ ret = tmpfs_find_object(fs, oldrelpath, strlen(oldrelpath),
+ &to, &oldparent);
if (ret < 0)
{
goto errout_with_newparent;
@@ -2591,7 +2548,6 @@ errout_with_newparent:
errout_with_lock:
tmpfs_unlock(fs);
- kmm_free(copy);
return ret;
}
@@ -2675,7 +2631,7 @@ static int tmpfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
* reference count on the object.
*/
- ret = tmpfs_find_object(fs, relpath, &to, NULL);
+ ret = tmpfs_find_object(fs, relpath, strlen(relpath), &to, NULL);
if (ret < 0)
{
goto errout_with_fslock;