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

Comparing libeio/eio.c (file contents):
Revision 1.56 by root, Sun Sep 12 03:36:28 2010 UTC vs.
Revision 1.69 by root, Fri Jun 10 06:50:42 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 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifndef _WIN32
41# include "config.h"
42#endif
43
40#include "eio.h" 44#include "eio.h"
41 45
42#ifdef EIO_STACKSIZE 46#ifdef EIO_STACKSIZE
43# define XTHREAD_STACKSIZE EIO_STACKSIZE 47# define XTHREAD_STACKSIZE EIO_STACKSIZE
44#endif 48#endif
… …
54#include <sys/statvfs.h> 58#include <sys/statvfs.h>
55#include <limits.h> 59#include <limits.h>
56#include <fcntl.h> 60#include <fcntl.h>
57#include <assert.h> 61#include <assert.h>
58 62
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes form stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H
66# include <stdint.h>
67#endif
68
59#ifndef EIO_FINISH 69#ifndef EIO_FINISH
60# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 70# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
61#endif 71#endif
62 72
63#ifndef EIO_DESTROY 73#ifndef EIO_DESTROY
… …
71#ifdef _WIN32 81#ifdef _WIN32
72 82
73 /*doh*/ 83 /*doh*/
74#else 84#else
75 85
76# include "config.h"
77# include <sys/time.h> 86# include <sys/time.h>
78# include <sys/select.h> 87# include <sys/select.h>
79# include <unistd.h> 88# include <unistd.h>
80# include <utime.h> 89# include <utime.h>
81# include <signal.h> 90# include <signal.h>
82# include <dirent.h> 91# include <dirent.h>
83 92
84#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES 93#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h> 94# include <sys/mman.h>
86#endif 95#endif
87 96
88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 97/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 98# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
… …
132#endif 141#endif
133#ifndef D_NAMLEN 142#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 143# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 144#endif
136 145
137/* number of seconds after which an idle threads exit */
138#define IDLE_TIMEOUT 10
139
140/* used for struct dirent, AIX doesn't provide it */ 146/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 147#ifndef NAME_MAX
142# define NAME_MAX 4096 148# define NAME_MAX 4096
143#endif 149#endif
144 150
… …
223static unsigned int max_poll_reqs; /* reslock */ 229static unsigned int max_poll_reqs; /* reslock */
224 230
225static volatile unsigned int nreqs; /* reqlock */ 231static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 232static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 233static volatile unsigned int npending; /* reqlock */
228static volatile unsigned int max_idle = 4; 234static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
235static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
229 236
230static xmutex_t wrklock = X_MUTEX_INIT; 237static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 238static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 239static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 240static xcond_t reqwait;
234 241
235#if !HAVE_PREADWRITE 242#if !HAVE_PREADWRITE
236/* 243/*
237 * make our pread/pwrite emulation safe against themselves, but not against 244 * make our pread/pwrite emulation safe against themselves, but not against
238 * normal read/write by using a mutex. slows down execution a lot, 245 * normal read/write by using a mutex. slows down execution a lot,
… …
368 } 375 }
369 376
370 abort (); 377 abort ();
371} 378}
372 379
380static void etp_thread_init (void)
381{
382 X_MUTEX_CREATE (wrklock);
383 X_MUTEX_CREATE (reslock);
384 X_MUTEX_CREATE (reqlock);
385 X_COND_CREATE (reqwait);
386}
387
373static void etp_atfork_prepare (void) 388static void etp_atfork_prepare (void)
374{ 389{
375 X_LOCK (wrklock); 390 X_LOCK (wrklock);
376 X_LOCK (reqlock); 391 X_LOCK (reqlock);
377 X_LOCK (reslock); 392 X_LOCK (reslock);
… …
415 idle = 0; 430 idle = 0;
416 nreqs = 0; 431 nreqs = 0;
417 nready = 0; 432 nready = 0;
418 npending = 0; 433 npending = 0;
419 434
420 etp_atfork_parent (); 435 etp_thread_init ();
421} 436}
422 437
423static void 438static void
424etp_once_init (void) 439etp_once_init (void)
425{ 440{
441 etp_thread_init ();
426 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 442 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
427} 443}
428 444
429static int 445static int
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 446etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
621} 637}
622 638
623static void etp_set_max_idle (unsigned int nthreads) 639static void etp_set_max_idle (unsigned int nthreads)
624{ 640{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 max_idle = nthreads <= 0 ? 1 : nthreads; 642 max_idle = nthreads;
643 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
644}
645
646static void etp_set_idle_timeout (unsigned int seconds)
647{
648 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
649 idle_timeout = seconds;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 651}
629 652
630static void etp_set_min_parallel (unsigned int nthreads) 653static void etp_set_min_parallel (unsigned int nthreads)
631{ 654{
… …
759void eio_set_max_idle (unsigned int nthreads) 782void eio_set_max_idle (unsigned int nthreads)
760{ 783{
761 etp_set_max_idle (nthreads); 784 etp_set_max_idle (nthreads);
762} 785}
763 786
787void eio_set_idle_timeout (unsigned int seconds)
788{
789 etp_set_idle_timeout (seconds);
790}
791
764void eio_set_min_parallel (unsigned int nthreads) 792void eio_set_min_parallel (unsigned int nthreads)
765{ 793{
766 etp_set_min_parallel (nthreads); 794 etp_set_min_parallel (nthreads);
767} 795}
768 796
… …
816 844
817 return res; 845 return res;
818} 846}
819#endif 847#endif
820 848
821#ifndef HAVE_FUTIMES 849#ifndef HAVE_UTIMES
822 850
823# undef utimes 851# undef utimes
824# undef futimes
825# define utimes(path,times) eio__utimes (path, times) 852# define utimes(path,times) eio__utimes (path, times)
826# define futimes(fd,times) eio__futimes (fd, times)
827 853
828static int 854static int
829eio__utimes (const char *filename, const struct timeval times[2]) 855eio__utimes (const char *filename, const struct timeval times[2])
830{ 856{
831 if (times) 857 if (times)
… …
838 return utime (filename, &buf); 864 return utime (filename, &buf);
839 } 865 }
840 else 866 else
841 return utime (filename, 0); 867 return utime (filename, 0);
842} 868}
869
870#endif
871
872#ifndef HAVE_FUTIMES
873
874# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times)
843 876
844static int eio__futimes (int fd, const struct timeval tv[2]) 877static int eio__futimes (int fd, const struct timeval tv[2])
845{ 878{
846 errno = ENOSYS; 879 errno = ENOSYS;
847 return -1; 880 return -1;
… …
909 942
910/* sendfile always needs emulation */ 943/* sendfile always needs emulation */
911static ssize_t 944static ssize_t
912eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 945eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
913{ 946{
947 ssize_t written = 0;
914 ssize_t res; 948 ssize_t res;
915 949
916 if (!count) 950 if (!count)
917 return 0; 951 return 0;
918 952
953 for (;;)
954 {
919#if HAVE_SENDFILE 955#if HAVE_SENDFILE
920# if __linux 956# if __linux
957 off_t soffset = offset;
921 res = sendfile (ofd, ifd, &offset, count); 958 res = sendfile (ofd, ifd, &soffset, count);
922 959
923# elif __FreeBSD__ 960# elif __FreeBSD__
924 /* 961 /*
925 * Of course, the freebsd sendfile is a dire hack with no thoughts 962 * Of course, the freebsd sendfile is a dire hack with no thoughts
926 * wasted on making it similar to other I/O functions. 963 * wasted on making it similar to other I/O functions.
927 */ 964 */
928 {
929 off_t sbytes; 965 off_t sbytes;
930 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 966 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
931 967
932 #if 0 /* according to the manpage, this is correct, but broken behaviour */ 968 #if 0 /* according to the manpage, this is correct, but broken behaviour */
933 /* freebsd' sendfile will return 0 on success */ 969 /* freebsd' sendfile will return 0 on success */
934 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 970 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
935 /* not on e.g. EIO or EPIPE - sounds broken */ 971 /* not on e.g. EIO or EPIPE - sounds broken */
936 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 972 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
937 res = sbytes; 973 res = sbytes;
938 #endif 974 #endif
939 975
940 /* according to source inspection, this is correct, and useful behaviour */ 976 /* according to source inspection, this is correct, and useful behaviour */
941 if (sbytes) 977 if (sbytes)
942 res = sbytes; 978 res = sbytes;
943 }
944 979
945# elif defined (__APPLE__) 980# elif defined (__APPLE__)
946
947 {
948 off_t sbytes = count; 981 off_t sbytes = count;
949 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 982 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
950 983
951 /* according to the manpage, sbytes is always valid */ 984 /* according to the manpage, sbytes is always valid */
952 if (sbytes) 985 if (sbytes)
953 res = sbytes; 986 res = sbytes;
954 }
955 987
956# elif __hpux 988# elif __hpux
957 res = sendfile (ofd, ifd, offset, count, 0, 0); 989 res = sendfile (ofd, ifd, offset, count, 0, 0);
958 990
959# elif __solaris 991# elif __solaris
960 {
961 struct sendfilevec vec; 992 struct sendfilevec vec;
962 size_t sbytes; 993 size_t sbytes;
963 994
964 vec.sfv_fd = ifd; 995 vec.sfv_fd = ifd;
965 vec.sfv_flag = 0; 996 vec.sfv_flag = 0;
966 vec.sfv_off = offset; 997 vec.sfv_off = offset;
967 vec.sfv_len = count; 998 vec.sfv_len = count;
968 999
969 res = sendfilev (ofd, &vec, 1, &sbytes); 1000 res = sendfilev (ofd, &vec, 1, &sbytes);
970 1001
971 if (res < 0 && sbytes) 1002 if (res < 0 && sbytes)
972 res = sbytes; 1003 res = sbytes;
973 }
974 1004
975# endif 1005# endif
976 1006
977#elif defined (_WIN32) 1007#elif defined (_WIN32)
978
979 /* does not work, just for documentation of what would need to be done */ 1008 /* does not work, just for documentation of what would need to be done */
980 {
981 HANDLE h = TO_SOCKET (ifd); 1009 HANDLE h = TO_SOCKET (ifd);
982 SetFilePointer (h, offset, 0, FILE_BEGIN); 1010 SetFilePointer (h, offset, 0, FILE_BEGIN);
983 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 1011 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
984 }
985 1012
986#else 1013#else
987 res = -1; 1014 res = -1;
988 errno = ENOSYS; 1015 errno = ENOSYS;
989#endif 1016#endif
990 1017
1018 /* we assume sendfile can copy at least 128mb in one go */
1019 if (res <= 128 * 1024 * 1024)
1020 {
1021 if (res > 0)
1022 written += res;
1023
1024 if (written)
1025 return written;
1026
1027 break;
1028 }
1029 else
1030 {
1031 /* if we requested more, then probably the kernel was lazy */
1032 written += res;
1033 offset += res;
1034 count -= res;
1035
1036 if (!count)
1037 return written;
1038 }
1039 }
1040
991 if (res < 0 1041 if (res < 0
992 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1042 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
993 /* BSDs */ 1043 /* BSDs */
994#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1044#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
995 || errno == ENOTSUP 1045 || errno == ENOTSUP
996#endif 1046#endif
… …
1036} 1086}
1037 1087
1038static signed char 1088static signed char
1039eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1089eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1040{ 1090{
1041 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1091 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1042 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1092 : a->inode < b->inode ? -1
1093 : a->inode > b->inode ? 1
1094 : 0;
1043} 1095}
1044 1096
1045#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1097#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1046 1098
1047#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1099#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1053 unsigned char bits [9 + sizeof (ino_t) * 8]; 1105 unsigned char bits [9 + sizeof (ino_t) * 8];
1054 unsigned char *bit = bits; 1106 unsigned char *bit = bits;
1055 1107
1056 assert (CHAR_BIT == 8); 1108 assert (CHAR_BIT == 8);
1057 assert (sizeof (eio_dirent) * 8 < 256); 1109 assert (sizeof (eio_dirent) * 8 < 256);
1058 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1110 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1059 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1111 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1060 1112
1061 if (size <= EIO_SORT_FAST) 1113 if (size <= EIO_SORT_FAST)
1062 return; 1114 return;
1063 1115
1064 /* first prepare an array of bits to test in our radix sort */ 1116 /* first prepare an array of bits to test in our radix sort */
… …
1219 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1271 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1220 1272
1221 X_LOCK (wrklock); 1273 X_LOCK (wrklock);
1222 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1274 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1223 self->dirp = dirp = opendir (req->ptr1); 1275 self->dirp = dirp = opendir (req->ptr1);
1276
1224 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1277 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1225 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1278 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1226 req->ptr2 = names = malloc (namesalloc); 1279 req->ptr2 = names = malloc (namesalloc);
1227 X_UNLOCK (wrklock); 1280 X_UNLOCK (wrklock);
1228 1281
… …
1240 /* sort etc. */ 1293 /* sort etc. */
1241 req->int1 = flags; 1294 req->int1 = flags;
1242 req->result = dentoffs; 1295 req->result = dentoffs;
1243 1296
1244 if (flags & EIO_READDIR_STAT_ORDER) 1297 if (flags & EIO_READDIR_STAT_ORDER)
1245 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1298 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1246 else if (flags & EIO_READDIR_DIRS_FIRST) 1299 else if (flags & EIO_READDIR_DIRS_FIRST)
1247 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1300 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1248 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1301 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1249 else 1302 else
1250 { 1303 {
… …
1252 eio_dirent *oth = dents + dentoffs; 1305 eio_dirent *oth = dents + dentoffs;
1253 eio_dirent *dir = dents; 1306 eio_dirent *dir = dents;
1254 1307
1255 /* now partition dirs to the front, and non-dirs to the back */ 1308 /* now partition dirs to the front, and non-dirs to the back */
1256 /* by walking from both sides and swapping if necessary */ 1309 /* by walking from both sides and swapping if necessary */
1257 /* also clear score, so it doesn't influence sorting */
1258 while (oth > dir) 1310 while (oth > dir)
1259 { 1311 {
1260 if (dir->type == EIO_DT_DIR) 1312 if (dir->type == EIO_DT_DIR)
1261 ++dir; 1313 ++dir;
1262 else if ((--oth)->type == EIO_DT_DIR) 1314 else if ((--oth)->type == EIO_DT_DIR)
… …
1265 1317
1266 ++dir; 1318 ++dir;
1267 } 1319 }
1268 } 1320 }
1269 1321
1270 /* now sort the dirs only */ 1322 /* now sort the dirs only (dirs all have the same score) */
1271 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1323 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1272 } 1324 }
1273 1325
1274 break; 1326 break;
1275 } 1327 }
… …
1426 /* round up length */ 1478 /* round up length */
1427 *length = (*length + mask) & ~mask; 1479 *length = (*length + mask) & ~mask;
1428} 1480}
1429 1481
1430#if !_POSIX_MEMLOCK 1482#if !_POSIX_MEMLOCK
1431# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1432# define eio__mlockall(a) ((errno = ENOSYS), -1) 1483# define eio__mlockall(a) ((errno = ENOSYS), -1)
1433#else 1484#else
1434
1435static int
1436eio__mlock (void *addr, size_t length)
1437{
1438 eio_page_align (&addr, &length);
1439
1440 mlock (addr, length);
1441}
1442 1485
1443static int 1486static int
1444eio__mlockall (int flags) 1487eio__mlockall (int flags)
1445{ 1488{
1446 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 1489 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
… …
1454 flags = 0 1497 flags = 0
1455 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0) 1498 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1456 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0); 1499 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1457 } 1500 }
1458 1501
1459 mlockall (flags); 1502 return mlockall (flags);
1460} 1503}
1504#endif
1505
1506#if !_POSIX_MEMLOCK_RANGE
1507# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1508#else
1509
1510static int
1511eio__mlock (void *addr, size_t length)
1512{
1513 eio_page_align (&addr, &length);
1514
1515 return mlock (addr, length);
1516}
1517
1461#endif 1518#endif
1462 1519
1463#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1520#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1464# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1521# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1465#else 1522#else
… …
1483} 1540}
1484 1541
1485#endif 1542#endif
1486 1543
1487int 1544int
1488eio__mtouch (void *mem, size_t len, int flags) 1545eio__mtouch (eio_req *req)
1489{ 1546{
1547 void *mem = req->ptr2;
1548 size_t len = req->size;
1549 int flags = req->int1;
1550
1490 eio_page_align (&mem, &len); 1551 eio_page_align (&mem, &len);
1491 1552
1492 { 1553 {
1493 intptr_t addr = (intptr_t)mem; 1554 intptr_t addr = (intptr_t)mem;
1494 intptr_t end = addr + len; 1555 intptr_t end = addr + len;
1495 intptr_t page = eio_pagesize (); 1556 intptr_t page = eio_pagesize ();
1496 1557
1497 if (addr < end) 1558 if (addr < end)
1498 if (flags & EIO_MT_MODIFY) /* modify */ 1559 if (flags & EIO_MT_MODIFY) /* modify */
1499 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1560 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1500 else 1561 else
1501 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1562 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1502 } 1563 }
1503 1564
1504 return 0; 1565 return 0;
1505} 1566}
1506 1567
… …
1541 if (req) 1602 if (req)
1542 break; 1603 break;
1543 1604
1544 ++idle; 1605 ++idle;
1545 1606
1546 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1607 ts.tv_sec = time (0) + idle_timeout;
1547 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1608 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1548 { 1609 {
1549 if (idle > max_idle) 1610 if (idle > max_idle)
1550 { 1611 {
1551 --idle; 1612 --idle;
… …
1630 return 0; \ 1691 return 0; \
1631 } 1692 }
1632 1693
1633static void eio_execute (etp_worker *self, eio_req *req) 1694static void eio_execute (etp_worker *self, eio_req *req)
1634{ 1695{
1635 errno = 0;
1636
1637 switch (req->type) 1696 switch (req->type)
1638 { 1697 {
1639 case EIO_READ: ALLOC (req->size); 1698 case EIO_READ: ALLOC (req->size);
1640 req->result = req->offs >= 0 1699 req->result = req->offs >= 0
1641 ? pread (req->int1, req->ptr2, req->size, req->offs) 1700 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1673 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1732 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1674 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1733 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1675 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1734 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1676 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1735 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1677 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1736 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1678 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1737 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1679 1738
1680 case EIO_READLINK: ALLOC (PATH_MAX); 1739 case EIO_READLINK: ALLOC (PATH_MAX);
1681 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1740 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1682 1741
1683 case EIO_SYNC: req->result = 0; sync (); break; 1742 case EIO_SYNC: req->result = 0; sync (); break;
1684 case EIO_FSYNC: req->result = fsync (req->int1); break; 1743 case EIO_FSYNC: req->result = fsync (req->int1); break;
1685 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1744 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1686 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1745 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1687 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1746 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1688 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1747 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1689 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1748 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1690 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1749 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1691 1750
1692 case EIO_READDIR: eio__scandir (req, self); break; 1751 case EIO_READDIR: eio__scandir (req, self); break;
1693 1752
1694 case EIO_BUSY: 1753 case EIO_BUSY:
1695#ifdef _WIN32 1754#ifdef _WIN32
1696 Sleep (req->nv1 * 1000.); 1755 Sleep (req->nv1 * 1e3);
1697#else 1756#else
1698 { 1757 {
1699 struct timeval tv; 1758 struct timeval tv;
1700 1759
1701 tv.tv_sec = req->nv1; 1760 tv.tv_sec = req->nv1;
1702 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1761 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1703 1762
1704 req->result = select (0, 0, 0, 0, &tv); 1763 req->result = select (0, 0, 0, 0, &tv);
1705 } 1764 }
1706#endif 1765#endif
1707 break; 1766 break;
… …
1722 times = tv; 1781 times = tv;
1723 } 1782 }
1724 else 1783 else
1725 times = 0; 1784 times = 0;
1726 1785
1727
1728 req->result = req->type == EIO_FUTIME 1786 req->result = req->type == EIO_FUTIME
1729 ? futimes (req->int1, times) 1787 ? futimes (req->int1, times)
1730 : utimes (req->ptr1, times); 1788 : utimes (req->ptr1, times);
1731 } 1789 }
1732 break; 1790 break;
… …
1737 case EIO_NOP: 1795 case EIO_NOP:
1738 req->result = 0; 1796 req->result = 0;
1739 break; 1797 break;
1740 1798
1741 case EIO_CUSTOM: 1799 case EIO_CUSTOM:
1742 ((void (*)(eio_req *))req->feed) (req); 1800 req->feed (req);
1743 break; 1801 break;
1744 1802
1745 default: 1803 default:
1804 errno = ENOSYS;
1746 req->result = -1; 1805 req->result = -1;
1747 break; 1806 break;
1748 } 1807 }
1749 1808
1750 req->errorno = errno; 1809 req->errorno = errno;
… …
1933 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1992 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1934} 1993}
1935 1994
1936eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1995eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1937{ 1996{
1938 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1997 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1939} 1998}
1940 1999
1941static eio_req * 2000static eio_req *
1942eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2001eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1943{ 2002{
… …
1967eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2026eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1968{ 2027{
1969 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2028 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1970} 2029}
1971 2030
1972eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 2031eio_req *eio_custom (void (*)(eio_req *) execute, int pri, eio_cb cb, void *data);
1973{ 2032{
1974 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND; 2033 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1975} 2034}
1976 2035
1977#endif 2036#endif
1978 2037
1979eio_req *eio_grp (eio_cb cb, void *data) 2038eio_req *eio_grp (eio_cb cb, void *data)

Diff Legend

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