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

Comparing libeio/eio.c (file contents):
Revision 1.45 by root, Sat Jan 2 12:50:22 2010 UTC vs.
Revision 1.53 by root, Sat Jan 9 10:03:09 2010 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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
… …
80# include <utime.h> 81# include <utime.h>
81# include <signal.h> 82# include <signal.h>
82# include <dirent.h> 83# include <dirent.h>
83 84
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 85/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if __freebsd || defined __NetBSD__ || defined __OpenBSD__ 86# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */ 87# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno 88# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen 89# define D_NAMLEN(de) (de)->d_namlen
89# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 90# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino 91# define D_INO(de) (de)->d_ino
… …
106#endif 107#endif
107 108
108#if HAVE_SENDFILE 109#if HAVE_SENDFILE
109# if __linux 110# if __linux
110# include <sys/sendfile.h> 111# include <sys/sendfile.h>
111# elif __freebsd || defined __APPLE__ 112# elif __FreeBSD__ || defined __APPLE__
112# include <sys/socket.h> 113# include <sys/socket.h>
113# include <sys/uio.h> 114# include <sys/uio.h>
114# elif __hpux 115# elif __hpux
115# include <sys/socket.h> 116# include <sys/socket.h>
116# elif __solaris 117# elif __solaris
117# include <sys/sendfile.h> 118# include <sys/sendfile.h>
118# elif defined _WIN32
119# else 119# else
120# error sendfile support requested but not available 120# error sendfile support requested but not available
121# endif 121# endif
122#endif 122#endif
123 123
… …
910 910
911#if HAVE_SENDFILE 911#if HAVE_SENDFILE
912# if __linux 912# if __linux
913 res = sendfile (ofd, ifd, &offset, count); 913 res = sendfile (ofd, ifd, &offset, count);
914 914
915# elif __freebsd 915# elif __FreeBSD__
916 /* 916 /*
917 * Of course, the freebsd sendfile is a dire hack with no thoughts 917 * Of course, the freebsd sendfile is a dire hack with no thoughts
918 * wasted on making it similar to other I/O functions. 918 * wasted on making it similar to other I/O functions.
919 */ 919 */
920 { 920 {
921 off_t sbytes; 921 off_t sbytes;
922 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 922 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
923 923
924 if (res < 0 && sbytes) 924 #if 0 /* according to the manpage, this is correct, but broken behaviour */
925 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 925 /* freebsd' sendfile will return 0 on success */
926 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
927 /* not on e.g. EIO or EPIPE - sounds broken */
928 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
929 res = sbytes;
930 #endif
931
932 /* according to source inspection, this is correct, and useful behaviour */
933 if (sbytes)
926 res = sbytes; 934 res = sbytes;
927 } 935 }
928 936
929# elif defined __APPLE__ 937# elif defined (__APPLE__)
930 938
931 { 939 {
932 off_t bytes = count; 940 off_t sbytes = count;
933 res = sendfile (ifd, ofd, offset, &bytes, 0, 0); 941 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
934 942
935 if (res < 0 && errno == EAGAIN && bytes) 943 /* according to the manpage, sbytes is always valid */
944 if (sbytes)
936 res = sbytes; 945 res = sbytes;
937 } 946 }
938 947
939# elif __hpux 948# elif __hpux
940 res = sendfile (ofd, ifd, offset, count, 0, 0); 949 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
954 if (res < 0 && sbytes) 963 if (res < 0 && sbytes)
955 res = sbytes; 964 res = sbytes;
956 } 965 }
957 966
958# endif 967# endif
968
959#elif defined _WIN32 969#elif defined (_WIN32)
960 970
961 /* does not work, just for documentation of what would need to be done */ 971 /* does not work, just for documentation of what would need to be done */
962 { 972 {
963 HANDLE h = TO_SOCKET (ifd); 973 HANDLE h = TO_SOCKET (ifd);
964 SetFilePointer (h, offset, 0, FILE_BEGIN); 974 SetFilePointer (h, offset, 0, FILE_BEGIN);
… …
970 errno = ENOSYS; 980 errno = ENOSYS;
971#endif 981#endif
972 982
973 if (res < 0 983 if (res < 0
974 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 984 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
985 /* BSDs */
986#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
987 || errno == ENOTSUP
988#endif
989 || errno == EOPNOTSUPP /* BSDs */
975#if __solaris 990#if __solaris
976 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 991 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
977#endif 992#endif
978 ) 993 )
979 ) 994 )
… …
1373 } 1388 }
1374 } 1389 }
1375} 1390}
1376 1391
1377#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1392#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1378# undef msync
1379# define msync(a,b,c) ((errno = ENOSYS), -1) 1393# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1394#else
1395
1396int
1397eio__msync (void *mem, size_t len, int flags)
1398{
1399 if (EIO_MS_ASYNC != MS_SYNC
1400 || EIO_MS_INVALIDATE != MS_INVALIDATE
1401 || EIO_MS_SYNC != MS_SYNC)
1402 {
1403 flags = 0
1404 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1405 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1406 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1407 }
1408
1409 return msync (mem, len, flags);
1410}
1411
1380#endif 1412#endif
1381 1413
1382int 1414int
1383eio__mtouch (void *mem, size_t len, int flags) 1415eio__mtouch (void *mem, size_t len, int flags)
1384{ 1416{
… …
1395 1427
1396 /* round down to start of page, although this is probably useless */ 1428 /* round down to start of page, although this is probably useless */
1397 addr &= ~(page - 1); /* assume page size is always a power of two */ 1429 addr &= ~(page - 1); /* assume page size is always a power of two */
1398 1430
1399 if (addr < end) 1431 if (addr < end)
1400 if (flags) /* modify */ 1432 if (flags & EIO_MT_MODIFY) /* modify */
1401 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1433 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1402 else 1434 else
1403 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1435 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1404 1436
1405 return 0; 1437 return 0;
… …
1553 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1585 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1554 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1586 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1555 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1587 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1556 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1588 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1557 1589
1590 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1591 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1592 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1593 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1594
1558 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1595 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1559 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1596 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1560 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1597 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1561 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1598 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1562 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1599 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1577 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1614 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1578 1615
1579 case EIO_SYNC: req->result = 0; sync (); break; 1616 case EIO_SYNC: req->result = 0; sync (); break;
1580 case EIO_FSYNC: req->result = fsync (req->int1); break; 1617 case EIO_FSYNC: req->result = fsync (req->int1); break;
1581 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1618 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1582 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1619 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1583 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1620 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1584 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1621 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1585 1622
1586 case EIO_READDIR: eio__scandir (req, self); break; 1623 case EIO_READDIR: eio__scandir (req, self); break;
1587 1624
… …
1709eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1746eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1710{ 1747{
1711 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1748 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1712} 1749}
1713 1750
1751eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1752{
1753 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1754}
1755
1714eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1756eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1715{ 1757{
1716 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1758 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1717} 1759}
1718 1760
… …
1788} 1830}
1789 1831
1790eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1832eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1791{ 1833{
1792 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1834 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1835}
1836
1837eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1838{
1839 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1793} 1840}
1794 1841
1795eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1842eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1796{ 1843{
1797 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1844 return eio__1path (EIO_UNLINK, path, pri, cb, data);

Diff Legend

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