Iniial implementatin of aio_cancel()
This commit is contained in:
parent
1eb38cb8fe
commit
a4861c7cb7
4 changed files with 173 additions and 6 deletions
|
@ -162,7 +162,7 @@ extern "C"
|
|||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
int aio_cancel(int, FAR struct aiocb *aiocbp);
|
||||
int aio_cancel(int fildes, FAR struct aiocb *aiocbp);
|
||||
int aio_error(FAR const struct aiocb *aiocbp);
|
||||
int aio_fsync(int, FAR struct aiocb *aiocbp);
|
||||
int aio_read(FAR struct aiocb *aiocbp);
|
||||
|
|
|
@ -37,8 +37,8 @@ ifeq ($(CONFIG_LIBC_AIO),y)
|
|||
|
||||
# Add the asynchronous I/O C files to the build
|
||||
|
||||
CSRCS += aio_error.c aio_read.c aio_return.c aio_signal.c aio_write.c
|
||||
CSRCS += aio_suspend.c
|
||||
CSRCS += aio_cancel.c aio_error.c aio_read.c aio_return.c aio_signal.c
|
||||
CSRCS += aio_suspend.c aio_write.c
|
||||
|
||||
ifneq ($(CONFIG_PTHREAD_DISABLE),y)
|
||||
CSRCS += lio_listio.c
|
||||
|
|
162
libc/aio/aio_cancel.c
Normal file
162
libc/aio/aio_cancel.c
Normal file
|
@ -0,0 +1,162 @@
|
|||
/****************************************************************************
|
||||
* libc/aio/aio_cancel.c
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <aio.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef CONFIG_LIBC_AIO
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
/* Configuration ************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Private Types
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Private Variables
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Public Variables
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aio_read
|
||||
*
|
||||
* Description:
|
||||
* The aio_cancel() function attempts to cancel one or more asynchronous
|
||||
* I/O requests currently outstanding against file descriptor 'fildes'.
|
||||
* The aiocbp argument points to the asynchronous I/O control block for
|
||||
* a particular request to be cancelled..
|
||||
*
|
||||
* Normal asynchronous notification will occur for asynchronous I/O
|
||||
* operations that are successfully cancelled. If there are requests that
|
||||
* cannot be cancelled, then the normal asynchronous completion process
|
||||
* will take place for those requests when they are completed.
|
||||
*
|
||||
* For requested operations that are successfully cancelled, the associated
|
||||
* error status will be set to ECANCELED and the return status will be -1.
|
||||
* For requested operations that are not successfully cancelled, the aiocbp
|
||||
* will not be modified by aio_cancel().
|
||||
*
|
||||
* Input Parameters:
|
||||
* fildes - Not used in this implmentation
|
||||
* aiocbp - Points to the asynchronous I/O control block for a particular
|
||||
* request to be cancelled.
|
||||
*
|
||||
* Returned Value:
|
||||
* The aio_cancel() function will return the value AIO_CANCELED if the
|
||||
* requested operation(s) were cancelled. The value AIO_NOTCANCELED will
|
||||
* be returned if at least one of the requested operation(s) cannot be
|
||||
* cancelled because it is in progress. In this case, the state of the
|
||||
* other operations, if any, referenced in the call to aio_cancel() is
|
||||
* not indicated by the return value of aio_cancel(). The application
|
||||
* may determine the state of affairs for these operations by using
|
||||
* aio_error(). The value AIO_ALLDONE is returned if all of the
|
||||
* operations have already completed. Otherwise, the function will return
|
||||
* -1 and set errno to indicate the error.
|
||||
*
|
||||
* POSIX Compliance
|
||||
* By standard, this function support the value of NULL for aiocbp. If
|
||||
* aiocbp is NULL, then all outstanding cancelable asynchronous I/O
|
||||
* requests against fildes will be cancelled. In this implementation,
|
||||
* nothing is done if aiocbp is NULL and the fildes parameter is always
|
||||
* ignored. ENOSYS will be returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int aio_cancel(int fildes, FAR struct aiocb *aiocbp)
|
||||
{
|
||||
int status;
|
||||
int ret;
|
||||
|
||||
/* Ignore NULL AIO control blocks (see "POSIX Compliance" above) */
|
||||
|
||||
if (aiocbp)
|
||||
{
|
||||
set_errno(ENOSYS);
|
||||
return ERROR;
|
||||
}
|
||||
|
||||
/* Lock the scheduler so that no I/O events can complete on the worker
|
||||
* thread until we set complete this operation.
|
||||
*/
|
||||
|
||||
sched_lock();
|
||||
|
||||
/* Check if the I/O has completed */
|
||||
|
||||
if (aiocbp == -EINPROGRESS)
|
||||
{
|
||||
/* No ... attempt to cancel the I/O. There are two possibilities: (1)
|
||||
* the work has already been started and is no longer queued, or (2)
|
||||
* the work has not been started and is still in the work queue. Only
|
||||
* the second case can be cancelled. work_cancel() will return
|
||||
* -ENOENT in the first case.
|
||||
*/
|
||||
|
||||
status = work_cancel(AIO_QUEUE, &aiocbp->aio_work);
|
||||
ret = status >= 0 ? AIO_CANCELED : AIO_NOTCANCELED;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* The I/O has already completed */
|
||||
|
||||
ret = AIO_ALLDONE
|
||||
}
|
||||
|
||||
sched_unlock();
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_LIBC_AIO */
|
|
@ -78,7 +78,7 @@
|
|||
*
|
||||
* Description:
|
||||
* Cancel previously queued work. This removes work from the work queue.
|
||||
* After work has been canceled, it may be re-queue by calling work_queue()
|
||||
* After work has been cancelled, it may be re-queue by calling work_queue()
|
||||
* again.
|
||||
*
|
||||
* Input parameters:
|
||||
|
@ -86,7 +86,10 @@
|
|||
* work - The previously queue work structure to cancel
|
||||
*
|
||||
* Returned Value:
|
||||
* Zero on success, a negated errno on failure
|
||||
* Zero (OK) on success, a negated errno on failure. This error may be
|
||||
* reported:
|
||||
*
|
||||
* -ENOENT - There is no such work queued.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
|
@ -94,6 +97,7 @@ int work_cancel(int qid, FAR struct work_s *work)
|
|||
{
|
||||
FAR struct wqueue_s *wqueue = &g_work[qid];
|
||||
irqstate_t flags;
|
||||
int ret = -ENOENT;
|
||||
|
||||
DEBUGASSERT(work != NULL && (unsigned)qid < NWORKERS);
|
||||
|
||||
|
@ -116,10 +120,11 @@ int work_cancel(int qid, FAR struct work_s *work)
|
|||
|
||||
dq_rem((FAR dq_entry_t *)work, &wqueue->q);
|
||||
work->worker = NULL;
|
||||
ret = OK;
|
||||
}
|
||||
|
||||
irqrestore(flags);
|
||||
return OK;
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_SCHED_WORKQUEUE */
|
||||
|
|
Loading…
Reference in a new issue