Make libasyncio headers usable from C

This allows us to enable LTP tests
for io_* syscalls.

Bug: 31152298
Test: LTP tests pass
Change-Id: Ic25189d8bf25cdacfa0f144ac57c7b2827adcd9f
This commit is contained in:
Jerry Zhang 2018-02-12 16:15:50 -08:00
parent fd01164a8d
commit c3d4e7226a
3 changed files with 22 additions and 7 deletions

View file

@ -317,6 +317,8 @@ bool init_functionfs(struct usb_handle* h) {
goto err;
}
memset(&h->read_aiob.ctx, 0, sizeof(h->read_aiob.ctx));
memset(&h->write_aiob.ctx, 0, sizeof(h->write_aiob.ctx));
if (io_setup(USB_FFS_NUM_BUFS, &h->read_aiob.ctx) ||
io_setup(USB_FFS_NUM_BUFS, &h->write_aiob.ctx)) {
D("[ aio: got error on io_setup (%d) ]", errno);

View file

@ -17,9 +17,10 @@
#include <asyncio/AsyncIO.h>
#include <sys/syscall.h>
#include <unistd.h>
#include <cstdint>
#include <cstring>
int io_setup(unsigned nr, aio_context_t* ctxp) {
memset(ctxp, 0, sizeof(*ctxp));
return syscall(__NR_io_setup, nr, ctxp);
}
@ -48,3 +49,11 @@ void io_prep(iocb* iocb, int fd, const void* buf, uint64_t count, int64_t offset
iocb->aio_nbytes = count;
iocb->aio_offset = offset;
}
void io_prep_pread(struct iocb* iocb, int fd, void* buf, size_t count, long long offset) {
io_prep(iocb, fd, buf, count, offset, true);
}
void io_prep_pwrite(struct iocb* iocb, int fd, void* buf, size_t count, long long offset) {
io_prep(iocb, fd, buf, count, offset, false);
}

View file

@ -17,9 +17,9 @@
#ifndef _ASYNCIO_H
#define _ASYNCIO_H
#include <cstring>
#include <cstdint>
#include <linux/aio_abi.h>
#include <stdbool.h>
#include <stdint.h>
#include <sys/cdefs.h>
#include <sys/types.h>
#include <time.h>
@ -35,10 +35,14 @@ extern "C" {
int io_setup(unsigned nr, aio_context_t* ctxp);
int io_destroy(aio_context_t ctx);
int io_submit(aio_context_t ctx, long nr, iocb** iocbpp);
int io_getevents(aio_context_t ctx, long min_nr, long max_nr, io_event* events, timespec* timeout);
int io_cancel(aio_context_t ctx, iocb*, io_event* result);
void io_prep(iocb* iocb, int fd, const void* buf, uint64_t count, int64_t offset, bool read);
int io_submit(aio_context_t ctx, long nr, struct iocb** iocbpp);
int io_getevents(aio_context_t ctx, long min_nr, long max_nr, struct io_event* events,
struct timespec* timeout);
int io_cancel(aio_context_t ctx, struct iocb*, struct io_event* result);
void io_prep_pread(struct iocb* iocb, int fd, void* buf, size_t count, long long offset);
void io_prep_pwrite(struct iocb* iocb, int fd, void* buf, size_t count, long long offset);
void io_prep(struct iocb* iocb, int fd, const void* buf, uint64_t count, int64_t offset, bool read);
#ifdef __cplusplus
};