ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/eio.c
(Generate patch)

Comparing libeio/eio.c (file contents):
Revision 1.49 by root, Sat Jan 2 14:24:32 2010 UTC vs.
Revision 1.61 by root, Fri Feb 11 00:53:24 2011 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
49#include <stdlib.h> 49#include <stdlib.h>
50#include <string.h> 50#include <string.h>
51#include <errno.h> 51#include <errno.h>
52#include <sys/types.h> 52#include <sys/types.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/statvfs.h>
54#include <limits.h> 55#include <limits.h>
55#include <fcntl.h> 56#include <fcntl.h>
56#include <assert.h> 57#include <assert.h>
57 58
58#ifndef EIO_FINISH 59#ifndef EIO_FINISH
… …
73#else 74#else
74 75
75# include "config.h" 76# include "config.h"
76# include <sys/time.h> 77# include <sys/time.h>
77# include <sys/select.h> 78# include <sys/select.h>
78# include <sys/mman.h>
79# include <unistd.h> 79# include <unistd.h>
80# include <utime.h> 80# include <utime.h>
81# include <signal.h> 81# include <signal.h>
82# include <dirent.h> 82# include <dirent.h>
83 83
84#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
87
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if __freebsd || defined __NetBSD__ || defined __OpenBSD__ 89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */ 90# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno 91# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen 92# define D_NAMLEN(de) (de)->d_namlen
89# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 93# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino 94# define D_INO(de) (de)->d_ino
… …
106#endif 110#endif
107 111
108#if HAVE_SENDFILE 112#if HAVE_SENDFILE
109# if __linux 113# if __linux
110# include <sys/sendfile.h> 114# include <sys/sendfile.h>
111# elif __freebsd || defined __APPLE__ 115# elif __FreeBSD__ || defined __APPLE__
112# include <sys/socket.h> 116# include <sys/socket.h>
113# include <sys/uio.h> 117# include <sys/uio.h>
114# elif __hpux 118# elif __hpux
115# include <sys/socket.h> 119# include <sys/socket.h>
116# elif __solaris 120# elif __solaris
… …
134#define IDLE_TIMEOUT 10 138#define IDLE_TIMEOUT 10
135 139
136/* used for struct dirent, AIX doesn't provide it */ 140/* used for struct dirent, AIX doesn't provide it */
137#ifndef NAME_MAX 141#ifndef NAME_MAX
138# define NAME_MAX 4096 142# define NAME_MAX 4096
143#endif
144
145/* used for readlink etc. */
146#ifndef PATH_MAX
147# define PATH_MAX 4096
139#endif 148#endif
140 149
141/* buffer size for various temporary buffers */ 150/* buffer size for various temporary buffers */
142#define EIO_BUFSIZE 65536 151#define EIO_BUFSIZE 65536
143 152
… …
216static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
217static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
218static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
219static volatile unsigned int max_idle = 4; 228static volatile unsigned int max_idle = 4;
220 229
221static mutex_t wrklock = X_MUTEX_INIT; 230static xmutex_t wrklock = X_MUTEX_INIT;
222static mutex_t reslock = X_MUTEX_INIT; 231static xmutex_t reslock = X_MUTEX_INIT;
223static mutex_t reqlock = X_MUTEX_INIT; 232static xmutex_t reqlock = X_MUTEX_INIT;
224static cond_t reqwait = X_COND_INIT; 233static xcond_t reqwait = X_COND_INIT;
225 234
226#if !HAVE_PREADWRITE 235#if !HAVE_PREADWRITE
227/* 236/*
228 * make our pread/pwrite emulation safe against themselves, but not against 237 * make our pread/pwrite emulation safe against themselves, but not against
229 * normal read/write by using a mutex. slows down execution a lot, 238 * normal read/write by using a mutex. slows down execution a lot,
230 * but that's your problem, not mine. 239 * but that's your problem, not mine.
231 */ 240 */
232static mutex_t preadwritelock = X_MUTEX_INIT; 241static xmutex_t preadwritelock = X_MUTEX_INIT;
233#endif 242#endif
234 243
235typedef struct etp_worker 244typedef struct etp_worker
236{ 245{
237 /* locked by wrklock */ 246 /* locked by wrklock */
238 struct etp_worker *prev, *next; 247 struct etp_worker *prev, *next;
239 248
240 thread_t tid; 249 xthread_t tid;
241 250
242 /* locked by reslock, reqlock or wrklock */ 251 /* locked by reslock, reqlock or wrklock */
243 ETP_REQ *req; /* currently processed request */ 252 ETP_REQ *req; /* currently processed request */
244 253
245 ETP_WORKER_COMMON 254 ETP_WORKER_COMMON
… …
807 816
808 return res; 817 return res;
809} 818}
810#endif 819#endif
811 820
812#ifndef HAVE_FUTIMES 821#ifndef HAVE_UTIMES
813 822
814# undef utimes 823# undef utimes
815# undef futimes
816# define utimes(path,times) eio__utimes (path, times) 824# define utimes(path,times) eio__utimes (path, times)
817# define futimes(fd,times) eio__futimes (fd, times)
818 825
819static int 826static int
820eio__utimes (const char *filename, const struct timeval times[2]) 827eio__utimes (const char *filename, const struct timeval times[2])
821{ 828{
822 if (times) 829 if (times)
… …
829 return utime (filename, &buf); 836 return utime (filename, &buf);
830 } 837 }
831 else 838 else
832 return utime (filename, 0); 839 return utime (filename, 0);
833} 840}
841
842#endif
843
844#ifndef HAVE_FUTIMES
845
846# undef futimes
847# define futimes(fd,times) eio__futimes (fd, times)
834 848
835static int eio__futimes (int fd, const struct timeval tv[2]) 849static int eio__futimes (int fd, const struct timeval tv[2])
836{ 850{
837 errno = ENOSYS; 851 errno = ENOSYS;
838 return -1; 852 return -1;
… …
909 923
910#if HAVE_SENDFILE 924#if HAVE_SENDFILE
911# if __linux 925# if __linux
912 res = sendfile (ofd, ifd, &offset, count); 926 res = sendfile (ofd, ifd, &offset, count);
913 927
914# elif __freebsd 928# elif __FreeBSD__
915 /* 929 /*
916 * Of course, the freebsd sendfile is a dire hack with no thoughts 930 * Of course, the freebsd sendfile is a dire hack with no thoughts
917 * wasted on making it similar to other I/O functions. 931 * wasted on making it similar to other I/O functions.
918 */ 932 */
919 { 933 {
920 off_t sbytes; 934 off_t sbytes;
921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 935 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
922 936
923 if (res < 0 && sbytes) 937 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 938 /* freebsd' sendfile will return 0 on success */
939 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
940 /* not on e.g. EIO or EPIPE - sounds broken */
941 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
942 res = sbytes;
943 #endif
944
945 /* according to source inspection, this is correct, and useful behaviour */
946 if (sbytes)
925 res = sbytes; 947 res = sbytes;
926 } 948 }
927 949
928# elif defined (__APPLE__) 950# elif defined (__APPLE__)
929 951
930 { 952 {
931 off_t sbytes = count; 953 off_t sbytes = count;
932 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 954 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
933 955
934 if (res < 0 && errno == EAGAIN && sbytes) 956 /* according to the manpage, sbytes is always valid */
957 if (sbytes)
935 res = sbytes; 958 res = sbytes;
936 } 959 }
937 960
938# elif __hpux 961# elif __hpux
939 res = sendfile (ofd, ifd, offset, count, 0, 0); 962 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
1377 break; 1400 break;
1378 } 1401 }
1379 } 1402 }
1380} 1403}
1381 1404
1405#ifdef PAGESIZE
1406# define eio_pagesize() PAGESIZE
1407#else
1408static intptr_t
1409eio_pagesize (void)
1410{
1411 static intptr_t page;
1412
1413 if (!page)
1414 page = sysconf (_SC_PAGESIZE);
1415
1416 return page;
1417}
1418#endif
1419
1420static void
1421eio_page_align (void **addr, size_t *length)
1422{
1423 intptr_t mask = eio_pagesize () - 1;
1424
1425 /* round down addr */
1426 intptr_t adj = mask & (intptr_t)*addr;
1427
1428 *addr = (void *)((intptr_t)*addr - adj);
1429 *length += adj;
1430
1431 /* round up length */
1432 *length = (*length + mask) & ~mask;
1433}
1434
1435#if !_POSIX_MEMLOCK
1436# define eio__mlockall(a) ((errno = ENOSYS), -1)
1437#else
1438
1439static int
1440eio__mlockall (int flags)
1441{
1442 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1443 extern int mallopt (int, int);
1444 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1445 #endif
1446
1447 if (EIO_MCL_CURRENT != MCL_CURRENT
1448 || EIO_MCL_FUTURE != MCL_FUTURE)
1449 {
1450 flags = 0
1451 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1452 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1453 }
1454
1455 return mlockall (flags);
1456}
1457#endif
1458
1459#if !_POSIX_MEMLOCK_RANGE
1460# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1461#else
1462
1463static int
1464eio__mlock (void *addr, size_t length)
1465{
1466 eio_page_align (&addr, &length);
1467
1468 return mlock (addr, length);
1469}
1470
1471#endif
1472
1382#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1473#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1383# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1474# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1384#else 1475#else
1385 1476
1386int 1477int
1387eio__msync (void *mem, size_t len, int flags) 1478eio__msync (void *mem, size_t len, int flags)
1388{ 1479{
1480 eio_page_align (&mem, &len);
1481
1389 if (EIO_MS_ASYNC != MS_SYNC 1482 if (EIO_MS_ASYNC != MS_SYNC
1390 || EIO_MS_INVALIDATE != MS_INVALIDATE 1483 || EIO_MS_INVALIDATE != MS_INVALIDATE
1391 || EIO_MS_SYNC != MS_SYNC) 1484 || EIO_MS_SYNC != MS_SYNC)
1392 { 1485 {
1393 flags = 0 1486 flags = 0
… …
1402#endif 1495#endif
1403 1496
1404int 1497int
1405eio__mtouch (void *mem, size_t len, int flags) 1498eio__mtouch (void *mem, size_t len, int flags)
1406{ 1499{
1500 eio_page_align (&mem, &len);
1501
1502 {
1407 intptr_t addr = (intptr_t)mem; 1503 intptr_t addr = (intptr_t)mem;
1408 intptr_t end = addr + len; 1504 intptr_t end = addr + len;
1409#ifdef PAGESIZE 1505 intptr_t page = eio_pagesize ();
1410 const intptr_t page = PAGESIZE;
1411#else
1412 static intptr_t page;
1413 1506
1414 if (!page)
1415 page = sysconf (_SC_PAGESIZE);
1416#endif
1417
1418 /* round down to start of page, although this is probably useless */
1419 addr &= ~(page - 1); /* assume page size is always a power of two */
1420
1421 if (addr < end) 1507 if (addr < end)
1422 if (flags & EIO_MT_MODIFY) /* modify */ 1508 if (flags & EIO_MT_MODIFY) /* modify */
1423 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1509 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1424 else 1510 else
1425 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1511 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1512 }
1426 1513
1427 return 0; 1514 return 0;
1428} 1515}
1429 1516
1430/*****************************************************************************/ 1517/*****************************************************************************/
… …
1553 return 0; \ 1640 return 0; \
1554 } 1641 }
1555 1642
1556static void eio_execute (etp_worker *self, eio_req *req) 1643static void eio_execute (etp_worker *self, eio_req *req)
1557{ 1644{
1558 errno = 0;
1559
1560 switch (req->type) 1645 switch (req->type)
1561 { 1646 {
1562 case EIO_READ: ALLOC (req->size); 1647 case EIO_READ: ALLOC (req->size);
1563 req->result = req->offs >= 0 1648 req->result = req->offs >= 0
1564 ? pread (req->int1, req->ptr2, req->size, req->offs) 1649 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1575 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1660 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1576 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1661 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1577 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1662 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1578 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1663 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1579 1664
1665 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1666 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1667 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1668 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1669
1580 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1670 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1581 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1671 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1582 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1672 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1583 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1673 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1584 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1674 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1591 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1681 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1592 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1682 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1593 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1683 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1594 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1684 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1595 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1685 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1596 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1686 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1597 1687
1598 case EIO_READLINK: ALLOC (NAME_MAX); 1688 case EIO_READLINK: ALLOC (PATH_MAX);
1599 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1689 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1600 1690
1601 case EIO_SYNC: req->result = 0; sync (); break; 1691 case EIO_SYNC: req->result = 0; sync (); break;
1602 case EIO_FSYNC: req->result = fsync (req->int1); break; 1692 case EIO_FSYNC: req->result = fsync (req->int1); break;
1603 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1693 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1604 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1694 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1605 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1695 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1696 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1697 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1606 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1698 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1607 1699
1608 case EIO_READDIR: eio__scandir (req, self); break; 1700 case EIO_READDIR: eio__scandir (req, self); break;
1609 1701
1610 case EIO_BUSY: 1702 case EIO_BUSY:
1611#ifdef _WIN32 1703#ifdef _WIN32
1612 Sleep (req->nv1 * 1000.); 1704 Sleep (req->nv1 * 1e3);
1613#else 1705#else
1614 { 1706 {
1615 struct timeval tv; 1707 struct timeval tv;
1616 1708
1617 tv.tv_sec = req->nv1; 1709 tv.tv_sec = req->nv1;
1618 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1710 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1619 1711
1620 req->result = select (0, 0, 0, 0, &tv); 1712 req->result = select (0, 0, 0, 0, &tv);
1621 } 1713 }
1622#endif 1714#endif
1623 break; 1715 break;
… …
1638 times = tv; 1730 times = tv;
1639 } 1731 }
1640 else 1732 else
1641 times = 0; 1733 times = 0;
1642 1734
1643
1644 req->result = req->type == EIO_FUTIME 1735 req->result = req->type == EIO_FUTIME
1645 ? futimes (req->int1, times) 1736 ? futimes (req->int1, times)
1646 : utimes (req->ptr1, times); 1737 : utimes (req->ptr1, times);
1647 } 1738 }
1648 break; 1739 break;
… …
1657 case EIO_CUSTOM: 1748 case EIO_CUSTOM:
1658 ((void (*)(eio_req *))req->feed) (req); 1749 ((void (*)(eio_req *))req->feed) (req);
1659 break; 1750 break;
1660 1751
1661 default: 1752 default:
1753 errno = ENOSYS;
1662 req->result = -1; 1754 req->result = -1;
1663 break; 1755 break;
1664 } 1756 }
1665 1757
1666 req->errorno = errno; 1758 req->errorno = errno;
… …
1696eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1788eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1697{ 1789{
1698 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1790 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1699} 1791}
1700 1792
1793eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1794{
1795 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1796}
1797
1798eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1799{
1800 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1801}
1802
1701eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1803eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1702{ 1804{
1703 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1805 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1704} 1806}
1705 1807
… …
1729} 1831}
1730 1832
1731eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1833eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1732{ 1834{
1733 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1835 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1836}
1837
1838eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1839{
1840 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1734} 1841}
1735 1842
1736eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1843eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1737{ 1844{
1738 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1845 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
… …
1812eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1919eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1813{ 1920{
1814 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1921 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1815} 1922}
1816 1923
1924eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1925{
1926 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1927}
1928
1817eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1929eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1818{ 1930{
1819 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1931 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1820} 1932}
1821 1933
… …
1829 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1941 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1830} 1942}
1831 1943
1832eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1944eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1833{ 1945{
1834 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1946 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1835} 1947}
1836 1948
1837static eio_req * 1949static eio_req *
1838eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1950eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1839{ 1951{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines