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.51 by root, Thu Jan 7 18:08:21 2010 UTC vs.
Revision 1.66 by root, Sun Jun 5 19:58:37 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 <sys/mman.h>
80# include <unistd.h> 88# include <unistd.h>
81# include <utime.h> 89# include <utime.h>
82# include <signal.h> 90# include <signal.h>
83# include <dirent.h> 91# include <dirent.h>
92
93#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
94# include <sys/mman.h>
95#endif
84 96
85/* 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 */
86# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 98# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
87# define _DIRENT_HAVE_D_TYPE /* sigh */ 99# define _DIRENT_HAVE_D_TYPE /* sigh */
88# define D_INO(de) (de)->d_fileno 100# define D_INO(de) (de)->d_fileno
… …
129#endif 141#endif
130#ifndef D_NAMLEN 142#ifndef D_NAMLEN
131# define D_NAMLEN(de) strlen ((de)->d_name) 143# define D_NAMLEN(de) strlen ((de)->d_name)
132#endif 144#endif
133 145
134/* number of seconds after which an idle threads exit */
135#define IDLE_TIMEOUT 10
136
137/* used for struct dirent, AIX doesn't provide it */ 146/* used for struct dirent, AIX doesn't provide it */
138#ifndef NAME_MAX 147#ifndef NAME_MAX
139# define NAME_MAX 4096 148# define NAME_MAX 4096
149#endif
150
151/* used for readlink etc. */
152#ifndef PATH_MAX
153# define PATH_MAX 4096
140#endif 154#endif
141 155
142/* buffer size for various temporary buffers */ 156/* buffer size for various temporary buffers */
143#define EIO_BUFSIZE 65536 157#define EIO_BUFSIZE 65536
144 158
… …
215static unsigned int max_poll_reqs; /* reslock */ 229static unsigned int max_poll_reqs; /* reslock */
216 230
217static volatile unsigned int nreqs; /* reqlock */ 231static volatile unsigned int nreqs; /* reqlock */
218static volatile unsigned int nready; /* reqlock */ 232static volatile unsigned int nready; /* reqlock */
219static volatile unsigned int npending; /* reqlock */ 233static volatile unsigned int npending; /* reqlock */
220static 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 */
221 236
222static mutex_t wrklock = X_MUTEX_INIT; 237static xmutex_t wrklock;
223static mutex_t reslock = X_MUTEX_INIT; 238static xmutex_t reslock;
224static mutex_t reqlock = X_MUTEX_INIT; 239static xmutex_t reqlock;
225static cond_t reqwait = X_COND_INIT; 240static xcond_t reqwait;
226 241
227#if !HAVE_PREADWRITE 242#if !HAVE_PREADWRITE
228/* 243/*
229 * make our pread/pwrite emulation safe against themselves, but not against 244 * make our pread/pwrite emulation safe against themselves, but not against
230 * 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,
231 * but that's your problem, not mine. 246 * but that's your problem, not mine.
232 */ 247 */
233static mutex_t preadwritelock = X_MUTEX_INIT; 248static xmutex_t preadwritelock = X_MUTEX_INIT;
234#endif 249#endif
235 250
236typedef struct etp_worker 251typedef struct etp_worker
237{ 252{
238 /* locked by wrklock */ 253 /* locked by wrklock */
239 struct etp_worker *prev, *next; 254 struct etp_worker *prev, *next;
240 255
241 thread_t tid; 256 xthread_t tid;
242 257
243 /* locked by reslock, reqlock or wrklock */ 258 /* locked by reslock, reqlock or wrklock */
244 ETP_REQ *req; /* currently processed request */ 259 ETP_REQ *req; /* currently processed request */
245 260
246 ETP_WORKER_COMMON 261 ETP_WORKER_COMMON
… …
360 } 375 }
361 376
362 abort (); 377 abort ();
363} 378}
364 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
365static void etp_atfork_prepare (void) 388static void etp_atfork_prepare (void)
366{ 389{
367 X_LOCK (wrklock); 390 X_LOCK (wrklock);
368 X_LOCK (reqlock); 391 X_LOCK (reqlock);
369 X_LOCK (reslock); 392 X_LOCK (reslock);
… …
407 idle = 0; 430 idle = 0;
408 nreqs = 0; 431 nreqs = 0;
409 nready = 0; 432 nready = 0;
410 npending = 0; 433 npending = 0;
411 434
412 etp_atfork_parent (); 435 etp_thread_init ();
413} 436}
414 437
415static void 438static void
416etp_once_init (void) 439etp_once_init (void)
417{ 440{
441 etp_thread_init ();
418 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);
419} 443}
420 444
421static int 445static int
422etp_init (void (*want_poll)(void), void (*done_poll)(void)) 446etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
613} 637}
614 638
615static void etp_set_max_idle (unsigned int nthreads) 639static void etp_set_max_idle (unsigned int nthreads)
616{ 640{
617 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
618 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;
619 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
620} 651}
621 652
622static void etp_set_min_parallel (unsigned int nthreads) 653static void etp_set_min_parallel (unsigned int nthreads)
623{ 654{
… …
751void eio_set_max_idle (unsigned int nthreads) 782void eio_set_max_idle (unsigned int nthreads)
752{ 783{
753 etp_set_max_idle (nthreads); 784 etp_set_max_idle (nthreads);
754} 785}
755 786
787void eio_set_idle_timeout (unsigned int seconds)
788{
789 etp_set_idle_timeout (seconds);
790}
791
756void eio_set_min_parallel (unsigned int nthreads) 792void eio_set_min_parallel (unsigned int nthreads)
757{ 793{
758 etp_set_min_parallel (nthreads); 794 etp_set_min_parallel (nthreads);
759} 795}
760 796
… …
808 844
809 return res; 845 return res;
810} 846}
811#endif 847#endif
812 848
813#ifndef HAVE_FUTIMES 849#ifndef HAVE_UTIMES
814 850
815# undef utimes 851# undef utimes
816# undef futimes
817# define utimes(path,times) eio__utimes (path, times) 852# define utimes(path,times) eio__utimes (path, times)
818# define futimes(fd,times) eio__futimes (fd, times)
819 853
820static int 854static int
821eio__utimes (const char *filename, const struct timeval times[2]) 855eio__utimes (const char *filename, const struct timeval times[2])
822{ 856{
823 if (times) 857 if (times)
… …
830 return utime (filename, &buf); 864 return utime (filename, &buf);
831 } 865 }
832 else 866 else
833 return utime (filename, 0); 867 return utime (filename, 0);
834} 868}
869
870#endif
871
872#ifndef HAVE_FUTIMES
873
874# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times)
835 876
836static int eio__futimes (int fd, const struct timeval tv[2]) 877static int eio__futimes (int fd, const struct timeval tv[2])
837{ 878{
838 errno = ENOSYS; 879 errno = ENOSYS;
839 return -1; 880 return -1;
… …
919 */ 960 */
920 { 961 {
921 off_t sbytes; 962 off_t sbytes;
922 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 963 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
923 964
965 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* freebsd' sendfile will return 0 when success */ 966 /* freebsd' sendfile will return 0 on success */
925 if (res == 0 && sbytes) 967 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
926 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 968 /* not on e.g. EIO or EPIPE - sounds broken */
969 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
970 res = sbytes;
971 #endif
972
973 /* according to source inspection, this is correct, and useful behaviour */
974 if (sbytes)
927 res = sbytes; 975 res = sbytes;
928 } 976 }
929 977
930# elif defined (__APPLE__) 978# elif defined (__APPLE__)
931 979
932 { 980 {
933 off_t sbytes = count; 981 off_t sbytes = count;
934 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 982 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
935 983
936 if (res == 0 && errno == EAGAIN && sbytes) 984 /* according to the manpage, sbytes is always valid */
985 if (sbytes)
937 res = sbytes; 986 res = sbytes;
938 } 987 }
939 988
940# elif __hpux 989# elif __hpux
941 res = sendfile (ofd, ifd, offset, count, 0, 0); 990 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
1020} 1069}
1021 1070
1022static signed char 1071static signed char
1023eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1072eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1024{ 1073{
1025 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1074 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1026 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1075 : a->inode < b->inode ? -1
1076 : a->inode > b->inode ? 1
1077 : 0;
1027} 1078}
1028 1079
1029#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1080#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1030 1081
1031#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1082#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1037 unsigned char bits [9 + sizeof (ino_t) * 8]; 1088 unsigned char bits [9 + sizeof (ino_t) * 8];
1038 unsigned char *bit = bits; 1089 unsigned char *bit = bits;
1039 1090
1040 assert (CHAR_BIT == 8); 1091 assert (CHAR_BIT == 8);
1041 assert (sizeof (eio_dirent) * 8 < 256); 1092 assert (sizeof (eio_dirent) * 8 < 256);
1042 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1093 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1043 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1094 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1044 1095
1045 if (size <= EIO_SORT_FAST) 1096 if (size <= EIO_SORT_FAST)
1046 return; 1097 return;
1047 1098
1048 /* first prepare an array of bits to test in our radix sort */ 1099 /* first prepare an array of bits to test in our radix sort */
… …
1203 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1254 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1204 1255
1205 X_LOCK (wrklock); 1256 X_LOCK (wrklock);
1206 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1257 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1207 self->dirp = dirp = opendir (req->ptr1); 1258 self->dirp = dirp = opendir (req->ptr1);
1259
1208 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1260 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1209 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1261 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1210 req->ptr2 = names = malloc (namesalloc); 1262 req->ptr2 = names = malloc (namesalloc);
1211 X_UNLOCK (wrklock); 1263 X_UNLOCK (wrklock);
1212 1264
… …
1224 /* sort etc. */ 1276 /* sort etc. */
1225 req->int1 = flags; 1277 req->int1 = flags;
1226 req->result = dentoffs; 1278 req->result = dentoffs;
1227 1279
1228 if (flags & EIO_READDIR_STAT_ORDER) 1280 if (flags & EIO_READDIR_STAT_ORDER)
1229 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1281 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1230 else if (flags & EIO_READDIR_DIRS_FIRST) 1282 else if (flags & EIO_READDIR_DIRS_FIRST)
1231 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1283 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1232 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1284 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1233 else 1285 else
1234 { 1286 {
… …
1236 eio_dirent *oth = dents + dentoffs; 1288 eio_dirent *oth = dents + dentoffs;
1237 eio_dirent *dir = dents; 1289 eio_dirent *dir = dents;
1238 1290
1239 /* now partition dirs to the front, and non-dirs to the back */ 1291 /* now partition dirs to the front, and non-dirs to the back */
1240 /* by walking from both sides and swapping if necessary */ 1292 /* by walking from both sides and swapping if necessary */
1241 /* also clear score, so it doesn't influence sorting */
1242 while (oth > dir) 1293 while (oth > dir)
1243 { 1294 {
1244 if (dir->type == EIO_DT_DIR) 1295 if (dir->type == EIO_DT_DIR)
1245 ++dir; 1296 ++dir;
1246 else if ((--oth)->type == EIO_DT_DIR) 1297 else if ((--oth)->type == EIO_DT_DIR)
… …
1249 1300
1250 ++dir; 1301 ++dir;
1251 } 1302 }
1252 } 1303 }
1253 1304
1254 /* now sort the dirs only */ 1305 /* now sort the dirs only (dirs all have the same score) */
1255 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1306 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1256 } 1307 }
1257 1308
1258 break; 1309 break;
1259 } 1310 }
… …
1379 break; 1430 break;
1380 } 1431 }
1381 } 1432 }
1382} 1433}
1383 1434
1435#ifdef PAGESIZE
1436# define eio_pagesize() PAGESIZE
1437#else
1438static intptr_t
1439eio_pagesize (void)
1440{
1441 static intptr_t page;
1442
1443 if (!page)
1444 page = sysconf (_SC_PAGESIZE);
1445
1446 return page;
1447}
1448#endif
1449
1450static void
1451eio_page_align (void **addr, size_t *length)
1452{
1453 intptr_t mask = eio_pagesize () - 1;
1454
1455 /* round down addr */
1456 intptr_t adj = mask & (intptr_t)*addr;
1457
1458 *addr = (void *)((intptr_t)*addr - adj);
1459 *length += adj;
1460
1461 /* round up length */
1462 *length = (*length + mask) & ~mask;
1463}
1464
1465#if !_POSIX_MEMLOCK
1466# define eio__mlockall(a) ((errno = ENOSYS), -1)
1467#else
1468
1469static int
1470eio__mlockall (int flags)
1471{
1472 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1473 extern int mallopt (int, int);
1474 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1475 #endif
1476
1477 if (EIO_MCL_CURRENT != MCL_CURRENT
1478 || EIO_MCL_FUTURE != MCL_FUTURE)
1479 {
1480 flags = 0
1481 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1482 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1483 }
1484
1485 return mlockall (flags);
1486}
1487#endif
1488
1489#if !_POSIX_MEMLOCK_RANGE
1490# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1491#else
1492
1493static int
1494eio__mlock (void *addr, size_t length)
1495{
1496 eio_page_align (&addr, &length);
1497
1498 return mlock (addr, length);
1499}
1500
1501#endif
1502
1384#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1503#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1385# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1504# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1386#else 1505#else
1387 1506
1388int 1507int
1389eio__msync (void *mem, size_t len, int flags) 1508eio__msync (void *mem, size_t len, int flags)
1390{ 1509{
1510 eio_page_align (&mem, &len);
1511
1391 if (EIO_MS_ASYNC != MS_SYNC 1512 if (EIO_MS_ASYNC != MS_SYNC
1392 || EIO_MS_INVALIDATE != MS_INVALIDATE 1513 || EIO_MS_INVALIDATE != MS_INVALIDATE
1393 || EIO_MS_SYNC != MS_SYNC) 1514 || EIO_MS_SYNC != MS_SYNC)
1394 { 1515 {
1395 flags = 0 1516 flags = 0
… …
1404#endif 1525#endif
1405 1526
1406int 1527int
1407eio__mtouch (void *mem, size_t len, int flags) 1528eio__mtouch (void *mem, size_t len, int flags)
1408{ 1529{
1530 eio_page_align (&mem, &len);
1531
1532 {
1409 intptr_t addr = (intptr_t)mem; 1533 intptr_t addr = (intptr_t)mem;
1410 intptr_t end = addr + len; 1534 intptr_t end = addr + len;
1411#ifdef PAGESIZE 1535 intptr_t page = eio_pagesize ();
1412 const intptr_t page = PAGESIZE;
1413#else
1414 static intptr_t page;
1415 1536
1416 if (!page)
1417 page = sysconf (_SC_PAGESIZE);
1418#endif
1419
1420 /* round down to start of page, although this is probably useless */
1421 addr &= ~(page - 1); /* assume page size is always a power of two */
1422
1423 if (addr < end) 1537 if (addr < end)
1424 if (flags & EIO_MT_MODIFY) /* modify */ 1538 if (flags & EIO_MT_MODIFY) /* modify */
1425 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1539 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1426 else 1540 else
1427 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1541 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1542 }
1428 1543
1429 return 0; 1544 return 0;
1430} 1545}
1431 1546
1432/*****************************************************************************/ 1547/*****************************************************************************/
… …
1466 if (req) 1581 if (req)
1467 break; 1582 break;
1468 1583
1469 ++idle; 1584 ++idle;
1470 1585
1471 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1586 ts.tv_sec = time (0) + idle_timeout;
1472 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1587 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1473 { 1588 {
1474 if (idle > max_idle) 1589 if (idle > max_idle)
1475 { 1590 {
1476 --idle; 1591 --idle;
… …
1555 return 0; \ 1670 return 0; \
1556 } 1671 }
1557 1672
1558static void eio_execute (etp_worker *self, eio_req *req) 1673static void eio_execute (etp_worker *self, eio_req *req)
1559{ 1674{
1560 errno = 0;
1561
1562 switch (req->type) 1675 switch (req->type)
1563 { 1676 {
1564 case EIO_READ: ALLOC (req->size); 1677 case EIO_READ: ALLOC (req->size);
1565 req->result = req->offs >= 0 1678 req->result = req->offs >= 0
1566 ? pread (req->int1, req->ptr2, req->size, req->offs) 1679 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1598 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1711 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1599 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1712 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1600 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1713 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1601 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1714 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1602 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1715 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1603 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1716 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1604 1717
1605 case EIO_READLINK: ALLOC (NAME_MAX); 1718 case EIO_READLINK: ALLOC (PATH_MAX);
1606 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1719 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1607 1720
1608 case EIO_SYNC: req->result = 0; sync (); break; 1721 case EIO_SYNC: req->result = 0; sync (); break;
1609 case EIO_FSYNC: req->result = fsync (req->int1); break; 1722 case EIO_FSYNC: req->result = fsync (req->int1); break;
1610 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1723 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1611 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1724 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1612 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1725 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1726 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1727 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1613 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1728 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1614 1729
1615 case EIO_READDIR: eio__scandir (req, self); break; 1730 case EIO_READDIR: eio__scandir (req, self); break;
1616 1731
1617 case EIO_BUSY: 1732 case EIO_BUSY:
1618#ifdef _WIN32 1733#ifdef _WIN32
1619 Sleep (req->nv1 * 1000.); 1734 Sleep (req->nv1 * 1e3);
1620#else 1735#else
1621 { 1736 {
1622 struct timeval tv; 1737 struct timeval tv;
1623 1738
1624 tv.tv_sec = req->nv1; 1739 tv.tv_sec = req->nv1;
1625 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1740 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1626 1741
1627 req->result = select (0, 0, 0, 0, &tv); 1742 req->result = select (0, 0, 0, 0, &tv);
1628 } 1743 }
1629#endif 1744#endif
1630 break; 1745 break;
… …
1645 times = tv; 1760 times = tv;
1646 } 1761 }
1647 else 1762 else
1648 times = 0; 1763 times = 0;
1649 1764
1650
1651 req->result = req->type == EIO_FUTIME 1765 req->result = req->type == EIO_FUTIME
1652 ? futimes (req->int1, times) 1766 ? futimes (req->int1, times)
1653 : utimes (req->ptr1, times); 1767 : utimes (req->ptr1, times);
1654 } 1768 }
1655 break; 1769 break;
… …
1664 case EIO_CUSTOM: 1778 case EIO_CUSTOM:
1665 ((void (*)(eio_req *))req->feed) (req); 1779 ((void (*)(eio_req *))req->feed) (req);
1666 break; 1780 break;
1667 1781
1668 default: 1782 default:
1783 errno = ENOSYS;
1669 req->result = -1; 1784 req->result = -1;
1670 break; 1785 break;
1671 } 1786 }
1672 1787
1673 req->errorno = errno; 1788 req->errorno = errno;
… …
1703eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1818eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1704{ 1819{
1705 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1820 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1706} 1821}
1707 1822
1823eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1824{
1825 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1826}
1827
1828eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1829{
1830 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1831}
1832
1708eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1833eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1709{ 1834{
1710 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1835 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1711} 1836}
1712 1837
… …
1846 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1971 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1847} 1972}
1848 1973
1849eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1974eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1850{ 1975{
1851 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1976 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1852} 1977}
1853 1978
1854static eio_req * 1979static eio_req *
1855eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1980eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1856{ 1981{

Diff Legend

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