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

Merge pull request #6791 from kjbracey-arm/fcntl 

Add POSIX fcntl flag support
pull/6976/head
Cruz Monrreal 2018-05-21 17:17:02 -05:00 committed by GitHub
parent cd1ff94db2 cf91b1c6d7
commit a301db5d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 106 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/UARTSerial.h
View File

@ -142,6 +142,15 @@ public:
return 0; return 0;
} }
/** Check current blocking or non-blocking mode for file operations.
*
* @return true for blocking mode, false for non-blocking mode.
*/
virtual bool is_blocking() const
{
return _blocking;
}
/** Register a callback on state change of the file. /** Register a callback on state change of the file.
* *
* The specified callback will be called on state changes such as when * The specified callback will be called on state changes such as when

11
platform/FileHandle.h
View File

@ -192,7 +192,16 @@ public:
*/ */
virtual int set_blocking(bool blocking) virtual int set_blocking(bool blocking)
{ {
return -1; return blocking ? 0 : -ENOTTY;
}
/** Check current blocking or non-blocking mode for file operations.
*
* @return true for blocking mode, false for non-blocking mode.
*/
virtual bool is_blocking() const
{
return true;
} }
/** Check for poll event flags /** Check for poll event flags

99
platform/mbed_retarget.cpp
View File

@ -344,16 +344,16 @@ static int reserve_filehandle() {
} }
int mbed::bind_to_fd(FileHandle *fh) { int mbed::bind_to_fd(FileHandle *fh) {
int fh_i = reserve_filehandle(); int fildes = reserve_filehandle();
if (fh_i < 0) { if (fildes < 0) {
return fh_i; return fildes;
} }
filehandles[fh_i] = fh; filehandles[fildes] = fh;
stdio_in_prev[fh_i] = 0; stdio_in_prev[fildes] = 0;
stdio_out_prev[fh_i] = 0; stdio_out_prev[fildes] = 0;
return fh_i; return fildes;
} }
static int unbind_from_fd(int fd, FileHandle *fh) { static int unbind_from_fd(int fd, FileHandle *fh) {
@ -464,9 +464,9 @@ extern "C" FILEHANDLE PREFIX(_open)(const char *name, int openflags) {
} }
extern "C" int open(const char *name, int oflag, ...) { extern "C" int open(const char *name, int oflag, ...) {
int fh_i = reserve_filehandle(); int fildes = reserve_filehandle();
if (fh_i < 0) { if (fildes < 0) {
return fh_i; return fildes;
} }
FileHandle *res = NULL; FileHandle *res = NULL;
@ -476,7 +476,7 @@ extern "C" int open(const char *name, int oflag, ...) {
/* The first part of the filename (between first 2 '/') is not a /* The first part of the filename (between first 2 '/') is not a
* registered mount point in the namespace. * registered mount point in the namespace.
*/ */
return handle_open_errors(-ENODEV, fh_i); return handle_open_errors(-ENODEV, fildes);
} }
if (path.isFile()) { if (path.isFile()) {
@ -484,28 +484,28 @@ extern "C" int open(const char *name, int oflag, ...) {
} else { } else {
FileSystemHandle *fs = path.fileSystem(); FileSystemHandle *fs = path.fileSystem();
if (fs == NULL) { if (fs == NULL) {
return handle_open_errors(-ENODEV, fh_i); return handle_open_errors(-ENODEV, fildes);
} }
int err = fs->open(&res, path.fileName(), oflag); int err = fs->open(&res, path.fileName(), oflag);
if (err) { if (err) {
return handle_open_errors(err, fh_i); return handle_open_errors(err, fildes);
} }
} }
filehandles[fh_i] = res; filehandles[fildes] = res;
stdio_in_prev[fh_i] = 0; stdio_in_prev[fildes] = 0;
stdio_out_prev[fh_i] = 0; stdio_out_prev[fildes] = 0;
return fh_i; return fildes;
} }
extern "C" int PREFIX(_close)(FILEHANDLE fh) { extern "C" int PREFIX(_close)(FILEHANDLE fh) {
return close(fh); return close(fh);
} }
extern "C" int close(int fh) { extern "C" int close(int fildes) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
filehandles[fh] = NULL; filehandles[fildes] = NULL;
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return -1; return -1;
@ -610,9 +610,9 @@ finish:
#endif #endif
} }
extern "C" ssize_t write(int fh, const void *buf, size_t length) { extern "C" ssize_t write(int fildes, const void *buf, size_t length) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return -1; return -1;
@ -700,9 +700,9 @@ extern "C" int PREFIX(_read)(FILEHANDLE fh, unsigned char *buffer, unsigned int
#endif #endif
} }
extern "C" ssize_t read(int fh, void *buf, size_t length) { extern "C" ssize_t read(int fildes, void *buf, size_t length) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return -1; return -1;
@ -727,8 +727,8 @@ extern "C" int _isatty(FILEHANDLE fh)
return isatty(fh); return isatty(fh);
} }
extern "C" int isatty(int fh) { extern "C" int isatty(int fildes) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return 0; return 0;
@ -765,8 +765,8 @@ int _lseek(FILEHANDLE fh, int offset, int whence)
return off; return off;
} }
extern "C" off_t lseek(int fh, off_t offset, int whence) { extern "C" off_t lseek(int fildes, off_t offset, int whence) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return -1; return -1;
@ -786,8 +786,8 @@ extern "C" int PREFIX(_ensure)(FILEHANDLE fh) {
} }
#endif #endif
extern "C" int fsync(int fh) { extern "C" int fsync(int fildes) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return -1; return -1;
@ -850,8 +850,8 @@ extern "C" int _fstat(int fh, struct stat *st) {
} }
#endif #endif
extern "C" int fstat(int fh, struct stat *st) { extern "C" int fstat(int fildes, struct stat *st) {
FileHandle* fhc = get_fhc(fh); FileHandle* fhc = get_fhc(fildes);
if (fhc == NULL) { if (fhc == NULL) {
errno = EBADF; errno = EBADF;
return -1; return -1;
@ -862,6 +862,41 @@ extern "C" int fstat(int fh, struct stat *st) {
return 0; return 0;
} }
extern "C" int fcntl(int fildes, int cmd, ...) {
FileHandle *fhc = get_fhc(fildes);
if (fhc == NULL) {
errno = EBADF;
return -1;
}
switch (cmd) {
case F_GETFL: {
int flags = 0;
if (fhc->is_blocking()) {
flags |= O_NONBLOCK;
}
return flags;
}
case F_SETFL: {
va_list ap;
va_start(ap, cmd);
int flags = va_arg(ap, int);
va_end(ap);
int ret = fhc->set_blocking(flags & O_NONBLOCK);
if (ret < 0) {
errno = -ret;
return -1;
}
return 0;
}
default: {
errno = EINVAL;
return -1;
}
}
}
extern "C" int poll(struct pollfd fds[], nfds_t nfds, int timeout) extern "C" int poll(struct pollfd fds[], nfds_t nfds, int timeout)
{ {
if (nfds > OPEN_MAX) { if (nfds > OPEN_MAX) {

29
platform/mbed_retarget.h
View File

@ -43,14 +43,20 @@ typedef unsigned int uid_t; ///< User ID
typedef unsigned int gid_t; ///< Group ID typedef unsigned int gid_t; ///< Group ID
#endif #endif
#define O_RDONLY 0 ///< Open for reading /* Flags for open() and fcntl(GETFL/SETFL)
#define O_WRONLY 1 ///< Open for writing * At present, fcntl only supports reading and writing O_NONBLOCK
#define O_RDWR 2 ///< Open for reading and writing */
#define O_CREAT 0x0200 ///< Create file if it does not exist #define O_RDONLY 0 ///< Open for reading
#define O_TRUNC 0x0400 ///< Truncate file to zero length #define O_WRONLY 1 ///< Open for writing
#define O_EXCL 0x0800 ///< Fail if file exists #define O_RDWR 2 ///< Open for reading and writing
#define O_APPEND 0x0008 ///< Set file offset to end of file prior to each write #define O_NONBLOCK 0x0004 ///< Non-blocking mode
#define O_BINARY 0x8000 ///< Open file in binary mode #define O_APPEND 0x0008 ///< Set file offset to end of file prior to each write
#define O_CREAT 0x0200 ///< Create file if it does not exist
#define O_TRUNC 0x0400 ///< Truncate file to zero length
#define O_EXCL 0x0800 ///< Fail if file exists
#define O_BINARY 0x8000 ///< Open file in binary mode
#define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR)
#define NAME_MAX 255 ///< Maximum size of a name in a file path #define NAME_MAX 255 ///< Maximum size of a name in a file path
@ -480,6 +486,10 @@ enum {
DT_SOCK, ///< This is a UNIX domain socket. DT_SOCK, ///< This is a UNIX domain socket.
}; };
/* fcntl.h defines */
#define F_GETFL 3
#define F_SETFL 4
struct pollfd { struct pollfd {
int fd; int fd;
short events; short events;
@ -503,7 +513,8 @@ extern "C" {
off_t lseek(int fildes, off_t offset, int whence); off_t lseek(int fildes, off_t offset, int whence);
int isatty(int fildes); int isatty(int fildes);
int fsync(int fildes); int fsync(int fildes);
int fstat(int fh, struct stat *st); int fstat(int fildes, struct stat *st);
int fcntl(int fildes, int cmd, ...);
int poll(struct pollfd fds[], nfds_t nfds, int timeout); int poll(struct pollfd fds[], nfds_t nfds, int timeout);
int close(int fildes); int close(int fildes);
int stat(const char *path, struct stat *st); int stat(const char *path, struct stat *st);