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.55 by root, Wed Mar 31 00:46:18 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 140#endif
141 141
… …
220static unsigned int max_poll_reqs; /* reslock */ 220static unsigned int max_poll_reqs; /* reslock */
221 221
222static volatile unsigned int nreqs; /* reqlock */ 222static volatile unsigned int nreqs; /* reqlock */
223static volatile unsigned int nready; /* reqlock */ 223static volatile unsigned int nready; /* reqlock */
224static volatile unsigned int npending; /* reqlock */ 224static volatile unsigned int npending; /* reqlock */
225static 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 */
226 227
227static xmutex_t wrklock = X_MUTEX_INIT; 228static xmutex_t wrklock;
228static xmutex_t reslock = X_MUTEX_INIT; 229static xmutex_t reslock;
229static xmutex_t reqlock = X_MUTEX_INIT; 230static xmutex_t reqlock;
230static xcond_t reqwait = X_COND_INIT; 231static xcond_t reqwait;
231 232
232#if !HAVE_PREADWRITE 233#if !HAVE_PREADWRITE
233/* 234/*
234 * make our pread/pwrite emulation safe against themselves, but not against 235 * make our pread/pwrite emulation safe against themselves, but not against
235 * 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,
… …
365 } 366 }
366 367
367 abort (); 368 abort ();
368} 369}
369 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
370static void etp_atfork_prepare (void) 379static void etp_atfork_prepare (void)
371{ 380{
372 X_LOCK (wrklock); 381 X_LOCK (wrklock);
373 X_LOCK (reqlock); 382 X_LOCK (reqlock);
374 X_LOCK (reslock); 383 X_LOCK (reslock);
… …
412 idle = 0; 421 idle = 0;
413 nreqs = 0; 422 nreqs = 0;
414 nready = 0; 423 nready = 0;
415 npending = 0; 424 npending = 0;
416 425
417 etp_atfork_parent (); 426 etp_thread_init ();
418} 427}
419 428
420static void 429static void
421etp_once_init (void) 430etp_once_init (void)
422{ 431{
432 etp_thread_init ();
423 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);
424} 434}
425 435
426static int 436static int
427etp_init (void (*want_poll)(void), void (*done_poll)(void)) 437etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
618} 628}
619 629
620static void etp_set_max_idle (unsigned int nthreads) 630static void etp_set_max_idle (unsigned int nthreads)
621{ 631{
622 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 632 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
623 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;
624 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
625} 642}
626 643
627static void etp_set_min_parallel (unsigned int nthreads) 644static void etp_set_min_parallel (unsigned int nthreads)
628{ 645{
… …
756void eio_set_max_idle (unsigned int nthreads) 773void eio_set_max_idle (unsigned int nthreads)
757{ 774{
758 etp_set_max_idle (nthreads); 775 etp_set_max_idle (nthreads);
759} 776}
760 777
778void eio_set_idle_timeout (unsigned int seconds)
779{
780 etp_set_idle_timeout (seconds);
781}
782
761void eio_set_min_parallel (unsigned int nthreads) 783void eio_set_min_parallel (unsigned int nthreads)
762{ 784{
763 etp_set_min_parallel (nthreads); 785 etp_set_min_parallel (nthreads);
764} 786}
765 787
… …
813 835
814 return res; 836 return res;
815} 837}
816#endif 838#endif
817 839
818#ifndef HAVE_FUTIMES 840#ifndef HAVE_UTIMES
819 841
820# undef utimes 842# undef utimes
821# undef futimes
822# define utimes(path,times) eio__utimes (path, times) 843# define utimes(path,times) eio__utimes (path, times)
823# define futimes(fd,times) eio__futimes (fd, times)
824 844
825static int 845static int
826eio__utimes (const char *filename, const struct timeval times[2]) 846eio__utimes (const char *filename, const struct timeval times[2])
827{ 847{
828 if (times) 848 if (times)
… …
835 return utime (filename, &buf); 855 return utime (filename, &buf);
836 } 856 }
837 else 857 else
838 return utime (filename, 0); 858 return utime (filename, 0);
839} 859}
860
861#endif
862
863#ifndef HAVE_FUTIMES
864
865# undef futimes
866# define futimes(fd,times) eio__futimes (fd, times)
840 867
841static int eio__futimes (int fd, const struct timeval tv[2]) 868static int eio__futimes (int fd, const struct timeval tv[2])
842{ 869{
843 errno = ENOSYS; 870 errno = ENOSYS;
844 return -1; 871 return -1;
… …
1033} 1060}
1034 1061
1035static signed char 1062static signed char
1036eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1063eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1037{ 1064{
1038 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 */
1039 : 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;
1040} 1069}
1041 1070
1042#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
1043 1072
1044#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 */
… …
1050 unsigned char bits [9 + sizeof (ino_t) * 8]; 1079 unsigned char bits [9 + sizeof (ino_t) * 8];
1051 unsigned char *bit = bits; 1080 unsigned char *bit = bits;
1052 1081
1053 assert (CHAR_BIT == 8); 1082 assert (CHAR_BIT == 8);
1054 assert (sizeof (eio_dirent) * 8 < 256); 1083 assert (sizeof (eio_dirent) * 8 < 256);
1055 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1084 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1056 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1085 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1057 1086
1058 if (size <= EIO_SORT_FAST) 1087 if (size <= EIO_SORT_FAST)
1059 return; 1088 return;
1060 1089
1061 /* 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 */
… …
1216 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1245 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1217 1246
1218 X_LOCK (wrklock); 1247 X_LOCK (wrklock);
1219 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1248 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1220 self->dirp = dirp = opendir (req->ptr1); 1249 self->dirp = dirp = opendir (req->ptr1);
1250
1221 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1251 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1222 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1252 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1223 req->ptr2 = names = malloc (namesalloc); 1253 req->ptr2 = names = malloc (namesalloc);
1224 X_UNLOCK (wrklock); 1254 X_UNLOCK (wrklock);
1225 1255
… …
1237 /* sort etc. */ 1267 /* sort etc. */
1238 req->int1 = flags; 1268 req->int1 = flags;
1239 req->result = dentoffs; 1269 req->result = dentoffs;
1240 1270
1241 if (flags & EIO_READDIR_STAT_ORDER) 1271 if (flags & EIO_READDIR_STAT_ORDER)
1242 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);
1243 else if (flags & EIO_READDIR_DIRS_FIRST) 1273 else if (flags & EIO_READDIR_DIRS_FIRST)
1244 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1274 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1245 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 */
1246 else 1276 else
1247 { 1277 {
… …
1249 eio_dirent *oth = dents + dentoffs; 1279 eio_dirent *oth = dents + dentoffs;
1250 eio_dirent *dir = dents; 1280 eio_dirent *dir = dents;
1251 1281
1252 /* 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 */
1253 /* by walking from both sides and swapping if necessary */ 1283 /* by walking from both sides and swapping if necessary */
1254 /* also clear score, so it doesn't influence sorting */
1255 while (oth > dir) 1284 while (oth > dir)
1256 { 1285 {
1257 if (dir->type == EIO_DT_DIR) 1286 if (dir->type == EIO_DT_DIR)
1258 ++dir; 1287 ++dir;
1259 else if ((--oth)->type == EIO_DT_DIR) 1288 else if ((--oth)->type == EIO_DT_DIR)
… …
1262 1291
1263 ++dir; 1292 ++dir;
1264 } 1293 }
1265 } 1294 }
1266 1295
1267 /* now sort the dirs only */ 1296 /* now sort the dirs only (dirs all have the same score) */
1268 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1297 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1269 } 1298 }
1270 1299
1271 break; 1300 break;
1272 } 1301 }
… …
1392 break; 1421 break;
1393 } 1422 }
1394 } 1423 }
1395} 1424}
1396 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
1397#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1494#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1398# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1495# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1399#else 1496#else
1400 1497
1401int 1498int
1402eio__msync (void *mem, size_t len, int flags) 1499eio__msync (void *mem, size_t len, int flags)
1403{ 1500{
1501 eio_page_align (&mem, &len);
1502
1404 if (EIO_MS_ASYNC != MS_SYNC 1503 if (EIO_MS_ASYNC != MS_SYNC
1405 || EIO_MS_INVALIDATE != MS_INVALIDATE 1504 || EIO_MS_INVALIDATE != MS_INVALIDATE
1406 || EIO_MS_SYNC != MS_SYNC) 1505 || EIO_MS_SYNC != MS_SYNC)
1407 { 1506 {
1408 flags = 0 1507 flags = 0
… …
1417#endif 1516#endif
1418 1517
1419int 1518int
1420eio__mtouch (void *mem, size_t len, int flags) 1519eio__mtouch (void *mem, size_t len, int flags)
1421{ 1520{
1521 eio_page_align (&mem, &len);
1522
1523 {
1422 intptr_t addr = (intptr_t)mem; 1524 intptr_t addr = (intptr_t)mem;
1423 intptr_t end = addr + len; 1525 intptr_t end = addr + len;
1424#ifdef PAGESIZE 1526 intptr_t page = eio_pagesize ();
1425 const intptr_t page = PAGESIZE;
1426#else
1427 static intptr_t page;
1428 1527
1429 if (!page)
1430 page = sysconf (_SC_PAGESIZE);
1431#endif
1432
1433 /* round down to start of page, although this is probably useless */
1434 addr &= ~(page - 1); /* assume page size is always a power of two */
1435
1436 if (addr < end) 1528 if (addr < end)
1437 if (flags & EIO_MT_MODIFY) /* modify */ 1529 if (flags & EIO_MT_MODIFY) /* modify */
1438 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1530 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1439 else 1531 else
1440 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1532 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1533 }
1441 1534
1442 return 0; 1535 return 0;
1443} 1536}
1444 1537
1445/*****************************************************************************/ 1538/*****************************************************************************/
… …
1479 if (req) 1572 if (req)
1480 break; 1573 break;
1481 1574
1482 ++idle; 1575 ++idle;
1483 1576
1484 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1577 ts.tv_sec = time (0) + idle_timeout;
1485 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1578 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1486 { 1579 {
1487 if (idle > max_idle) 1580 if (idle > max_idle)
1488 { 1581 {
1489 --idle; 1582 --idle;
… …
1568 return 0; \ 1661 return 0; \
1569 } 1662 }
1570 1663
1571static void eio_execute (etp_worker *self, eio_req *req) 1664static void eio_execute (etp_worker *self, eio_req *req)
1572{ 1665{
1573 errno = 0;
1574
1575 switch (req->type) 1666 switch (req->type)
1576 { 1667 {
1577 case EIO_READ: ALLOC (req->size); 1668 case EIO_READ: ALLOC (req->size);
1578 req->result = req->offs >= 0 1669 req->result = req->offs >= 0
1579 ? pread (req->int1, req->ptr2, req->size, req->offs) 1670 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1611 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1702 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1612 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;
1613 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1704 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1614 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1705 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1615 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1706 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1616 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;
1617 1708
1618 case EIO_READLINK: ALLOC (PATH_MAX); 1709 case EIO_READLINK: ALLOC (PATH_MAX);
1619 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1710 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1620 1711
1621 case EIO_SYNC: req->result = 0; sync (); break; 1712 case EIO_SYNC: req->result = 0; sync (); break;
1622 case EIO_FSYNC: req->result = fsync (req->int1); break; 1713 case EIO_FSYNC: req->result = fsync (req->int1); break;
1623 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1714 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1624 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;
1625 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;
1626 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;
1627 1720
1628 case EIO_READDIR: eio__scandir (req, self); break; 1721 case EIO_READDIR: eio__scandir (req, self); break;
1629 1722
1630 case EIO_BUSY: 1723 case EIO_BUSY:
1631#ifdef _WIN32 1724#ifdef _WIN32
1632 Sleep (req->nv1 * 1000.); 1725 Sleep (req->nv1 * 1e3);
1633#else 1726#else
1634 { 1727 {
1635 struct timeval tv; 1728 struct timeval tv;
1636 1729
1637 tv.tv_sec = req->nv1; 1730 tv.tv_sec = req->nv1;
1638 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1731 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1639 1732
1640 req->result = select (0, 0, 0, 0, &tv); 1733 req->result = select (0, 0, 0, 0, &tv);
1641 } 1734 }
1642#endif 1735#endif
1643 break; 1736 break;
… …
1658 times = tv; 1751 times = tv;
1659 } 1752 }
1660 else 1753 else
1661 times = 0; 1754 times = 0;
1662 1755
1663
1664 req->result = req->type == EIO_FUTIME 1756 req->result = req->type == EIO_FUTIME
1665 ? futimes (req->int1, times) 1757 ? futimes (req->int1, times)
1666 : utimes (req->ptr1, times); 1758 : utimes (req->ptr1, times);
1667 } 1759 }
1668 break; 1760 break;
… …
1677 case EIO_CUSTOM: 1769 case EIO_CUSTOM:
1678 ((void (*)(eio_req *))req->feed) (req); 1770 ((void (*)(eio_req *))req->feed) (req);
1679 break; 1771 break;
1680 1772
1681 default: 1773 default:
1774 errno = ENOSYS;
1682 req->result = -1; 1775 req->result = -1;
1683 break; 1776 break;
1684 } 1777 }
1685 1778
1686 req->errorno = errno; 1779 req->errorno = errno;
… …
1716eio_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)
1717{ 1810{
1718 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;
1719} 1812}
1720 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
1721eio_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)
1722{ 1825{
1723 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;
1724} 1827}
1725 1828
… …
1859 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1962 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1860} 1963}
1861 1964
1862eio_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)
1863{ 1966{
1864 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;
1865} 1968}
1866 1969
1867static eio_req * 1970static eio_req *
1868eio__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)
1869{ 1972{

Diff Legend

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