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

Comparing libeio/eio.c (file contents):
Revision 1.56 by root, Sun Sep 12 03:36:28 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 <unistd.h> 88# include <unistd.h>
80# include <utime.h> 89# include <utime.h>
81# include <signal.h> 90# include <signal.h>
82# include <dirent.h> 91# include <dirent.h>
83 92
84#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES 93#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h> 94# include <sys/mman.h>
86#endif 95#endif
87 96
88/* 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 */
89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 98# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
… …
132#endif 141#endif
133#ifndef D_NAMLEN 142#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 143# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 144#endif
136 145
137/* number of seconds after which an idle threads exit */
138#define IDLE_TIMEOUT 10
139
140/* used for struct dirent, AIX doesn't provide it */ 146/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 147#ifndef NAME_MAX
142# define NAME_MAX 4096 148# define NAME_MAX 4096
143#endif 149#endif
144 150
… …
223static unsigned int max_poll_reqs; /* reslock */ 229static unsigned int max_poll_reqs; /* reslock */
224 230
225static volatile unsigned int nreqs; /* reqlock */ 231static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 232static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 233static volatile unsigned int npending; /* reqlock */
228static 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 */
229 236
230static xmutex_t wrklock = X_MUTEX_INIT; 237static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 238static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 239static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 240static xcond_t reqwait;
234 241
235#if !HAVE_PREADWRITE 242#if !HAVE_PREADWRITE
236/* 243/*
237 * make our pread/pwrite emulation safe against themselves, but not against 244 * make our pread/pwrite emulation safe against themselves, but not against
238 * 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,
… …
368 } 375 }
369 376
370 abort (); 377 abort ();
371} 378}
372 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
373static void etp_atfork_prepare (void) 388static void etp_atfork_prepare (void)
374{ 389{
375 X_LOCK (wrklock); 390 X_LOCK (wrklock);
376 X_LOCK (reqlock); 391 X_LOCK (reqlock);
377 X_LOCK (reslock); 392 X_LOCK (reslock);
… …
415 idle = 0; 430 idle = 0;
416 nreqs = 0; 431 nreqs = 0;
417 nready = 0; 432 nready = 0;
418 npending = 0; 433 npending = 0;
419 434
420 etp_atfork_parent (); 435 etp_thread_init ();
421} 436}
422 437
423static void 438static void
424etp_once_init (void) 439etp_once_init (void)
425{ 440{
441 etp_thread_init ();
426 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);
427} 443}
428 444
429static int 445static int
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 446etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
621} 637}
622 638
623static void etp_set_max_idle (unsigned int nthreads) 639static void etp_set_max_idle (unsigned int nthreads)
624{ 640{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 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;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 651}
629 652
630static void etp_set_min_parallel (unsigned int nthreads) 653static void etp_set_min_parallel (unsigned int nthreads)
631{ 654{
… …
759void eio_set_max_idle (unsigned int nthreads) 782void eio_set_max_idle (unsigned int nthreads)
760{ 783{
761 etp_set_max_idle (nthreads); 784 etp_set_max_idle (nthreads);
762} 785}
763 786
787void eio_set_idle_timeout (unsigned int seconds)
788{
789 etp_set_idle_timeout (seconds);
790}
791
764void eio_set_min_parallel (unsigned int nthreads) 792void eio_set_min_parallel (unsigned int nthreads)
765{ 793{
766 etp_set_min_parallel (nthreads); 794 etp_set_min_parallel (nthreads);
767} 795}
768 796
… …
816 844
817 return res; 845 return res;
818} 846}
819#endif 847#endif
820 848
821#ifndef HAVE_FUTIMES 849#ifndef HAVE_UTIMES
822 850
823# undef utimes 851# undef utimes
824# undef futimes
825# define utimes(path,times) eio__utimes (path, times) 852# define utimes(path,times) eio__utimes (path, times)
826# define futimes(fd,times) eio__futimes (fd, times)
827 853
828static int 854static int
829eio__utimes (const char *filename, const struct timeval times[2]) 855eio__utimes (const char *filename, const struct timeval times[2])
830{ 856{
831 if (times) 857 if (times)
… …
838 return utime (filename, &buf); 864 return utime (filename, &buf);
839 } 865 }
840 else 866 else
841 return utime (filename, 0); 867 return utime (filename, 0);
842} 868}
869
870#endif
871
872#ifndef HAVE_FUTIMES
873
874# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times)
843 876
844static int eio__futimes (int fd, const struct timeval tv[2]) 877static int eio__futimes (int fd, const struct timeval tv[2])
845{ 878{
846 errno = ENOSYS; 879 errno = ENOSYS;
847 return -1; 880 return -1;
… …
1036} 1069}
1037 1070
1038static signed char 1071static signed char
1039eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1072eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1040{ 1073{
1041 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 */
1042 : 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;
1043} 1078}
1044 1079
1045#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
1046 1081
1047#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 */
… …
1053 unsigned char bits [9 + sizeof (ino_t) * 8]; 1088 unsigned char bits [9 + sizeof (ino_t) * 8];
1054 unsigned char *bit = bits; 1089 unsigned char *bit = bits;
1055 1090
1056 assert (CHAR_BIT == 8); 1091 assert (CHAR_BIT == 8);
1057 assert (sizeof (eio_dirent) * 8 < 256); 1092 assert (sizeof (eio_dirent) * 8 < 256);
1058 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1093 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1059 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1094 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1060 1095
1061 if (size <= EIO_SORT_FAST) 1096 if (size <= EIO_SORT_FAST)
1062 return; 1097 return;
1063 1098
1064 /* 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 */
… …
1219 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1254 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1220 1255
1221 X_LOCK (wrklock); 1256 X_LOCK (wrklock);
1222 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1257 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1223 self->dirp = dirp = opendir (req->ptr1); 1258 self->dirp = dirp = opendir (req->ptr1);
1259
1224 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1260 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1225 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1261 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1226 req->ptr2 = names = malloc (namesalloc); 1262 req->ptr2 = names = malloc (namesalloc);
1227 X_UNLOCK (wrklock); 1263 X_UNLOCK (wrklock);
1228 1264
… …
1240 /* sort etc. */ 1276 /* sort etc. */
1241 req->int1 = flags; 1277 req->int1 = flags;
1242 req->result = dentoffs; 1278 req->result = dentoffs;
1243 1279
1244 if (flags & EIO_READDIR_STAT_ORDER) 1280 if (flags & EIO_READDIR_STAT_ORDER)
1245 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);
1246 else if (flags & EIO_READDIR_DIRS_FIRST) 1282 else if (flags & EIO_READDIR_DIRS_FIRST)
1247 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1283 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1248 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 */
1249 else 1285 else
1250 { 1286 {
… …
1252 eio_dirent *oth = dents + dentoffs; 1288 eio_dirent *oth = dents + dentoffs;
1253 eio_dirent *dir = dents; 1289 eio_dirent *dir = dents;
1254 1290
1255 /* 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 */
1256 /* by walking from both sides and swapping if necessary */ 1292 /* by walking from both sides and swapping if necessary */
1257 /* also clear score, so it doesn't influence sorting */
1258 while (oth > dir) 1293 while (oth > dir)
1259 { 1294 {
1260 if (dir->type == EIO_DT_DIR) 1295 if (dir->type == EIO_DT_DIR)
1261 ++dir; 1296 ++dir;
1262 else if ((--oth)->type == EIO_DT_DIR) 1297 else if ((--oth)->type == EIO_DT_DIR)
… …
1265 1300
1266 ++dir; 1301 ++dir;
1267 } 1302 }
1268 } 1303 }
1269 1304
1270 /* now sort the dirs only */ 1305 /* now sort the dirs only (dirs all have the same score) */
1271 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1306 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1272 } 1307 }
1273 1308
1274 break; 1309 break;
1275 } 1310 }
… …
1426 /* round up length */ 1461 /* round up length */
1427 *length = (*length + mask) & ~mask; 1462 *length = (*length + mask) & ~mask;
1428} 1463}
1429 1464
1430#if !_POSIX_MEMLOCK 1465#if !_POSIX_MEMLOCK
1431# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1432# define eio__mlockall(a) ((errno = ENOSYS), -1) 1466# define eio__mlockall(a) ((errno = ENOSYS), -1)
1433#else 1467#else
1434
1435static int
1436eio__mlock (void *addr, size_t length)
1437{
1438 eio_page_align (&addr, &length);
1439
1440 mlock (addr, length);
1441}
1442 1468
1443static int 1469static int
1444eio__mlockall (int flags) 1470eio__mlockall (int flags)
1445{ 1471{
1446 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 1472 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
… …
1454 flags = 0 1480 flags = 0
1455 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0) 1481 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1456 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0); 1482 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1457 } 1483 }
1458 1484
1459 mlockall (flags); 1485 return mlockall (flags);
1460} 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
1461#endif 1501#endif
1462 1502
1463#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1503#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1464# define eio__msync(a,b,c) ((errno = ENOSYS), -1) 1504# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1465#else 1505#else
… …
1541 if (req) 1581 if (req)
1542 break; 1582 break;
1543 1583
1544 ++idle; 1584 ++idle;
1545 1585
1546 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1586 ts.tv_sec = time (0) + idle_timeout;
1547 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1587 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1548 { 1588 {
1549 if (idle > max_idle) 1589 if (idle > max_idle)
1550 { 1590 {
1551 --idle; 1591 --idle;
… …
1630 return 0; \ 1670 return 0; \
1631 } 1671 }
1632 1672
1633static void eio_execute (etp_worker *self, eio_req *req) 1673static void eio_execute (etp_worker *self, eio_req *req)
1634{ 1674{
1635 errno = 0;
1636
1637 switch (req->type) 1675 switch (req->type)
1638 { 1676 {
1639 case EIO_READ: ALLOC (req->size); 1677 case EIO_READ: ALLOC (req->size);
1640 req->result = req->offs >= 0 1678 req->result = req->offs >= 0
1641 ? pread (req->int1, req->ptr2, req->size, req->offs) 1679 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1673 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1711 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1674 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;
1675 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1713 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1676 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1714 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1677 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1715 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1678 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;
1679 1717
1680 case EIO_READLINK: ALLOC (PATH_MAX); 1718 case EIO_READLINK: ALLOC (PATH_MAX);
1681 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 1719 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1682 1720
1683 case EIO_SYNC: req->result = 0; sync (); break; 1721 case EIO_SYNC: req->result = 0; sync (); break;
… …
1691 1729
1692 case EIO_READDIR: eio__scandir (req, self); break; 1730 case EIO_READDIR: eio__scandir (req, self); break;
1693 1731
1694 case EIO_BUSY: 1732 case EIO_BUSY:
1695#ifdef _WIN32 1733#ifdef _WIN32
1696 Sleep (req->nv1 * 1000.); 1734 Sleep (req->nv1 * 1e3);
1697#else 1735#else
1698 { 1736 {
1699 struct timeval tv; 1737 struct timeval tv;
1700 1738
1701 tv.tv_sec = req->nv1; 1739 tv.tv_sec = req->nv1;
1702 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1740 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1703 1741
1704 req->result = select (0, 0, 0, 0, &tv); 1742 req->result = select (0, 0, 0, 0, &tv);
1705 } 1743 }
1706#endif 1744#endif
1707 break; 1745 break;
… …
1722 times = tv; 1760 times = tv;
1723 } 1761 }
1724 else 1762 else
1725 times = 0; 1763 times = 0;
1726 1764
1727
1728 req->result = req->type == EIO_FUTIME 1765 req->result = req->type == EIO_FUTIME
1729 ? futimes (req->int1, times) 1766 ? futimes (req->int1, times)
1730 : utimes (req->ptr1, times); 1767 : utimes (req->ptr1, times);
1731 } 1768 }
1732 break; 1769 break;
… …
1741 case EIO_CUSTOM: 1778 case EIO_CUSTOM:
1742 ((void (*)(eio_req *))req->feed) (req); 1779 ((void (*)(eio_req *))req->feed) (req);
1743 break; 1780 break;
1744 1781
1745 default: 1782 default:
1783 errno = ENOSYS;
1746 req->result = -1; 1784 req->result = -1;
1747 break; 1785 break;
1748 } 1786 }
1749 1787
1750 req->errorno = errno; 1788 req->errorno = errno;
… …
1933 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1971 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1934} 1972}
1935 1973
1936eio_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)
1937{ 1975{
1938 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;
1939} 1977}
1940 1978
1941static eio_req * 1979static eio_req *
1942eio__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)
1943{ 1981{

Diff Legend

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