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.61 by root, Fri Feb 11 00:53:24 2011 UTC vs.
Revision 1.65 by root, Mon May 30 12:56:50 2011 UTC

… …
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 <unistd.h> 82# include <unistd.h>
80# include <utime.h> 83# include <utime.h>
81# include <signal.h> 84# include <signal.h>
… …
132#endif 135#endif
133#ifndef D_NAMLEN 136#ifndef D_NAMLEN
134# define D_NAMLEN(de) strlen ((de)->d_name) 137# define D_NAMLEN(de) strlen ((de)->d_name)
135#endif 138#endif
136 139
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 */ 140/* used for struct dirent, AIX doesn't provide it */
141#ifndef NAME_MAX 141#ifndef NAME_MAX
142# define NAME_MAX 4096 142# define NAME_MAX 4096
143#endif 143#endif
144 144
… …
223static unsigned int max_poll_reqs; /* reslock */ 223static unsigned int max_poll_reqs; /* reslock */
224 224
225static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
226static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
227static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
228static 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 */
229 230
230static xmutex_t wrklock = X_MUTEX_INIT; 231static xmutex_t wrklock;
231static xmutex_t reslock = X_MUTEX_INIT; 232static xmutex_t reslock;
232static xmutex_t reqlock = X_MUTEX_INIT; 233static xmutex_t reqlock;
233static xcond_t reqwait = X_COND_INIT; 234static xcond_t reqwait;
234 235
235#if !HAVE_PREADWRITE 236#if !HAVE_PREADWRITE
236/* 237/*
237 * make our pread/pwrite emulation safe against themselves, but not against 238 * make our pread/pwrite emulation safe against themselves, but not against
238 * 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,
… …
368 } 369 }
369 370
370 abort (); 371 abort ();
371} 372}
372 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
373static void etp_atfork_prepare (void) 382static void etp_atfork_prepare (void)
374{ 383{
375 X_LOCK (wrklock); 384 X_LOCK (wrklock);
376 X_LOCK (reqlock); 385 X_LOCK (reqlock);
377 X_LOCK (reslock); 386 X_LOCK (reslock);
… …
415 idle = 0; 424 idle = 0;
416 nreqs = 0; 425 nreqs = 0;
417 nready = 0; 426 nready = 0;
418 npending = 0; 427 npending = 0;
419 428
420 etp_atfork_parent (); 429 etp_thread_init ();
421} 430}
422 431
423static void 432static void
424etp_once_init (void) 433etp_once_init (void)
425{ 434{
435 etp_thread_init ();
426 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);
427} 437}
428 438
429static int 439static int
430etp_init (void (*want_poll)(void), void (*done_poll)(void)) 440etp_init (void (*want_poll)(void), void (*done_poll)(void))
… …
621} 631}
622 632
623static void etp_set_max_idle (unsigned int nthreads) 633static void etp_set_max_idle (unsigned int nthreads)
624{ 634{
625 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 635 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
626 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;
627 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 644 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
628} 645}
629 646
630static void etp_set_min_parallel (unsigned int nthreads) 647static void etp_set_min_parallel (unsigned int nthreads)
631{ 648{
… …
757} 774}
758 775
759void eio_set_max_idle (unsigned int nthreads) 776void eio_set_max_idle (unsigned int nthreads)
760{ 777{
761 etp_set_max_idle (nthreads); 778 etp_set_max_idle (nthreads);
779}
780
781void eio_set_idle_timeout (unsigned int seconds)
782{
783 etp_set_idle_timeout (seconds);
762} 784}
763 785
764void eio_set_min_parallel (unsigned int nthreads) 786void eio_set_min_parallel (unsigned int nthreads)
765{ 787{
766 etp_set_min_parallel (nthreads); 788 etp_set_min_parallel (nthreads);
… …
1041} 1063}
1042 1064
1043static signed char 1065static signed char
1044eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1066eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1045{ 1067{
1046 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 */
1047 : 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;
1048} 1072}
1049 1073
1050#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
1051 1075
1052#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 */
… …
1058 unsigned char bits [9 + sizeof (ino_t) * 8]; 1082 unsigned char bits [9 + sizeof (ino_t) * 8];
1059 unsigned char *bit = bits; 1083 unsigned char *bit = bits;
1060 1084
1061 assert (CHAR_BIT == 8); 1085 assert (CHAR_BIT == 8);
1062 assert (sizeof (eio_dirent) * 8 < 256); 1086 assert (sizeof (eio_dirent) * 8 < 256);
1063 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */ 1087 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
1064 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */ 1088 assert (offsetof (eio_dirent, score)); /* we use bit #0 as sentinel */
1065 1089
1066 if (size <= EIO_SORT_FAST) 1090 if (size <= EIO_SORT_FAST)
1067 return; 1091 return;
1068 1092
1069 /* 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 */
… …
1224 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1248 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1225 1249
1226 X_LOCK (wrklock); 1250 X_LOCK (wrklock);
1227 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1251 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1228 self->dirp = dirp = opendir (req->ptr1); 1252 self->dirp = dirp = opendir (req->ptr1);
1253
1229 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1254 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1230 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1255 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1231 req->ptr2 = names = malloc (namesalloc); 1256 req->ptr2 = names = malloc (namesalloc);
1232 X_UNLOCK (wrklock); 1257 X_UNLOCK (wrklock);
1233 1258
… …
1245 /* sort etc. */ 1270 /* sort etc. */
1246 req->int1 = flags; 1271 req->int1 = flags;
1247 req->result = dentoffs; 1272 req->result = dentoffs;
1248 1273
1249 if (flags & EIO_READDIR_STAT_ORDER) 1274 if (flags & EIO_READDIR_STAT_ORDER)
1250 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);
1251 else if (flags & EIO_READDIR_DIRS_FIRST) 1276 else if (flags & EIO_READDIR_DIRS_FIRST)
1252 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1277 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1253 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 */
1254 else 1279 else
1255 { 1280 {
… …
1257 eio_dirent *oth = dents + dentoffs; 1282 eio_dirent *oth = dents + dentoffs;
1258 eio_dirent *dir = dents; 1283 eio_dirent *dir = dents;
1259 1284
1260 /* 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 */
1261 /* by walking from both sides and swapping if necessary */ 1286 /* by walking from both sides and swapping if necessary */
1262 /* also clear score, so it doesn't influence sorting */
1263 while (oth > dir) 1287 while (oth > dir)
1264 { 1288 {
1265 if (dir->type == EIO_DT_DIR) 1289 if (dir->type == EIO_DT_DIR)
1266 ++dir; 1290 ++dir;
1267 else if ((--oth)->type == EIO_DT_DIR) 1291 else if ((--oth)->type == EIO_DT_DIR)
… …
1270 1294
1271 ++dir; 1295 ++dir;
1272 } 1296 }
1273 } 1297 }
1274 1298
1275 /* now sort the dirs only */ 1299 /* now sort the dirs only (dirs all have the same score) */
1276 eio_dent_sort (dents, dir - dents, 0, inode_bits); 1300 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1277 } 1301 }
1278 1302
1279 break; 1303 break;
1280 } 1304 }
… …
1551 if (req) 1575 if (req)
1552 break; 1576 break;
1553 1577
1554 ++idle; 1578 ++idle;
1555 1579
1556 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1580 ts.tv_sec = time (0) + idle_timeout;
1557 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1581 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1558 { 1582 {
1559 if (idle > max_idle) 1583 if (idle > max_idle)
1560 { 1584 {
1561 --idle; 1585 --idle;

Diff Legend

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