ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Filesystem: Adopted dynamic allocation of files over static allocation

pull/3773/head
Christopher Haster 2017-02-23 10:44:28 -06:00
parent c4649afba5
commit 274460bef5
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
platform/mbed_retarget.cpp
View File

@ -86,9 +86,6 @@ uint32_t mbed_heap_size = 0;
* (or rather index+3, as filehandles 0-2 are stdin/out/err). * (or rather index+3, as filehandles 0-2 are stdin/out/err).
*/ */
static FileLike *filehandles[OPEN_MAX]; static FileLike *filehandles[OPEN_MAX];
#if MBED_CONF_FILESYSTEM_PRESENT
static File fileobjects[OPEN_MAX];
#endif
static SingletonPtr<PlatformMutex> filehandle_mutex; static SingletonPtr<PlatformMutex> filehandle_mutex;
namespace mbed { namespace mbed {
@ -162,6 +159,27 @@ extern "C" WEAK void mbed_sdk_init(void);
extern "C" WEAK void mbed_sdk_init(void) { extern "C" WEAK void mbed_sdk_init(void) {
} }
#if MBED_CONF_FILESYSTEM_PRESENT
// Internally used file objects with managed memory on close
class ManagedFile : public File {
public:
virtual int close() {
int err = File::close();
delete this;
return err;
}
};
class ManagedDir : public Dir {
public:
virtual int close() {
int err = Dir::close();
delete this;
return err;
}
};
#endif
/* @brief standard c library fopen() retargeting function. /* @brief standard c library fopen() retargeting function.
* *
* This function is invoked by the standard c library retargeting to handle fopen() * This function is invoked by the standard c library retargeting to handle fopen()
@ -251,11 +269,13 @@ extern "C" FILEHANDLE PREFIX(_open)(const char* name, int openmode) {
return -1; return -1;
} }
int posix_mode = openmode_to_posix(openmode); int posix_mode = openmode_to_posix(openmode);
int err = fileobjects[fh_i].open(fs, path.fileName(), posix_mode); File *file = new ManagedFile;
int err = file->open(fs, path.fileName(), posix_mode);
if (err < 0) { if (err < 0) {
errno = -err; errno = -err;
delete file;
} else { } else {
res = &fileobjects[fh_i]; res = file;
} }
#endif #endif
} }
@ -536,7 +556,7 @@ extern "C" DIR *opendir(const char *path) {
FileSystem* fs = fp.fileSystem(); FileSystem* fs = fp.fileSystem();
if (fs == NULL) return NULL; if (fs == NULL) return NULL;
Dir *dir = new Dir; Dir *dir = new ManagedDir;
int err = dir->open(fs, fp.fileName()); int err = dir->open(fs, fp.fileName());
if (err < 0) { if (err < 0) {
errno = -err; errno = -err;
@ -572,7 +592,6 @@ extern "C" struct dirent *readdir(DIR *dir) {
extern "C" int closedir(DIR *dir) { extern "C" int closedir(DIR *dir) {
#if MBED_CONF_FILESYSTEM_PRESENT #if MBED_CONF_FILESYSTEM_PRESENT
int err = dir->close(); int err = dir->close();
delete dir;
if (err < 0) { if (err < 0) {
errno = -err; errno = -err;
return -1; return -1;