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.52 by root, Fri Jan 8 09:29:56 2010 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,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 *
… …
74#else 74#else
75 75
76# include "config.h" 76# include "config.h"
77# include <sys/time.h> 77# include <sys/time.h>
78# include <sys/select.h> 78# include <sys/select.h>
79# include <sys/mman.h>
80# include <unistd.h> 79# include <unistd.h>
81# include <utime.h> 80# include <utime.h>
82# include <signal.h> 81# include <signal.h>
83# include <dirent.h> 82# include <dirent.h>
83
84#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
84 87
85/* 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 */
86# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
87# define _DIRENT_HAVE_D_TYPE /* sigh */ 90# define _DIRENT_HAVE_D_TYPE /* sigh */
88# define D_INO(de) (de)->d_fileno 91# define D_INO(de) (de)->d_fileno
… …
129#endif 132#endif
130#ifndef D_NAMLEN 133#ifndef D_NAMLEN
131# define D_NAMLEN(de) strlen ((de)->d_name) 134# define D_NAMLEN(de) strlen ((de)->d_name)
132#endif 135#endif
133 136
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 */ 137/* used for struct dirent, AIX doesn't provide it */
138#ifndef NAME_MAX 138#ifndef NAME_MAX
139# 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
140#endif 145#endif
141 146
142/* buffer size for various temporary buffers */ 147/* buffer size for various temporary buffers */
143#define EIO_BUFSIZE 65536 148#define EIO_BUFSIZE 65536
144 149
… …
215static unsigned int max_poll_reqs; /* reslock */ 220static unsigned int max_poll_reqs; /* reslock */
216 221
217static volatile unsigned int nreqs; /* reqlock */ 222static volatile unsigned int nreqs; /* reqlock */
218static volatile unsigned int nready; /* reqlock */ 223static volatile unsigned int nready; /* reqlock */
219static volatile unsigned int npending; /* reqlock */ 224static volatile unsigned int npending; /* reqlock */
220static 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 */
221 227
222static mutex_t wrklock = X_MUTEX_INIT; 228static xmutex_t wrklock;
223static mutex_t reslock = X_MUTEX_INIT; 229static xmutex_t reslock;
224static mutex_t reqlock = X_MUTEX_INIT; 230static xmutex_t reqlock;
225static cond_t reqwait = X_COND_INIT; 231static xcond_t reqwait;
226 232
227#if !HAVE_PREADWRITE 233#if !HAVE_PREADWRITE
228/* 234/*
229 * make our pread/pwrite emulation safe against themselves, but not against 235 * make our pread/pwrite emulation safe against themselves, but not against
230 * 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,
231 * but that's your problem, not mine. 237 * but that's your problem, not mine.
232 */ 238 */
233static mutex_t preadwritelock = X_MUTEX_INIT; 239static xmutex_t preadwritelock = X_MUTEX_INIT;
234#endif 240#endif
235 241
236typedef struct etp_worker 242typedef struct etp_worker
237{ 243{
238 /* locked by wrklock */ 244 /* locked by wrklock */
239 struct etp_worker *prev, *next; 245 struct etp_worker *prev, *next;
240 246
241 thread_t tid; 247 xthread_t tid;
242 248
243 /* locked by reslock, reqlock or wrklock */ 249 /* locked by reslock, reqlock or wrklock */
244 ETP_REQ *req; /* currently processed request */ 250 ETP_REQ *req; /* currently processed request */
245 251
246 ETP_WORKER_COMMON 252 ETP_WORKER_COMMON
… …
360 } 366 }
361 367
362 abort (); 368 abort ();
363} 369}
364 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
365static void etp_atfork_prepare (void) 379static void etp_atfork_prepare (void)
366{ 380{
367 X_LOCK (wrklock); 381 X_LOCK (wrklock);
368 X_LOCK (reqlock); 382 X_LOCK (reqlock);
369 X_LOCK (reslock); 383 X_LOCK (reslock);
… …
407 idle = 0; 421 idle = 0;
408 nreqs = 0; 422 nreqs = 0;
409 nready = 0; 423 nready = 0;
410 npending = 0; 424 npending = 0;
411 425
412 etp_atfork_parent (); 426 etp_thread_init ();
413} 427}
414 428
415static void 429static void
416etp_once_init (void) 430etp_once_init (void)
417{ 431{
432 etp_thread_init ();
418 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);
419} 434}
420 435
421static int 436static int
422etp_init (void (*want_poll)(void), void (*done_poll)(void)) 437etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
613} 628}
614 629
615static void etp_set_max_idle (unsigned int nthreads) 630static void etp_set_max_idle (unsigned int nthreads)
616{ 631{
617 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 632 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
618 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;
619 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
620} 642}
621 643
622static void etp_set_min_parallel (unsigned int nthreads) 644static void etp_set_min_parallel (unsigned int nthreads)
623{ 645{
… …
751void eio_set_max_idle (unsigned int nthreads) 773void eio_set_max_idle (unsigned int nthreads)
752{ 774{
753 etp_set_max_idle (nthreads); 775 etp_set_max_idle (nthreads);
754} 776}
755 777
778void eio_set_idle_timeout (unsigned int seconds)
779{
780 etp_set_idle_timeout (seconds);
781}
782
756void eio_set_min_parallel (unsigned int nthreads) 783void eio_set_min_parallel (unsigned int nthreads)
757{ 784{
758 etp_set_min_parallel (nthreads); 785 etp_set_min_parallel (nthreads);
759} 786}
760 787
… …
808 835
809 return res; 836 return res;
810} 837}
811#endif 838#endif
812 839
813#ifndef HAVE_FUTIMES 840#ifndef HAVE_UTIMES
814 841
815# undef utimes 842# undef utimes
816# undef futimes
817# define utimes(path,times) eio__utimes (path, times) 843# define utimes(path,times) eio__utimes (path, times)
818# define futimes(fd,times) eio__futimes (fd, times)
819 844
820static int 845static int
821eio__utimes (const char *filename, const struct timeval times[2]) 846eio__utimes (const char *filename, const struct timeval times[2])
822{ 847{
823 if (times) 848 if (times)
… …
830 return utime (filename, &buf); 855 return utime (filename, &buf);
831 } 856 }
832 else 857 else
833 return utime (filename, 0); 858 return utime (filename, 0);
834} 859}
860
861#endif
862
863#ifndef HAVE_FUTIMES
864
865# undef futimes
866# define futimes(fd,times) eio__futimes (fd, times)
835 867
836static int eio__futimes (int fd, const struct timeval tv[2]) 868static int eio__futimes (int fd, const struct timeval tv[2])
837{ 869{
838 errno = ENOSYS; 870 errno = ENOSYS;
839 return -1; 871 return -1;
… …
919 */ 951 */
920 { 952 {
921 off_t sbytes; 953 off_t sbytes;
922 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 954 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
923 955
956 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* freebsd' sendfile will return 0 on success */ 957 /* freebsd' sendfile will return 0 on success */
925 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */ 958 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
926 /* not on e.g. EIO or EPIPE - sounds broken */ 959 /* not on e.g. EIO or EPIPE - sounds broken */
927 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0) 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)
928 res = sbytes; 966 res = sbytes;
929 } 967 }
930 968
931# elif defined (__APPLE__) 969# elif defined (__APPLE__)
932 970
… …
1022} 1060}
1023 1061
1024static signed char 1062static signed char
1025eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1063eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1026{ 1064{
1027 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 */
1028 : 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;
1029} 1069}
1030 1070
1031#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
1032 1072
1033#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 */
… …
1039 unsigned char bits [9 + sizeof (ino_t) * 8]; 1079 unsigned char bits [9 + sizeof (ino_t) * 8];
1040 unsigned char *bit = bits; 1080 unsigned char *bit = bits;
1041 1081
1042 assert (CHAR_BIT == 8); 1082 assert (CHAR_BIT == 8);
1043 assert (sizeof (eio_dirent) * 8 < 256); 1083 assert (sizeof (eio_dirent) * 8 < 256);
1044 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1084 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1045 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1085 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1046 1086
1047 if (size <= EIO_SORT_FAST) 1087 if (size <= EIO_SORT_FAST)
1048 return; 1088 return;
1049 1089
1050 /* 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 */
… …
1205 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1245 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1206 1246
1207 X_LOCK (wrklock); 1247 X_LOCK (wrklock);
1208 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1248 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1209 self->dirp = dirp = opendir (req->ptr1); 1249 self->dirp = dirp = opendir (req->ptr1);
1250
1210 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1251 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1211 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1252 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1212 req->ptr2 = names = malloc (namesalloc); 1253 req->ptr2 = names = malloc (namesalloc);
1213 X_UNLOCK (wrklock); 1254 X_UNLOCK (wrklock);
1214 1255
… …
1226 /* sort etc. */ 1267 /* sort etc. */
1227 req->int1 = flags; 1268 req->int1 = flags;
1228 req->result = dentoffs; 1269 req->result = dentoffs;
1229 1270
1230 if (flags & EIO_READDIR_STAT_ORDER) 1271 if (flags & EIO_READDIR_STAT_ORDER)
1231 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);
1232 else if (flags & EIO_READDIR_DIRS_FIRST) 1273 else if (flags & EIO_READDIR_DIRS_FIRST)
1233 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1274 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1234 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 */
1235 else 1276 else
1236 { 1277 {
… …
1238 eio_dirent *oth = dents + dentoffs; 1279 eio_dirent *oth = dents + dentoffs;
1239 eio_dirent *dir = dents; 1280 eio_dirent *dir = dents;
1240 1281
1241 /* 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 */
1242 /* by walking from both sides and swapping if necessary */ 1283 /* by walking from both sides and swapping if necessary */
1243 /* also clear score, so it doesn't influence sorting */
1244 while (oth > dir) 1284 while (oth > dir)
1245 { 1285 {
1246 if (dir->type == EIO_DT_DIR) 1286 if (dir->type == EIO_DT_DIR)
1247 ++dir; 1287 ++dir;
1248 else if ((--oth)->type == EIO_DT_DIR) 1288 else if ((--oth)->type == EIO_DT_DIR)
… …
1251 1291
1252 ++dir; 1292 ++dir;
1253 } 1293 }
1254 } 1294 }
1255 1295
1256 /* now sort the dirs only */ 1296 /* now sort the dirs only (dirs all have the same score) */
1257 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1297 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1258 } 1298 }
1259 1299
1260 break; 1300 break;
1261 } 1301 }
… …
1381 break; 1421 break;
1382 } 1422 }
1383 } 1423 }
1384} 1424}
1385 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
1386#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1494#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1387# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1495# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1388#else 1496#else
1389 1497
1390int 1498int
1391eio__msync (void *mem, size_t len, int flags) 1499eio__msync (void *mem, size_t len, int flags)
1392{ 1500{
1501 eio_page_align (&mem, &len);
1502
1393 if (EIO_MS_ASYNC != MS_SYNC 1503 if (EIO_MS_ASYNC != MS_SYNC
1394 || EIO_MS_INVALIDATE != MS_INVALIDATE 1504 || EIO_MS_INVALIDATE != MS_INVALIDATE
1395 || EIO_MS_SYNC != MS_SYNC) 1505 || EIO_MS_SYNC != MS_SYNC)
1396 { 1506 {
1397 flags = 0 1507 flags = 0
… …
1406#endif 1516#endif
1407 1517
1408int 1518int
1409eio__mtouch (void *mem, size_t len, int flags) 1519eio__mtouch (void *mem, size_t len, int flags)
1410{ 1520{
1521 eio_page_align (&mem, &len);
1522
1523 {
1411 intptr_t addr = (intptr_t)mem; 1524 intptr_t addr = (intptr_t)mem;
1412 intptr_t end = addr + len; 1525 intptr_t end = addr + len;
1413#ifdef PAGESIZE 1526 intptr_t page = eio_pagesize ();
1414 const intptr_t page = PAGESIZE;
1415#else
1416 static intptr_t page;
1417 1527
1418 if (!page)
1419 page = sysconf (_SC_PAGESIZE);
1420#endif
1421
1422 /* round down to start of page, although this is probably useless */
1423 addr &= ~(page - 1); /* assume page size is always a power of two */
1424
1425 if (addr < end) 1528 if (addr < end)
1426 if (flags & EIO_MT_MODIFY) /* modify */ 1529 if (flags & EIO_MT_MODIFY) /* modify */
1427 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1530 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1428 else 1531 else
1429 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1532 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1533 }
1430 1534
1431 return 0; 1535 return 0;
1432} 1536}
1433 1537
1434/*****************************************************************************/ 1538/*****************************************************************************/
… …
1468 if (req) 1572 if (req)
1469 break; 1573 break;
1470 1574
1471 ++idle; 1575 ++idle;
1472 1576
1473 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1577 ts.tv_sec = time (0) + idle_timeout;
1474 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1578 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1475 { 1579 {
1476 if (idle > max_idle) 1580 if (idle > max_idle)
1477 { 1581 {
1478 --idle; 1582 --idle;
… …
1557 return 0; \ 1661 return 0; \
1558 } 1662 }
1559 1663
1560static void eio_execute (etp_worker *self, eio_req *req) 1664static void eio_execute (etp_worker *self, eio_req *req)
1561{ 1665{
1562 errno = 0;
1563
1564 switch (req->type) 1666 switch (req->type)
1565 { 1667 {
1566 case EIO_READ: ALLOC (req->size); 1668 case EIO_READ: ALLOC (req->size);
1567 req->result = req->offs >= 0 1669 req->result = req->offs >= 0
1568 ? pread (req->int1, req->ptr2, req->size, req->offs) 1670 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1600 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1702 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1601 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;
1602 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1704 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1603 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1705 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1604 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1706 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1605 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;
1606 1708
1607 case EIO_READLINK: ALLOC (NAME_MAX); 1709 case EIO_READLINK: ALLOC (PATH_MAX);
1608 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1710 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1609 1711
1610 case EIO_SYNC: req->result = 0; sync (); break; 1712 case EIO_SYNC: req->result = 0; sync (); break;
1611 case EIO_FSYNC: req->result = fsync (req->int1); break; 1713 case EIO_FSYNC: req->result = fsync (req->int1); break;
1612 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1714 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1613 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1715 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1614 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;
1615 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;
1616 1720
1617 case EIO_READDIR: eio__scandir (req, self); break; 1721 case EIO_READDIR: eio__scandir (req, self); break;
1618 1722
1619 case EIO_BUSY: 1723 case EIO_BUSY:
1620#ifdef _WIN32 1724#ifdef _WIN32
1621 Sleep (req->nv1 * 1000.); 1725 Sleep (req->nv1 * 1e3);
1622#else 1726#else
1623 { 1727 {
1624 struct timeval tv; 1728 struct timeval tv;
1625 1729
1626 tv.tv_sec = req->nv1; 1730 tv.tv_sec = req->nv1;
1627 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1731 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1628 1732
1629 req->result = select (0, 0, 0, 0, &tv); 1733 req->result = select (0, 0, 0, 0, &tv);
1630 } 1734 }
1631#endif 1735#endif
1632 break; 1736 break;
… …
1647 times = tv; 1751 times = tv;
1648 } 1752 }
1649 else 1753 else
1650 times = 0; 1754 times = 0;
1651 1755
1652
1653 req->result = req->type == EIO_FUTIME 1756 req->result = req->type == EIO_FUTIME
1654 ? futimes (req->int1, times) 1757 ? futimes (req->int1, times)
1655 : utimes (req->ptr1, times); 1758 : utimes (req->ptr1, times);
1656 } 1759 }
1657 break; 1760 break;
… …
1666 case EIO_CUSTOM: 1769 case EIO_CUSTOM:
1667 ((void (*)(eio_req *))req->feed) (req); 1770 ((void (*)(eio_req *))req->feed) (req);
1668 break; 1771 break;
1669 1772
1670 default: 1773 default:
1774 errno = ENOSYS;
1671 req->result = -1; 1775 req->result = -1;
1672 break; 1776 break;
1673 } 1777 }
1674 1778
1675 req->errorno = errno; 1779 req->errorno = errno;
… …
1705eio_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)
1706{ 1810{
1707 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;
1708} 1812}
1709 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
1710eio_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)
1711{ 1825{
1712 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;
1713} 1827}
1714 1828
… …
1848 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1962 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1849} 1963}
1850 1964
1851eio_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)
1852{ 1966{
1853 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;
1854} 1968}
1855 1969
1856static eio_req * 1970static eio_req *
1857eio__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)
1858{ 1972{

Diff Legend

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