--- cvsroot/libeio/eio.h 2011/09/26 16:54:25 1.46 +++ cvsroot/libeio/eio.h 2012/07/25 16:12:28 1.51 @@ -1,7 +1,7 @@ /* * libeio API header * - * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann + * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann * All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- @@ -92,7 +92,7 @@ /* managing working directories */ -typedef void *eio_wd; +typedef struct eio_pwd *eio_wd; #define EIO_CWD 0 /* the current working directory of the process, guaranteed to be a null pointer */ #define EIO_INVALID_WD ((eio_wd)(int)-1) /* failure return for eio_wd_open */ @@ -170,7 +170,9 @@ /* eio_fallocate flags */ enum { - EIO_FALLOC_FL_KEEP_SIZE = 1 /* MUST match the value in linux/falloc.h */ + /* these MUST match the value in linux/falloc.h */ + EIO_FALLOC_FL_KEEP_SIZE = 1, + EIO_FALLOC_FL_PUNCH_HOLE = 2 }; /* timestamps and differences - feel free to use double in your code directly */ @@ -183,7 +185,7 @@ EIO_WD_OPEN, EIO_WD_CLOSE, EIO_CLOSE, EIO_DUP2, - EIO_READ, EIO_WRITE, + EIO_SEEK, EIO_READ, EIO_WRITE, EIO_READAHEAD, EIO_SENDFILE, EIO_FSTAT, EIO_FSTATVFS, EIO_FTRUNCATE, EIO_FUTIME, EIO_FCHMOD, EIO_FCHOWN, @@ -212,11 +214,22 @@ EIO_REQ_TYPE_NUM }; +/* seek whence modes */ +/* these are guaranteed to hasve the traditional 0, 1, 2 values, */ +/* so you might as wlel use those */ +enum +{ + EIO_SEEK_SET = 0, + EIO_SEEK_CUR = 1, + EIO_SEEK_END = 2 +}; + + /* mlockall constants */ enum { EIO_MCL_CURRENT = 1, - EIO_MCL_FUTURE = 2, + EIO_MCL_FUTURE = 2 }; /* request priorities */ @@ -224,7 +237,7 @@ enum { EIO_PRI_MIN = -4, EIO_PRI_MAX = 4, - EIO_PRI_DEFAULT = 0, + EIO_PRI_DEFAULT = 0 }; /* eio request structure */ @@ -246,8 +259,8 @@ int type; /* EIO_xxx constant ETP */ int int1; /* all applicable requests: file descriptor; sendfile: output fd; open, msync, mlockall, readdir: flags */ - long int2; /* chown, fchown: uid; sendfile: input fd; open, chmod, mkdir, mknod: file mode, sync_file_range, fallocate: flags */ - long int3; /* chown, fchown: gid; rename: working directory of new name */ + long int2; /* chown, fchown: uid; sendfile: input fd; open, chmod, mkdir, mknod: file mode, seek: whence, sync_file_range, fallocate: flags */ + long int3; /* chown, fchown: gid; rename, link: working directory of new name */ int errorno; /* errno value on syscall return */ #if __i386 || __amd64 @@ -312,6 +325,8 @@ /* convenience wrappers */ #ifndef EIO_NO_WRAPPERS +eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data); /* result=wd */ +eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data); eio_req *eio_nop (int pri, eio_cb cb, void *data); /* does nothing except go through the whole process */ eio_req *eio_busy (eio_tstamp delay, int pri, eio_cb cb, void *data); /* ties a thread for this long, simulating busyness */ eio_req *eio_sync (int pri, eio_cb cb, void *data); @@ -326,6 +341,7 @@ eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data); eio_req *eio_close (int fd, int pri, eio_cb cb, void *data); eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data); +eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data); eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data); eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data); eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */