Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 12:33:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

pipes: support FIONREAD and FIONWRITE ioctl on pipes; use semaphores for pipecommon_ioctl().

Browse Source
This commit is contained in:
Andrew Tridgell
2016-03-20 18:11:13 -06:00
committed by Gregory Nutt
parent 03a77c1d18
commit 38eb8bb1b0
4 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch
+1 -1
Submodule arch updated: 2c6b85793f...2a3c96286a
drivers/pipes/fifo.c
-16
View File
@@ -50,18 +50,6 @@
#if CONFIG_DEV_PIPE_SIZE > 0
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
@@ -82,10 +70,6 @@ static const struct file_operations fifo_fops =
#endif
};
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/
drivers/pipes/pipe_common.c
+76 -25
View File
@@ -55,6 +55,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
#ifdef CONFIG_DEBUG
# include <nuttx/arch.h>
#endif
@@ -77,20 +78,12 @@
# define pipe_dumpbuffer(m,a,n)
#endif
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
static void pipecommon_semtake(sem_t *sem);
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -746,32 +739,90 @@ errout:
}
#endif
/****************************************************************************
/************************************************************************************
* Name: pipecommon_ioctl
****************************************************************************/
************************************************************************************/
int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
{
FAR struct inode *inode = filep->f_inode;
FAR struct pipe_dev_s *dev = inode->i_private;
FAR struct inode *inode = filep->f_inode;
struct pipe_dev_s *dev = inode->i_private;
int ret = -EINVAL;
/* Only one command supported */
#ifdef CONFIG_DEBUG
/* Some sanity checking */
if (cmd == PIPEIOC_POLICY)
if (dev == NULL)
{
if (arg != 0)
{
PIPE_POLICY_1(dev->d_flags);
}
else
{
PIPE_POLICY_0(dev->d_flags);
}
return -EBADF;
}
#endif
return OK;
pipecommon_semtake(&dev->d_bfsem);
switch (cmd)
{
case PIPEIOC_POLICY:
{
if (arg != 0)
{
PIPE_POLICY_1(dev->d_flags);
}
else
{
PIPE_POLICY_0(dev->d_flags);
}
ret = OK;
}
break;
case FIONREAD:
{
int count;
/* Determine the number of bytes available in the buffer */
if (dev->d_wrndx < dev->d_rdndx)
{
count = (CONFIG_DEV_PIPE_SIZE - dev->d_rdndx) + dev->d_wrndx;
}
else
{
count = dev->d_wrndx - dev->d_rdndx;
}
*(int *)arg = count;
ret = 0;
}
break;
case FIONWRITE:
{
int count;
/* Determine the number of bytes free in the buffer */
if (dev->d_wrndx < dev->d_rdndx)
{
count = (dev->d_rdndx - dev->d_wrndx) - 1;
}
else
{
count = ((CONFIG_DEV_PIPE_SIZE - dev->d_wrndx) + dev->d_rdndx) - 1;
}
*(int *)arg = count;
ret = 0;
}
break;
default:
break;
}
return -ENOTTY;
sem_post(&dev->d_bfsem);
return ret;
}
/****************************************************************************
drivers/pipes/pipe_common.h
+1 -1
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* drivers/pipe/pipe_common.h
*
* Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2015=2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without