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.54 by root, Tue Feb 23 14:32:45 2010 UTC vs.
Revision 1.65 by root, Mon May 30 12:56:50 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
… …
71#ifdef _WIN32 75#ifdef _WIN32
72 76
73 /*doh*/ 77 /*doh*/
74#else 78#else
75 79
76# include "config.h"
77# include <sys/time.h> 80# include <sys/time.h>
78# include <sys/select.h> 81# include <sys/select.h>
79# include <sys/mman.h>
80# include <unistd.h> 82# include <unistd.h>
81# include <utime.h> 83# include <utime.h>
82# include <signal.h> 84# include <signal.h>
83# include <dirent.h> 85# include <dirent.h>
86
87#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
88# include <sys/mman.h>
89#endif
84 90
85/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 91/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
86# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 92# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
87# define _DIRENT_HAVE_D_TYPE /* sigh */ 93# define _DIRENT_HAVE_D_TYPE /* sigh */
88# define D_INO(de) (de)->d_fileno 94# define D_INO(de) (de)->d_fileno
… …
129#endif 135#endif
130#ifndef D_NAMLEN 136#ifndef D_NAMLEN
131# define D_NAMLEN(de) strlen ((de)->d_name) 137# define D_NAMLEN(de) strlen ((de)->d_name)
132#endif 138#endif
133 139
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 */ 140/* used for struct dirent, AIX doesn't provide it */
138#ifndef NAME_MAX 141#ifndef NAME_MAX
139# define NAME_MAX 4096 142# define NAME_MAX 4096
140#endif 143#endif
141 144
… …
220static unsigned int max_poll_reqs; /* reslock */ 223static unsigned int max_poll_reqs; /* reslock */
221 224
222static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
223static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
224static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
225static volatile unsigned int max_idle = 4; 228static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
229static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
226 230
227static mutex_t wrklock = X_MUTEX_INIT; 231static xmutex_t wrklock;
228static mutex_t reslock = X_MUTEX_INIT; 232static xmutex_t reslock;
229static mutex_t reqlock = X_MUTEX_INIT; 233static xmutex_t reqlock;
230static cond_t reqwait = X_COND_INIT; 234static xcond_t reqwait;
231 235
232#if !HAVE_PREADWRITE 236#if !HAVE_PREADWRITE
233/* 237/*
234 * make our pread/pwrite emulation safe against themselves, but not against 238 * make our pread/pwrite emulation safe against themselves, but not against
235 * normal read/write by using a mutex. slows down execution a lot, 239 * normal read/write by using a mutex. slows down execution a lot,
236 * but that's your problem, not mine. 240 * but that's your problem, not mine.
237 */ 241 */
238static mutex_t preadwritelock = X_MUTEX_INIT; 242static xmutex_t preadwritelock = X_MUTEX_INIT;
239#endif 243#endif
240 244
241typedef struct etp_worker 245typedef struct etp_worker
242{ 246{
243 /* locked by wrklock */ 247 /* locked by wrklock */
244 struct etp_worker *prev, *next; 248 struct etp_worker *prev, *next;
245 249
246 thread_t tid; 250 xthread_t tid;
247 251
248 /* locked by reslock, reqlock or wrklock */ 252 /* locked by reslock, reqlock or wrklock */
249 ETP_REQ *req; /* currently processed request */ 253 ETP_REQ *req; /* currently processed request */
250 254
251 ETP_WORKER_COMMON 255 ETP_WORKER_COMMON
… …
365 } 369 }
366 370
367 abort (); 371 abort ();
368} 372}
369 373
374static void etp_thread_init (void)
375{
376 X_MUTEX_CREATE (wrklock);
377 X_MUTEX_CREATE (reslock);
378 X_MUTEX_CREATE (reqlock);
379 X_COND_CREATE (reqwait);
380}
381
370static void etp_atfork_prepare (void) 382static void etp_atfork_prepare (void)
371{ 383{
372 X_LOCK (wrklock); 384 X_LOCK (wrklock);
373 X_LOCK (reqlock); 385 X_LOCK (reqlock);
374 X_LOCK (reslock); 386 X_LOCK (reslock);
… …
412 idle = 0; 424 idle = 0;
413 nreqs = 0; 425 nreqs = 0;
414 nready = 0; 426 nready = 0;
415 npending = 0; 427 npending = 0;
416 428
417 etp_atfork_parent (); 429 etp_thread_init ();
418} 430}
419 431
420static void 432static void
421etp_once_init (void) 433etp_once_init (void)
422{ 434{
435 etp_thread_init ();
423 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 436 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
424} 437}
425 438
426static int 439static int
427etp_init (void (*want_poll)(void), void (*done_poll)(void)) 440etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
618} 631}
619 632
620static void etp_set_max_idle (unsigned int nthreads) 633static void etp_set_max_idle (unsigned int nthreads)
621{ 634{
622 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 635 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
623 max_idle = nthreads <= 0 ? 1 : nthreads; 636 max_idle = nthreads;
637 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
638}
639
640static void etp_set_idle_timeout (unsigned int seconds)
641{
642 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
643 idle_timeout = seconds;
624 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 644 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
625} 645}
626 646
627static void etp_set_min_parallel (unsigned int nthreads) 647static void etp_set_min_parallel (unsigned int nthreads)
628{ 648{
… …
756void eio_set_max_idle (unsigned int nthreads) 776void eio_set_max_idle (unsigned int nthreads)
757{ 777{
758 etp_set_max_idle (nthreads); 778 etp_set_max_idle (nthreads);
759} 779}
760 780
781void eio_set_idle_timeout (unsigned int seconds)
782{
783 etp_set_idle_timeout (seconds);
784}
785
761void eio_set_min_parallel (unsigned int nthreads) 786void eio_set_min_parallel (unsigned int nthreads)
762{ 787{
763 etp_set_min_parallel (nthreads); 788 etp_set_min_parallel (nthreads);
764} 789}
765 790
… …
813 838
814 return res; 839 return res;
815} 840}
816#endif 841#endif
817 842
818#ifndef HAVE_FUTIMES 843#ifndef HAVE_UTIMES
819 844
820# undef utimes 845# undef utimes
821# undef futimes
822# define utimes(path,times) eio__utimes (path, times) 846# define utimes(path,times) eio__utimes (path, times)
823# define futimes(fd,times) eio__futimes (fd, times)
824 847
825static int 848static int
826eio__utimes (const char *filename, const struct timeval times[2]) 849eio__utimes (const char *filename, const struct timeval times[2])
827{ 850{
828 if (times) 851 if (times)
… …
835 return utime (filename, &buf); 858 return utime (filename, &buf);
836 } 859 }
837 else 860 else
838 return utime (filename, 0); 861 return utime (filename, 0);
839} 862}
863
864#endif
865
866#ifndef HAVE_FUTIMES
867
868# undef futimes
869# define futimes(fd,times) eio__futimes (fd, times)
840 870
841static int eio__futimes (int fd, const struct timeval tv[2]) 871static int eio__futimes (int fd, const struct timeval tv[2])
842{ 872{
843 errno = ENOSYS; 873 errno = ENOSYS;
844 return -1; 874 return -1;
… …
1033} 1063}
1034 1064
1035static signed char 1065static signed char
1036eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1066eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1037{ 1067{
1038 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1068 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; 1069 : a->inode < b->inode ? -1
1070 : a->inode > b->inode ? 1
1071 : 0;
1040} 1072}
1041 1073
1042#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1074#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1043 1075
1044#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1076#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
… …
1050 unsigned char bits [9 + sizeof (ino_t) * 8]; 1082 unsigned char bits [9 + sizeof (ino_t) * 8];
1051 unsigned char *bit = bits; 1083 unsigned char *bit = bits;
1052 1084
1053 assert (CHAR_BIT == 8); 1085 assert (CHAR_BIT == 8);
1054 assert (sizeof (eio_dirent) * 8 < 256); 1086 assert (sizeof (eio_dirent) * 8 < 256);
1055 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1087 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1056 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1088 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1057 1089
1058 if (size <= EIO_SORT_FAST) 1090 if (size <= EIO_SORT_FAST)
1059 return; 1091 return;
1060 1092
1061 /* first prepare an array of bits to test in our radix sort */ 1093 /* first prepare an array of bits to test in our radix sort */
… …
1216 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1248 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1217 1249
1218 X_LOCK (wrklock); 1250 X_LOCK (wrklock);
1219 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1251 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1220 self->dirp = dirp = opendir (req->ptr1); 1252 self->dirp = dirp = opendir (req->ptr1);
1253
1221 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1254 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1222 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1255 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1223 req->ptr2 = names = malloc (namesalloc); 1256 req->ptr2 = names = malloc (namesalloc);
1224 X_UNLOCK (wrklock); 1257 X_UNLOCK (wrklock);
1225 1258
… …
1237 /* sort etc. */ 1270 /* sort etc. */
1238 req->int1 = flags; 1271 req->int1 = flags;
1239 req->result = dentoffs; 1272 req->result = dentoffs;
1240 1273
1241 if (flags & EIO_READDIR_STAT_ORDER) 1274 if (flags & EIO_READDIR_STAT_ORDER)
1242 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */ 1275 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1243 else if (flags & EIO_READDIR_DIRS_FIRST) 1276 else if (flags & EIO_READDIR_DIRS_FIRST)
1244 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1277 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1245 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1278 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1246 else 1279 else
1247 { 1280 {
… …
1249 eio_dirent *oth = dents + dentoffs; 1282 eio_dirent *oth = dents + dentoffs;
1250 eio_dirent *dir = dents; 1283 eio_dirent *dir = dents;
1251 1284
1252 /* now partition dirs to the front, and non-dirs to the back */ 1285 /* now partition dirs to the front, and non-dirs to the back */
1253 /* by walking from both sides and swapping if necessary */ 1286 /* by walking from both sides and swapping if necessary */
1254 /* also clear score, so it doesn't influence sorting */
1255 while (oth > dir) 1287 while (oth > dir)
1256 { 1288 {
1257 if (dir->type == EIO_DT_DIR) 1289 if (dir->type == EIO_DT_DIR)
1258 ++dir; 1290 ++dir;
1259 else if ((--oth)->type == EIO_DT_DIR) 1291 else if ((--oth)->type == EIO_DT_DIR)
… …
1262 1294
1263 ++dir; 1295 ++dir;
1264 } 1296 }
1265 } 1297 }
1266 1298
1267 /* now sort the dirs only */ 1299 /* now sort the dirs only (dirs all have the same score) */
1268 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1300 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1269 } 1301 }
1270 1302
1271 break; 1303 break;
1272 } 1304 }
… …
1392 break; 1424 break;
1393 } 1425 }
1394 } 1426 }
1395} 1427}
1396 1428
1429#ifdef PAGESIZE
1430# define eio_pagesize() PAGESIZE
1431#else
1432static intptr_t
1433eio_pagesize (void)
1434{
1435 static intptr_t page;
1436
1437 if (!page)
1438 page = sysconf (_SC_PAGESIZE);
1439
1440 return page;
1441}
1442#endif
1443
1444static void
1445eio_page_align (void **addr, size_t *length)
1446{
1447 intptr_t mask = eio_pagesize () - 1;
1448
1449 /* round down addr */
1450 intptr_t adj = mask & (intptr_t)*addr;
1451
1452 *addr = (void *)((intptr_t)*addr - adj);
1453 *length += adj;
1454
1455 /* round up length */
1456 *length = (*length + mask) & ~mask;
1457}
1458
1459#if !_POSIX_MEMLOCK
1460# define eio__mlockall(a) ((errno = ENOSYS), -1)
1461#else
1462
1463static int
1464eio__mlockall (int flags)
1465{
1466 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1467 extern int mallopt (int, int);
1468 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1469 #endif
1470
1471 if (EIO_MCL_CURRENT != MCL_CURRENT
1472 || EIO_MCL_FUTURE != MCL_FUTURE)
1473 {
1474 flags = 0
1475 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1476 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1477 }
1478
1479 return mlockall (flags);
1480}
1481#endif
1482
1483#if !_POSIX_MEMLOCK_RANGE
1484# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1485#else
1486
1487static int
1488eio__mlock (void *addr, size_t length)
1489{
1490 eio_page_align (&addr, &length);
1491
1492 return mlock (addr, length);
1493}
1494
1495#endif
1496
1397#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1497#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1398# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1498# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1399#else 1499#else
1400 1500
1401int 1501int
1402eio__msync (void *mem, size_t len, int flags) 1502eio__msync (void *mem, size_t len, int flags)
1403{ 1503{
1504 eio_page_align (&mem, &len);
1505
1404 if (EIO_MS_ASYNC != MS_SYNC 1506 if (EIO_MS_ASYNC != MS_SYNC
1405 || EIO_MS_INVALIDATE != MS_INVALIDATE 1507 || EIO_MS_INVALIDATE != MS_INVALIDATE
1406 || EIO_MS_SYNC != MS_SYNC) 1508 || EIO_MS_SYNC != MS_SYNC)
1407 { 1509 {
1408 flags = 0 1510 flags = 0
… …
1417#endif 1519#endif
1418 1520
1419int 1521int
1420eio__mtouch (void *mem, size_t len, int flags) 1522eio__mtouch (void *mem, size_t len, int flags)
1421{ 1523{
1524 eio_page_align (&mem, &len);
1525
1526 {
1422 intptr_t addr = (intptr_t)mem; 1527 intptr_t addr = (intptr_t)mem;
1423 intptr_t end = addr + len; 1528 intptr_t end = addr + len;
1424#ifdef PAGESIZE 1529 intptr_t page = eio_pagesize ();
1425 const intptr_t page = PAGESIZE;
1426#else
1427 static intptr_t page;
1428 1530
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) 1531 if (addr < end)
1437 if (flags & EIO_MT_MODIFY) /* modify */ 1532 if (flags & EIO_MT_MODIFY) /* modify */
1438 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1533 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1439 else 1534 else
1440 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1535 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1536 }
1441 1537
1442 return 0; 1538 return 0;
1443} 1539}
1444 1540
1445/*****************************************************************************/ 1541/*****************************************************************************/
… …
1479 if (req) 1575 if (req)
1480 break; 1576 break;
1481 1577
1482 ++idle; 1578 ++idle;
1483 1579
1484 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1580 ts.tv_sec = time (0) + idle_timeout;
1485 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1581 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1486 { 1582 {
1487 if (idle > max_idle) 1583 if (idle > max_idle)
1488 { 1584 {
1489 --idle; 1585 --idle;
… …
1568 return 0; \ 1664 return 0; \
1569 } 1665 }
1570 1666
1571static void eio_execute (etp_worker *self, eio_req *req) 1667static void eio_execute (etp_worker *self, eio_req *req)
1572{ 1668{
1573 errno = 0;
1574
1575 switch (req->type) 1669 switch (req->type)
1576 { 1670 {
1577 case EIO_READ: ALLOC (req->size); 1671 case EIO_READ: ALLOC (req->size);
1578 req->result = req->offs >= 0 1672 req->result = req->offs >= 0
1579 ? pread (req->int1, req->ptr2, req->size, req->offs) 1673 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1611 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1705 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1612 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1706 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; 1707 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1614 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1708 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1615 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1709 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; 1710 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1617 1711
1618 case EIO_READLINK: ALLOC (PATH_MAX); 1712 case EIO_READLINK: ALLOC (PATH_MAX);
1619 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1713 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1620 1714
1621 case EIO_SYNC: req->result = 0; sync (); break; 1715 case EIO_SYNC: req->result = 0; sync (); break;
1622 case EIO_FSYNC: req->result = fsync (req->int1); break; 1716 case EIO_FSYNC: req->result = fsync (req->int1); break;
1623 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1717 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1624 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 1718 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; 1719 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1720 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1721 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; 1722 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1627 1723
1628 case EIO_READDIR: eio__scandir (req, self); break; 1724 case EIO_READDIR: eio__scandir (req, self); break;
1629 1725
1630 case EIO_BUSY: 1726 case EIO_BUSY:
1631#ifdef _WIN32 1727#ifdef _WIN32
1632 Sleep (req->nv1 * 1000.); 1728 Sleep (req->nv1 * 1e3);
1633#else 1729#else
1634 { 1730 {
1635 struct timeval tv; 1731 struct timeval tv;
1636 1732
1637 tv.tv_sec = req->nv1; 1733 tv.tv_sec = req->nv1;
1638 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1734 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1639 1735
1640 req->result = select (0, 0, 0, 0, &tv); 1736 req->result = select (0, 0, 0, 0, &tv);
1641 } 1737 }
1642#endif 1738#endif
1643 break; 1739 break;
… …
1658 times = tv; 1754 times = tv;
1659 } 1755 }
1660 else 1756 else
1661 times = 0; 1757 times = 0;
1662 1758
1663
1664 req->result = req->type == EIO_FUTIME 1759 req->result = req->type == EIO_FUTIME
1665 ? futimes (req->int1, times) 1760 ? futimes (req->int1, times)
1666 : utimes (req->ptr1, times); 1761 : utimes (req->ptr1, times);
1667 } 1762 }
1668 break; 1763 break;
… …
1677 case EIO_CUSTOM: 1772 case EIO_CUSTOM:
1678 ((void (*)(eio_req *))req->feed) (req); 1773 ((void (*)(eio_req *))req->feed) (req);
1679 break; 1774 break;
1680 1775
1681 default: 1776 default:
1777 errno = ENOSYS;
1682 req->result = -1; 1778 req->result = -1;
1683 break; 1779 break;
1684 } 1780 }
1685 1781
1686 req->errorno = errno; 1782 req->errorno = errno;
… …
1716eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1812eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1717{ 1813{
1718 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1814 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1719} 1815}
1720 1816
1817eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1818{
1819 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1820}
1821
1822eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1823{
1824 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1825}
1826
1721eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1827eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1722{ 1828{
1723 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1829 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1724} 1830}
1725 1831
… …
1859 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1965 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1860} 1966}
1861 1967
1862eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1968eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1863{ 1969{
1864 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1970 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1865} 1971}
1866 1972
1867static eio_req * 1973static eio_req *
1868eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1974eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1869{ 1975{

Diff Legend

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