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.62 by root, Tue Feb 15 03:15:16 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
… …
128#endif 132#endif
129#ifndef D_NAMLEN 133#ifndef D_NAMLEN
130# define D_NAMLEN(de) strlen ((de)->d_name) 134# define D_NAMLEN(de) strlen ((de)->d_name)
131#endif 135#endif
132 136
133/* number of seconds after which an idle threads exit */
134#define IDLE_TIMEOUT 10
135
136/* used for struct dirent, AIX doesn't provide it */ 137/* used for struct dirent, AIX doesn't provide it */
137#ifndef NAME_MAX 138#ifndef NAME_MAX
138# define NAME_MAX 4096 139# define NAME_MAX 4096
140#endif
141
142/* used for readlink etc. */
143#ifndef PATH_MAX
144# define PATH_MAX 4096
139#endif 145#endif
140 146
141/* buffer size for various temporary buffers */ 147/* buffer size for various temporary buffers */
142#define EIO_BUFSIZE 65536 148#define EIO_BUFSIZE 65536
143 149
… …
214static unsigned int max_poll_reqs; /* reslock */ 220static unsigned int max_poll_reqs; /* reslock */
215 221
216static volatile unsigned int nreqs; /* reqlock */ 222static volatile unsigned int nreqs; /* reqlock */
217static volatile unsigned int nready; /* reqlock */ 223static volatile unsigned int nready; /* reqlock */
218static volatile unsigned int npending; /* reqlock */ 224static volatile unsigned int npending; /* reqlock */
219static volatile unsigned int max_idle = 4; 225static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
226static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
220 227
221static mutex_t wrklock = X_MUTEX_INIT; 228static xmutex_t wrklock;
222static mutex_t reslock = X_MUTEX_INIT; 229static xmutex_t reslock;
223static mutex_t reqlock = X_MUTEX_INIT; 230static xmutex_t reqlock;
224static cond_t reqwait = X_COND_INIT; 231static xcond_t reqwait;
225 232
226#if !HAVE_PREADWRITE 233#if !HAVE_PREADWRITE
227/* 234/*
228 * make our pread/pwrite emulation safe against themselves, but not against 235 * make our pread/pwrite emulation safe against themselves, but not against
229 * normal read/write by using a mutex. slows down execution a lot, 236 * normal read/write by using a mutex. slows down execution a lot,
230 * but that's your problem, not mine. 237 * but that's your problem, not mine.
231 */ 238 */
232static mutex_t preadwritelock = X_MUTEX_INIT; 239static xmutex_t preadwritelock = X_MUTEX_INIT;
233#endif 240#endif
234 241
235typedef struct etp_worker 242typedef struct etp_worker
236{ 243{
237 /* locked by wrklock */ 244 /* locked by wrklock */
238 struct etp_worker *prev, *next; 245 struct etp_worker *prev, *next;
239 246
240 thread_t tid; 247 xthread_t tid;
241 248
242 /* locked by reslock, reqlock or wrklock */ 249 /* locked by reslock, reqlock or wrklock */
243 ETP_REQ *req; /* currently processed request */ 250 ETP_REQ *req; /* currently processed request */
244 251
245 ETP_WORKER_COMMON 252 ETP_WORKER_COMMON
… …
359 } 366 }
360 367
361 abort (); 368 abort ();
362} 369}
363 370
371static void etp_thread_init (void)
372{
373 X_MUTEX_CREATE (wrklock);
374 X_MUTEX_CREATE (reslock);
375 X_MUTEX_CREATE (reqlock);
376 X_COND_CREATE (reqwait);
377}
378
364static void etp_atfork_prepare (void) 379static void etp_atfork_prepare (void)
365{ 380{
366 X_LOCK (wrklock); 381 X_LOCK (wrklock);
367 X_LOCK (reqlock); 382 X_LOCK (reqlock);
368 X_LOCK (reslock); 383 X_LOCK (reslock);
… …
406 idle = 0; 421 idle = 0;
407 nreqs = 0; 422 nreqs = 0;
408 nready = 0; 423 nready = 0;
409 npending = 0; 424 npending = 0;
410 425
411 etp_atfork_parent (); 426 etp_thread_init ();
412} 427}
413 428
414static void 429static void
415etp_once_init (void) 430etp_once_init (void)
416{ 431{
432 etp_thread_init ();
417 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 433 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
418} 434}
419 435
420static int 436static int
421etp_init (void (*want_poll)(void), void (*done_poll)(void)) 437etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
612} 628}
613 629
614static void etp_set_max_idle (unsigned int nthreads) 630static void etp_set_max_idle (unsigned int nthreads)
615{ 631{
616 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 632 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
617 max_idle = nthreads <= 0 ? 1 : nthreads; 633 max_idle = nthreads;
634 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
635}
636
637static void etp_set_idle_timeout (unsigned int seconds)
638{
639 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
640 idle_timeout = seconds;
618 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
619} 642}
620 643
621static void etp_set_min_parallel (unsigned int nthreads) 644static void etp_set_min_parallel (unsigned int nthreads)
622{ 645{
… …
750void eio_set_max_idle (unsigned int nthreads) 773void eio_set_max_idle (unsigned int nthreads)
751{ 774{
752 etp_set_max_idle (nthreads); 775 etp_set_max_idle (nthreads);
753} 776}
754 777
778void eio_set_idle_timeout (unsigned int seconds)
779{
780 etp_set_idle_timeout (seconds);
781}
782
755void eio_set_min_parallel (unsigned int nthreads) 783void eio_set_min_parallel (unsigned int nthreads)
756{ 784{
757 etp_set_min_parallel (nthreads); 785 etp_set_min_parallel (nthreads);
758} 786}
759 787
… …
807 835
808 return res; 836 return res;
809} 837}
810#endif 838#endif
811 839
812#ifndef HAVE_FUTIMES 840#ifndef HAVE_UTIMES
813 841
814# undef utimes 842# undef utimes
815# undef futimes
816# define utimes(path,times) eio__utimes (path, times) 843# define utimes(path,times) eio__utimes (path, times)
817# define futimes(fd,times) eio__futimes (fd, times)
818 844
819static int 845static int
820eio__utimes (const char *filename, const struct timeval times[2]) 846eio__utimes (const char *filename, const struct timeval times[2])
821{ 847{
822 if (times) 848 if (times)
… …
829 return utime (filename, &buf); 855 return utime (filename, &buf);
830 } 856 }
831 else 857 else
832 return utime (filename, 0); 858 return utime (filename, 0);
833} 859}
860
861#endif
862
863#ifndef HAVE_FUTIMES
864
865# undef futimes
866# define futimes(fd,times) eio__futimes (fd, times)
834 867
835static int eio__futimes (int fd, const struct timeval tv[2]) 868static int eio__futimes (int fd, const struct timeval tv[2])
836{ 869{
837 errno = ENOSYS; 870 errno = ENOSYS;
838 return -1; 871 return -1;
… …
909 942
910#if HAVE_SENDFILE 943#if HAVE_SENDFILE
911# if __linux 944# if __linux
912 res = sendfile (ofd, ifd, &offset, count); 945 res = sendfile (ofd, ifd, &offset, count);
913 946
914# elif __freebsd 947# elif __FreeBSD__
915 /* 948 /*
916 * Of course, the freebsd sendfile is a dire hack with no thoughts 949 * Of course, the freebsd sendfile is a dire hack with no thoughts
917 * wasted on making it similar to other I/O functions. 950 * wasted on making it similar to other I/O functions.
918 */ 951 */
919 { 952 {
920 off_t sbytes; 953 off_t sbytes;
921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 954 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
922 955
923 if (res < 0 && sbytes) 956 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 957 /* freebsd' sendfile will return 0 on success */
958 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
959 /* not on e.g. EIO or EPIPE - sounds broken */
960 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
961 res = sbytes;
962 #endif
963
964 /* according to source inspection, this is correct, and useful behaviour */
965 if (sbytes)
925 res = sbytes; 966 res = sbytes;
926 } 967 }
927 968
928# elif defined (__APPLE__) 969# elif defined (__APPLE__)
929 970
930 { 971 {
931 off_t sbytes = count; 972 off_t sbytes = count;
932 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 973 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
933 974
934 if (res < 0 && errno == EAGAIN && sbytes) 975 /* according to the manpage, sbytes is always valid */
976 if (sbytes)
935 res = sbytes; 977 res = sbytes;
936 } 978 }
937 979
938# elif __hpux 980# elif __hpux
939 res = sendfile (ofd, ifd, offset, count, 0, 0); 981 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
1377 break; 1419 break;
1378 } 1420 }
1379 } 1421 }
1380} 1422}
1381 1423
1424#ifdef PAGESIZE
1425# define eio_pagesize() PAGESIZE
1426#else
1427static intptr_t
1428eio_pagesize (void)
1429{
1430 static intptr_t page;
1431
1432 if (!page)
1433 page = sysconf (_SC_PAGESIZE);
1434
1435 return page;
1436}
1437#endif
1438
1439static void
1440eio_page_align (void **addr, size_t *length)
1441{
1442 intptr_t mask = eio_pagesize () - 1;
1443
1444 /* round down addr */
1445 intptr_t adj = mask & (intptr_t)*addr;
1446
1447 *addr = (void *)((intptr_t)*addr - adj);
1448 *length += adj;
1449
1450 /* round up length */
1451 *length = (*length + mask) & ~mask;
1452}
1453
1454#if !_POSIX_MEMLOCK
1455# define eio__mlockall(a) ((errno = ENOSYS), -1)
1456#else
1457
1458static int
1459eio__mlockall (int flags)
1460{
1461 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1462 extern int mallopt (int, int);
1463 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1464 #endif
1465
1466 if (EIO_MCL_CURRENT != MCL_CURRENT
1467 || EIO_MCL_FUTURE != MCL_FUTURE)
1468 {
1469 flags = 0
1470 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1471 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1472 }
1473
1474 return mlockall (flags);
1475}
1476#endif
1477
1478#if !_POSIX_MEMLOCK_RANGE
1479# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1480#else
1481
1482static int
1483eio__mlock (void *addr, size_t length)
1484{
1485 eio_page_align (&addr, &length);
1486
1487 return mlock (addr, length);
1488}
1489
1490#endif
1491
1382#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1492#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1383# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1493# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1384#else 1494#else
1385 1495
1386int 1496int
1387eio__msync (void *mem, size_t len, int flags) 1497eio__msync (void *mem, size_t len, int flags)
1388{ 1498{
1499 eio_page_align (&mem, &len);
1500
1389 if (EIO_MS_ASYNC != MS_SYNC 1501 if (EIO_MS_ASYNC != MS_SYNC
1390 || EIO_MS_INVALIDATE != MS_INVALIDATE 1502 || EIO_MS_INVALIDATE != MS_INVALIDATE
1391 || EIO_MS_SYNC != MS_SYNC) 1503 || EIO_MS_SYNC != MS_SYNC)
1392 { 1504 {
1393 flags = 0 1505 flags = 0
… …
1402#endif 1514#endif
1403 1515
1404int 1516int
1405eio__mtouch (void *mem, size_t len, int flags) 1517eio__mtouch (void *mem, size_t len, int flags)
1406{ 1518{
1519 eio_page_align (&mem, &len);
1520
1521 {
1407 intptr_t addr = (intptr_t)mem; 1522 intptr_t addr = (intptr_t)mem;
1408 intptr_t end = addr + len; 1523 intptr_t end = addr + len;
1409#ifdef PAGESIZE 1524 intptr_t page = eio_pagesize ();
1410 const intptr_t page = PAGESIZE;
1411#else
1412 static intptr_t page;
1413 1525
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) 1526 if (addr < end)
1422 if (flags & EIO_MT_MODIFY) /* modify */ 1527 if (flags & EIO_MT_MODIFY) /* modify */
1423 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1528 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1424 else 1529 else
1425 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1530 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1531 }
1426 1532
1427 return 0; 1533 return 0;
1428} 1534}
1429 1535
1430/*****************************************************************************/ 1536/*****************************************************************************/
… …
1464 if (req) 1570 if (req)
1465 break; 1571 break;
1466 1572
1467 ++idle; 1573 ++idle;
1468 1574
1469 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1575 ts.tv_sec = time (0) + idle_timeout;
1470 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1576 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1471 { 1577 {
1472 if (idle > max_idle) 1578 if (idle > max_idle)
1473 { 1579 {
1474 --idle; 1580 --idle;
… …
1553 return 0; \ 1659 return 0; \
1554 } 1660 }
1555 1661
1556static void eio_execute (etp_worker *self, eio_req *req) 1662static void eio_execute (etp_worker *self, eio_req *req)
1557{ 1663{
1558 errno = 0;
1559
1560 switch (req->type) 1664 switch (req->type)
1561 { 1665 {
1562 case EIO_READ: ALLOC (req->size); 1666 case EIO_READ: ALLOC (req->size);
1563 req->result = req->offs >= 0 1667 req->result = req->offs >= 0
1564 ? pread (req->int1, req->ptr2, req->size, req->offs) 1668 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1575 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1679 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1576 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1680 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1577 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1681 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1578 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1682 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1579 1683
1684 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1685 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1686 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1687 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1688
1580 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1689 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; 1690 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; 1691 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; 1692 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; 1693 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1591 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1700 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1592 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1701 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; 1702 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1594 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1703 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1595 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1704 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; 1705 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1597 1706
1598 case EIO_READLINK: ALLOC (NAME_MAX); 1707 case EIO_READLINK: ALLOC (PATH_MAX);
1599 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1708 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1600 1709
1601 case EIO_SYNC: req->result = 0; sync (); break; 1710 case EIO_SYNC: req->result = 0; sync (); break;
1602 case EIO_FSYNC: req->result = fsync (req->int1); break; 1711 case EIO_FSYNC: req->result = fsync (req->int1); break;
1603 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1712 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1604 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1713 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; 1714 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1715 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1716 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; 1717 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1607 1718
1608 case EIO_READDIR: eio__scandir (req, self); break; 1719 case EIO_READDIR: eio__scandir (req, self); break;
1609 1720
1610 case EIO_BUSY: 1721 case EIO_BUSY:
1611#ifdef _WIN32 1722#ifdef _WIN32
1612 Sleep (req->nv1 * 1000.); 1723 Sleep (req->nv1 * 1e3);
1613#else 1724#else
1614 { 1725 {
1615 struct timeval tv; 1726 struct timeval tv;
1616 1727
1617 tv.tv_sec = req->nv1; 1728 tv.tv_sec = req->nv1;
1618 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1729 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1619 1730
1620 req->result = select (0, 0, 0, 0, &tv); 1731 req->result = select (0, 0, 0, 0, &tv);
1621 } 1732 }
1622#endif 1733#endif
1623 break; 1734 break;
… …
1638 times = tv; 1749 times = tv;
1639 } 1750 }
1640 else 1751 else
1641 times = 0; 1752 times = 0;
1642 1753
1643
1644 req->result = req->type == EIO_FUTIME 1754 req->result = req->type == EIO_FUTIME
1645 ? futimes (req->int1, times) 1755 ? futimes (req->int1, times)
1646 : utimes (req->ptr1, times); 1756 : utimes (req->ptr1, times);
1647 } 1757 }
1648 break; 1758 break;
… …
1657 case EIO_CUSTOM: 1767 case EIO_CUSTOM:
1658 ((void (*)(eio_req *))req->feed) (req); 1768 ((void (*)(eio_req *))req->feed) (req);
1659 break; 1769 break;
1660 1770
1661 default: 1771 default:
1772 errno = ENOSYS;
1662 req->result = -1; 1773 req->result = -1;
1663 break; 1774 break;
1664 } 1775 }
1665 1776
1666 req->errorno = errno; 1777 req->errorno = errno;
… …
1696eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1807eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1697{ 1808{
1698 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1809 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1699} 1810}
1700 1811
1812eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1813{
1814 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1815}
1816
1817eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1818{
1819 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1820}
1821
1701eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1822eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1702{ 1823{
1703 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1824 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1704} 1825}
1705 1826
… …
1729} 1850}
1730 1851
1731eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1852eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1732{ 1853{
1733 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1854 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1855}
1856
1857eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1858{
1859 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1734} 1860}
1735 1861
1736eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1862eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1737{ 1863{
1738 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1864 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) 1938eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1813{ 1939{
1814 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1940 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1815} 1941}
1816 1942
1943eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1944{
1945 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1946}
1947
1817eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1948eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1818{ 1949{
1819 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1950 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1820} 1951}
1821 1952
… …
1829 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1960 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1830} 1961}
1831 1962
1832eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1963eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1833{ 1964{
1834 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1965 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1835} 1966}
1836 1967
1837static eio_req * 1968static eio_req *
1838eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1969eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1839{ 1970{

Diff Legend

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