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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.44 by root, Thu Nov 26 05:25:35 2009 UTC vs.
Revision 1.64 by root, Thu May 26 04:05:18 2011 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,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 defined(__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 defined(__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
91# endif 95# endif
92 96
93#ifdef _D_EXACT_NAMLEN 97#ifdef _D_EXACT_NAMLEN
94# undef D_NAMLEN 98# undef D_NAMLEN
… …
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 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 /* not yet */ 120# elif __solaris
117# include <sys/sendfile.h> 121# include <sys/sendfile.h>
118# else 122# else
119# error sendfile support requested but not available 123# error sendfile support requested but not available
120# endif 124# endif
121#endif 125#endif
… …
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)
966 res = sbytes;
967 }
968
969# elif defined (__APPLE__)
970
971 {
972 off_t sbytes = count;
973 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
974
975 /* according to the manpage, sbytes is always valid */
976 if (sbytes)
925 res = sbytes; 977 res = sbytes;
926 } 978 }
927 979
928# elif __hpux 980# elif __hpux
929 res = sendfile (ofd, ifd, offset, count, 0, 0); 981 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
943 if (res < 0 && sbytes) 995 if (res < 0 && sbytes)
944 res = sbytes; 996 res = sbytes;
945 } 997 }
946 998
947# endif 999# endif
1000
1001#elif defined (_WIN32)
1002
1003 /* does not work, just for documentation of what would need to be done */
1004 {
1005 HANDLE h = TO_SOCKET (ifd);
1006 SetFilePointer (h, offset, 0, FILE_BEGIN);
1007 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1008 }
1009
948#else 1010#else
949 res = -1; 1011 res = -1;
950 errno = ENOSYS; 1012 errno = ENOSYS;
951#endif 1013#endif
952 1014
953 if (res < 0 1015 if (res < 0
954 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1016 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1017 /* BSDs */
1018#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1019 || errno == ENOTSUP
1020#endif
1021 || errno == EOPNOTSUPP /* BSDs */
955#if __solaris 1022#if __solaris
956 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1023 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
957#endif 1024#endif
958 ) 1025 )
959 ) 1026 )
… …
993} 1060}
994 1061
995static signed char 1062static signed char
996eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1063eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
997{ 1064{
998 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1065 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
999 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1066 : a->inode < b->inode ? -1
1067 : a->inode > b->inode ? 1
1068 : 0;
1000} 1069}
1001 1070
1002#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1071#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1003 1072
1004#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1073#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1010 unsigned char bits [9 + sizeof (ino_t) * 8]; 1079 unsigned char bits [9 + sizeof (ino_t) * 8];
1011 unsigned char *bit = bits; 1080 unsigned char *bit = bits;
1012 1081
1013 assert (CHAR_BIT == 8); 1082 assert (CHAR_BIT == 8);
1014 assert (sizeof (eio_dirent) * 8 < 256); 1083 assert (sizeof (eio_dirent) * 8 < 256);
1015 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1084 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1016 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1085 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1017 1086
1018 if (size <= EIO_SORT_FAST) 1087 if (size <= EIO_SORT_FAST)
1019 return; 1088 return;
1020 1089
1021 /* first prepare an array of bits to test in our radix sort */ 1090 /* first prepare an array of bits to test in our radix sort */
… …
1176 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1245 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1177 1246
1178 X_LOCK (wrklock); 1247 X_LOCK (wrklock);
1179 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1248 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1180 self->dirp = dirp = opendir (req->ptr1); 1249 self->dirp = dirp = opendir (req->ptr1);
1250
1181 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1251 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1182 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1252 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1183 req->ptr2 = names = malloc (namesalloc); 1253 req->ptr2 = names = malloc (namesalloc);
1184 X_UNLOCK (wrklock); 1254 X_UNLOCK (wrklock);
1185 1255
… …
1197 /* sort etc. */ 1267 /* sort etc. */
1198 req->int1 = flags; 1268 req->int1 = flags;
1199 req->result = dentoffs; 1269 req->result = dentoffs;
1200 1270
1201 if (flags & EIO_READDIR_STAT_ORDER) 1271 if (flags & EIO_READDIR_STAT_ORDER)
1202 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1272 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1203 else if (flags & EIO_READDIR_DIRS_FIRST) 1273 else if (flags & EIO_READDIR_DIRS_FIRST)
1204 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1274 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1205 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1275 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1206 else 1276 else
1207 { 1277 {
… …
1209 eio_dirent *oth = dents + dentoffs; 1279 eio_dirent *oth = dents + dentoffs;
1210 eio_dirent *dir = dents; 1280 eio_dirent *dir = dents;
1211 1281
1212 /* now partition dirs to the front, and non-dirs to the back */ 1282 /* now partition dirs to the front, and non-dirs to the back */
1213 /* by walking from both sides and swapping if necessary */ 1283 /* by walking from both sides and swapping if necessary */
1214 /* also clear score, so it doesn't influence sorting */
1215 while (oth > dir) 1284 while (oth > dir)
1216 { 1285 {
1217 if (dir->type == EIO_DT_DIR) 1286 if (dir->type == EIO_DT_DIR)
1218 ++dir; 1287 ++dir;
1219 else if ((--oth)->type == EIO_DT_DIR) 1288 else if ((--oth)->type == EIO_DT_DIR)
… …
1222 1291
1223 ++dir; 1292 ++dir;
1224 } 1293 }
1225 } 1294 }
1226 1295
1227 /* now sort the dirs only */ 1296 /* now sort the dirs only (dirs all have the same score) */
1228 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1297 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1229 } 1298 }
1230 1299
1231 break; 1300 break;
1232 } 1301 }
… …
1352 break; 1421 break;
1353 } 1422 }
1354 } 1423 }
1355} 1424}
1356 1425
1426#ifdef PAGESIZE
1427# define eio_pagesize() PAGESIZE
1428#else
1429static intptr_t
1430eio_pagesize (void)
1431{
1432 static intptr_t page;
1433
1434 if (!page)
1435 page = sysconf (_SC_PAGESIZE);
1436
1437 return page;
1438}
1439#endif
1440
1441static void
1442eio_page_align (void **addr, size_t *length)
1443{
1444 intptr_t mask = eio_pagesize () - 1;
1445
1446 /* round down addr */
1447 intptr_t adj = mask & (intptr_t)*addr;
1448
1449 *addr = (void *)((intptr_t)*addr - adj);
1450 *length += adj;
1451
1452 /* round up length */
1453 *length = (*length + mask) & ~mask;
1454}
1455
1456#if !_POSIX_MEMLOCK
1457# define eio__mlockall(a) ((errno = ENOSYS), -1)
1458#else
1459
1460static int
1461eio__mlockall (int flags)
1462{
1463 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1464 extern int mallopt (int, int);
1465 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1466 #endif
1467
1468 if (EIO_MCL_CURRENT != MCL_CURRENT
1469 || EIO_MCL_FUTURE != MCL_FUTURE)
1470 {
1471 flags = 0
1472 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1473 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1474 }
1475
1476 return mlockall (flags);
1477}
1478#endif
1479
1480#if !_POSIX_MEMLOCK_RANGE
1481# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1482#else
1483
1484static int
1485eio__mlock (void *addr, size_t length)
1486{
1487 eio_page_align (&addr, &length);
1488
1489 return mlock (addr, length);
1490}
1491
1492#endif
1493
1357#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1494#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1358# undef msync
1359# define msync(a,b,c) ((errno = ENOSYS), -1) 1495# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1496#else
1497
1498int
1499eio__msync (void *mem, size_t len, int flags)
1500{
1501 eio_page_align (&mem, &len);
1502
1503 if (EIO_MS_ASYNC != MS_SYNC
1504 || EIO_MS_INVALIDATE != MS_INVALIDATE
1505 || EIO_MS_SYNC != MS_SYNC)
1506 {
1507 flags = 0
1508 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1509 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1510 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1511 }
1512
1513 return msync (mem, len, flags);
1514}
1515
1360#endif 1516#endif
1361 1517
1362int 1518int
1363eio__mtouch (void *mem, size_t len, int flags) 1519eio__mtouch (void *mem, size_t len, int flags)
1364{ 1520{
1521 eio_page_align (&mem, &len);
1522
1523 {
1365 intptr_t addr = (intptr_t)mem; 1524 intptr_t addr = (intptr_t)mem;
1366 intptr_t end = addr + len; 1525 intptr_t end = addr + len;
1367#ifdef PAGESIZE 1526 intptr_t page = eio_pagesize ();
1368 const intptr_t page = PAGESIZE;
1369#else
1370 static intptr_t page;
1371 1527
1372 if (!page)
1373 page = sysconf (_SC_PAGESIZE);
1374#endif
1375
1376 addr &= ~(page - 1); /* assume page size is always a power of two */
1377
1378 if (addr < end) 1528 if (addr < end)
1379 if (flags) /* modify */ 1529 if (flags & EIO_MT_MODIFY) /* modify */
1380 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1530 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1381 else 1531 else
1382 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1532 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1533 }
1383 1534
1384 return 0; 1535 return 0;
1385} 1536}
1386 1537
1387/*****************************************************************************/ 1538/*****************************************************************************/
… …
1421 if (req) 1572 if (req)
1422 break; 1573 break;
1423 1574
1424 ++idle; 1575 ++idle;
1425 1576
1426 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1577 ts.tv_sec = time (0) + idle_timeout;
1427 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1578 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1428 { 1579 {
1429 if (idle > max_idle) 1580 if (idle > max_idle)
1430 { 1581 {
1431 --idle; 1582 --idle;
… …
1510 return 0; \ 1661 return 0; \
1511 } 1662 }
1512 1663
1513static void eio_execute (etp_worker *self, eio_req *req) 1664static void eio_execute (etp_worker *self, eio_req *req)
1514{ 1665{
1515 errno = 0;
1516
1517 switch (req->type) 1666 switch (req->type)
1518 { 1667 {
1519 case EIO_READ: ALLOC (req->size); 1668 case EIO_READ: ALLOC (req->size);
1520 req->result = req->offs >= 0 1669 req->result = req->offs >= 0
1521 ? pread (req->int1, req->ptr2, req->size, req->offs) 1670 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1532 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1681 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1533 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1682 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1534 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1683 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1535 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1684 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1536 1685
1686 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1687 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1688 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1689 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1690
1537 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1691 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1538 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1692 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1539 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1693 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1540 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1694 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1541 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1695 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1548 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1702 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1549 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1703 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1550 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1704 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1551 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1705 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1552 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1706 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1553 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1707 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1554 1708
1555 case EIO_READLINK: ALLOC (NAME_MAX); 1709 case EIO_READLINK: ALLOC (PATH_MAX);
1556 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1710 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1557 1711
1558 case EIO_SYNC: req->result = 0; sync (); break; 1712 case EIO_SYNC: req->result = 0; sync (); break;
1559 case EIO_FSYNC: req->result = fsync (req->int1); break; 1713 case EIO_FSYNC: req->result = fsync (req->int1); break;
1560 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1714 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1561 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1715 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1562 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1716 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1717 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1718 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1563 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1719 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1564 1720
1565 case EIO_READDIR: eio__scandir (req, self); break; 1721 case EIO_READDIR: eio__scandir (req, self); break;
1566 1722
1567 case EIO_BUSY: 1723 case EIO_BUSY:
1568#ifdef _WIN32 1724#ifdef _WIN32
1569 Sleep (req->nv1 * 1000.); 1725 Sleep (req->nv1 * 1e3);
1570#else 1726#else
1571 { 1727 {
1572 struct timeval tv; 1728 struct timeval tv;
1573 1729
1574 tv.tv_sec = req->nv1; 1730 tv.tv_sec = req->nv1;
1575 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1731 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1576 1732
1577 req->result = select (0, 0, 0, 0, &tv); 1733 req->result = select (0, 0, 0, 0, &tv);
1578 } 1734 }
1579#endif 1735#endif
1580 break; 1736 break;
… …
1595 times = tv; 1751 times = tv;
1596 } 1752 }
1597 else 1753 else
1598 times = 0; 1754 times = 0;
1599 1755
1600
1601 req->result = req->type == EIO_FUTIME 1756 req->result = req->type == EIO_FUTIME
1602 ? futimes (req->int1, times) 1757 ? futimes (req->int1, times)
1603 : utimes (req->ptr1, times); 1758 : utimes (req->ptr1, times);
1604 } 1759 }
1605 break; 1760 break;
… …
1614 case EIO_CUSTOM: 1769 case EIO_CUSTOM:
1615 ((void (*)(eio_req *))req->feed) (req); 1770 ((void (*)(eio_req *))req->feed) (req);
1616 break; 1771 break;
1617 1772
1618 default: 1773 default:
1774 errno = ENOSYS;
1619 req->result = -1; 1775 req->result = -1;
1620 break; 1776 break;
1621 } 1777 }
1622 1778
1623 req->errorno = errno; 1779 req->errorno = errno;
… …
1653eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1809eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1654{ 1810{
1655 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1811 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1656} 1812}
1657 1813
1814eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1815{
1816 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1817}
1818
1819eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1820{
1821 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1822}
1823
1658eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1824eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1659{ 1825{
1660 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1826 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1661} 1827}
1662 1828
… …
1686} 1852}
1687 1853
1688eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1854eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1689{ 1855{
1690 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1856 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1857}
1858
1859eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1860{
1861 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1691} 1862}
1692 1863
1693eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1864eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1694{ 1865{
1695 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1866 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
… …
1769eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1940eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1770{ 1941{
1771 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1942 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1772} 1943}
1773 1944
1945eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1946{
1947 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1948}
1949
1774eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1950eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1775{ 1951{
1776 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1952 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1777} 1953}
1778 1954
… …
1786 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1962 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1787} 1963}
1788 1964
1789eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1965eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1790{ 1966{
1791 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1967 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1792} 1968}
1793 1969
1794static eio_req * 1970static eio_req *
1795eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1971eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1796{ 1972{

Diff Legend

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