ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.47 by root, Sun Oct 22 10:10:23 2006 UTC vs.
Revision 1.87 by root, Mon Oct 30 23:42:27 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
1#define _REENTRANT 1 9#define _REENTRANT 1
10
2#include <errno.h> 11#include <errno.h>
3 12
4#include "EXTERN.h" 13#include "EXTERN.h"
5#include "perl.h" 14#include "perl.h"
6#include "XSUB.h" 15#include "XSUB.h"
34# else 43# else
35# error sendfile support requested but not available 44# error sendfile support requested but not available
36# endif 45# endif
37#endif 46#endif
38 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
39/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 52#ifndef NAME_MAX
41# define NAME_MAX 4096 53# define NAME_MAX 4096
42#endif 54#endif
43 55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
44#if __ia64 61#if __ia64
45# define STACKSIZE 65536 62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
46#else 65#else
47# define STACKSIZE 8192 66# define STACKSIZE 16384
48#endif 67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536
83
84#define dBUF \
85 char *aio_buf; \
86 LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \
89 if (!aio_buf) \
90 return -1;
49 91
50enum { 92enum {
51 REQ_QUIT, 93 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 94 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
54 REQ_SENDFILE, 96 REQ_SENDFILE,
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
60 REQ_SLEEP, 102 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 103 REQ_BUSY,
62}; 104};
63 105
64#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 107#define AIO_GRP_KLASS "IO::AIO::GRP"
66 108
67typedef struct aio_cb 109typedef struct aio_cb
68{ 110{
69 struct aio_cb *grp, *grp_prev, *grp_next;
70
71 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
72 112
113 SV *callback, *fh;
114 SV *sv1, *sv2;
115 void *ptr1, *ptr2;
116 off_t offs;
117 size_t size;
118 ssize_t result;
119
120 STRLEN stroffset;
121 int type;
122 int int1, int2;
123 int errorno;
124 mode_t mode; /* open */
125
126 unsigned char flags;
127 unsigned char pri;
128
73 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
74 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
75 SV *data, *callback;
76 SV *fh, *fh2;
77 void *dataptr, *data2ptr;
78 Stat_t *statdata;
79 off_t offset;
80 size_t length;
81 ssize_t result;
82
83 int type;
84 int fd, fd2;
85 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */
88 unsigned char cancelled;
89} aio_cb; 131} aio_cb;
132
133enum {
134 FLAG_CANCELLED = 0x01,
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */
137};
90 138
91typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
93 141
142enum {
143 PRI_MIN = -4,
144 PRI_MAX = 4,
145
146 DEFAULT_PRI = 0,
147 PRI_BIAS = -PRI_MIN,
148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
149};
150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
163static int next_pri = DEFAULT_PRI + PRI_BIAS;
164
94static int started, wanted; 165static unsigned int started, idle, wanted;
95static volatile int nreqs; 166
96static int max_outstanding = 1<<30; 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
169#else
170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
171#endif
172
173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
175
176/* worker threads management */
177static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
178
179typedef struct worker {
180 /* locked by wrklock */
181 struct worker *prev, *next;
182
183 pthread_t tid;
184
185 /* locked by reslock, reqlock or wrklock */
186 aio_req req; /* currently processed request */
187 void *dbuf;
188 DIR *dirp;
189} worker;
190
191static worker wrk_first = { &wrk_first, &wrk_first, 0 };
192
193static void worker_clear (worker *wrk)
194{
195 if (wrk->dirp)
196 {
197 closedir (wrk->dirp);
198 wrk->dirp = 0;
199 }
200
201 if (wrk->dbuf)
202 {
203 free (wrk->dbuf);
204 wrk->dbuf = 0;
205 }
206}
207
208static void worker_free (worker *wrk)
209{
210 wrk->next->prev = wrk->prev;
211 wrk->prev->next = wrk->next;
212
213 free (wrk);
214}
215
216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff;
97static int respipe [2]; 219static int respipe [2];
98 220
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 224
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 225#if WORDACCESS_UNSAFE
104static volatile aio_req ress, rese; /* queue start, queue end */
105 226
227static unsigned int get_nready ()
228{
229 unsigned int retval;
230
231 LOCK (reqlock);
232 retval = nready;
233 UNLOCK (reqlock);
234
235 return retval;
236}
237
238static unsigned int get_npending ()
239{
240 unsigned int retval;
241
242 LOCK (reslock);
243 retval = npending;
244 UNLOCK (reslock);
245
246 return retval;
247}
248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
260#else
261
262# define get_nready() nready
263# define get_npending() npending
264# define get_nthreads() started
265
266#endif
267
268/*
269 * a somewhat faster data structure might be nice, but
270 * with 8 priorities this actually needs <20 insns
271 * per shift, the most expensive operation.
272 */
273typedef struct {
274 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
275 int size;
276} reqq;
277
278static reqq req_queue;
279static reqq res_queue;
280
281int reqq_push (reqq *q, aio_req req)
282{
283 int pri = req->pri;
284 req->next = 0;
285
286 if (q->qe[pri])
287 {
288 q->qe[pri]->next = req;
289 q->qe[pri] = req;
290 }
291 else
292 q->qe[pri] = q->qs[pri] = req;
293
294 return q->size++;
295}
296
297aio_req reqq_shift (reqq *q)
298{
299 int pri;
300
301 if (!q->size)
302 return 0;
303
304 --q->size;
305
306 for (pri = NUM_PRI; pri--; )
307 {
308 aio_req req = q->qs[pri];
309
310 if (req)
311 {
312 if (!(q->qs[pri] = req->next))
313 q->qe[pri] = 0;
314
315 return req;
316 }
317 }
318
319 abort ();
320}
321
322static int poll_cb ();
323static void req_invoke (aio_req req);
106static void req_free (aio_req req); 324static void req_free (aio_req req);
325static void req_cancel (aio_req req);
107 326
108/* must be called at most once */ 327/* must be called at most once */
109static SV *req_sv (aio_req req, const char *klass) 328static SV *req_sv (aio_req req, const char *klass)
110{ 329{
330 if (!req->self)
331 {
111 req->self = (SV *)newHV (); 332 req->self = (SV *)newHV ();
112 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 333 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
334 }
113 335
114 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 336 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
115} 337}
116 338
117static aio_req SvAIO_REQ (SV *sv) 339static aio_req SvAIO_REQ (SV *sv)
118{ 340{
341 MAGIC *mg;
342
119 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 343 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
120 croak ("object of class " AIO_REQ_KLASS " expected"); 344 croak ("object of class " AIO_REQ_KLASS " expected");
121 345
122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 346 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123 347
124 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
125} 349}
126 350
127static void poll_wait () 351static void aio_grp_feed (aio_req grp)
128{ 352{
129 if (nreqs && !ress) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
130 { 354 {
131 fd_set rfd; 355 int old_len = grp->size;
132 FD_ZERO(&rfd);
133 FD_SET(respipe [0], &rfd);
134 356
135 select (respipe [0] + 1, &rfd, 0, 0, 0); 357 if (grp->sv2 && SvOK (grp->sv2))
358 {
359 dSP;
360
361 ENTER;
362 SAVETMPS;
363 PUSHMARK (SP);
364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
365 PUTBACK;
366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
367 SPAGAIN;
368 FREETMPS;
369 LEAVE;
370 }
371
372 /* stop if no progress has been made */
373 if (old_len == grp->size)
374 {
375 SvREFCNT_dec (grp->sv2);
376 grp->sv2 = 0;
377 break;
378 }
136 } 379 }
137} 380}
138 381
382static void aio_grp_dec (aio_req grp)
383{
384 --grp->size;
385
386 /* call feeder, if applicable */
387 aio_grp_feed (grp);
388
389 /* finish, if done */
390 if (!grp->size && grp->int1)
391 {
392 req_invoke (grp);
393 req_free (grp);
394 }
395}
396
139static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
140{ 398{
141 dSP; 399 dSP;
142 int errorno = errno;
143 400
144 if (req->cancelled || !SvOK (req->callback)) 401 if (req->flags & FLAG_SV1_RO_OFF)
145 return; 402 SvREADONLY_off (req->sv1);
146 403
147 errno = req->errorno; 404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
148
149 ENTER;
150 PUSHMARK (SP);
151
152 switch (req->type)
153 { 405 {
154 case REQ_READDIR: 406 ENTER;
407 SAVETMPS;
408 PUSHMARK (SP);
409 EXTEND (SP, 1);
410
411 switch (req->type)
155 { 412 {
156 SV *rv = &PL_sv_undef; 413 case REQ_READDIR:
157
158 if (req->result >= 0)
159 { 414 {
160 char *buf = req->data2ptr; 415 SV *rv = &PL_sv_undef;
161 AV *av = newAV ();
162 416
163 while (req->result) 417 if (req->result >= 0)
164 { 418 {
419 int i;
420 char *buf = req->ptr2;
421 AV *av = newAV ();
422
423 av_extend (av, req->result - 1);
424
425 for (i = 0; i < req->result; ++i)
426 {
165 SV *sv = newSVpv (buf, 0); 427 SV *sv = newSVpv (buf, 0);
166 428
167 av_push (av, sv); 429 av_store (av, i, sv);
168 buf += SvCUR (sv) + 1; 430 buf += SvCUR (sv) + 1;
169 req->result--; 431 }
432
433 rv = sv_2mortal (newRV_noinc ((SV *)av));
170 } 434 }
171 435
172 rv = sv_2mortal (newRV_noinc ((SV *)av)); 436 PUSHs (rv);
173 } 437 }
438 break;
174 439
440 case REQ_OPEN:
441 {
442 /* convert fd to fh */
443 SV *fh;
444
445 PUSHs (sv_2mortal (newSViv (req->result)));
446 PUTBACK;
447 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
448 SPAGAIN;
449
450 fh = SvREFCNT_inc (POPs);
451
452 PUSHMARK (SP);
453 XPUSHs (sv_2mortal (fh));
454 }
455 break;
456
457 case REQ_GROUP:
458 req->int1 = 2; /* mark group as finished */
459
460 if (req->sv1)
461 {
462 int i;
463 AV *av = (AV *)req->sv1;
464
465 EXTEND (SP, AvFILL (av) + 1);
466 for (i = 0; i <= AvFILL (av); ++i)
467 PUSHs (*av_fetch (av, i, 0));
468 }
469 break;
470
471 case REQ_NOP:
472 case REQ_BUSY:
473 break;
474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
175 XPUSHs (rv); 480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
499 default:
500 PUSHs (sv_2mortal (newSViv (req->result)));
501 break;
176 } 502 }
177 break;
178 503
179 case REQ_OPEN: 504 errno = req->errorno;
180 {
181 /* convert fd to fh */
182 SV *fh;
183 505
184 XPUSHs (sv_2mortal (newSViv (req->result)));
185 PUTBACK; 506 PUTBACK;
186 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 507 call_sv (req->callback, G_VOID | G_EVAL);
187 SPAGAIN; 508 SPAGAIN;
188 509
189 fh = SvREFCNT_inc (POPs); 510 FREETMPS;
190 511 LEAVE;
191 PUSHMARK (SP);
192 XPUSHs (sv_2mortal (fh));
193 }
194 break;
195
196 case REQ_SLEEP:
197 case REQ_GROUP:
198 break;
199
200 default:
201 XPUSHs (sv_2mortal (newSViv (req->result)));
202 break;
203 } 512 }
204 513
514 if (req->grp)
515 {
516 aio_req grp = req->grp;
205 517
206 PUTBACK; 518 /* unlink request */
207 call_sv (req->callback, G_VOID | G_EVAL); 519 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
208 SPAGAIN; 520 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
521
522 if (grp->grp_first == req)
523 grp->grp_first = req->grp_next;
524
525 aio_grp_dec (grp);
526 }
209 527
210 if (SvTRUE (ERRSV)) 528 if (SvTRUE (ERRSV))
211 { 529 {
212 req_free (req); 530 req_free (req);
213 croak (0); 531 croak (0);
214 } 532 }
215
216 LEAVE;
217
218 errno = errorno;
219} 533}
220 534
221static void req_free (aio_req req) 535static void req_free (aio_req req)
222{ 536{
223 if (req->grp)
224 {
225 aio_req grp = req->grp;
226
227 /* unlink request */
228 req->grp_next->grp_prev = req->grp_prev;
229 req->grp_prev->grp_next = req->grp_next;
230
231 if (grp->grp_next == grp && grp->fd)
232 {
233 req_invoke (grp);
234 req_free (grp);
235 }
236 }
237
238 if (req->self) 537 if (req->self)
239 { 538 {
240 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
241 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
242 } 541 }
243 542
244 if (req->data)
245 SvREFCNT_dec (req->data);
246
247 if (req->fh)
248 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
249 544 SvREFCNT_dec (req->sv1);
250 if (req->fh2)
251 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
252
253 if (req->statdata)
254 Safefree (req->statdata);
255
256 if (req->callback)
257 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
258 547
259 if (req->type == REQ_READDIR && req->result >= 0) 548 if (req->flags & FLAG_PTR2_FREE)
260 free (req->data2ptr); 549 free (req->ptr2);
261 550
262 Safefree (req); 551 Safefree (req);
263} 552}
264 553
554static void req_cancel_subs (aio_req grp)
555{
556 aio_req sub;
557
558 if (grp->type != REQ_GROUP)
559 return;
560
561 SvREFCNT_dec (grp->sv2);
562 grp->sv2 = 0;
563
564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
565 req_cancel (sub);
566}
567
265static void req_cancel (aio_req req) 568static void req_cancel (aio_req req)
266{ 569{
267 req->cancelled = 1; 570 req->flags |= FLAG_CANCELLED;
268 571
269 if (req->type == REQ_GROUP) 572 req_cancel_subs (req);
270 {
271 aio_req sub;
272
273 for (sub = req->grp_next; sub != req; sub = sub->grp_next)
274 req_cancel (sub);
275 }
276}
277
278static int poll_cb ()
279{
280 dSP;
281 int count = 0;
282 int do_croak = 0;
283 aio_req req;
284
285 for (;;)
286 {
287 pthread_mutex_lock (&reslock);
288 req = ress;
289
290 if (req)
291 {
292 ress = req->next;
293
294 if (!ress)
295 {
296 /* read any signals sent by the worker threads */
297 char buf [32];
298 while (read (respipe [0], buf, 32) == 32)
299 ;
300
301 rese = 0;
302 }
303 }
304
305 pthread_mutex_unlock (&reslock);
306
307 if (!req)
308 break;
309
310 nreqs--;
311
312 if (req->type == REQ_QUIT)
313 started--;
314 else if (req->type == REQ_GROUP && req->grp_next != req)
315 {
316 req->fd = 1; /* mark request as delayed */
317 continue;
318 }
319 else
320 {
321 if (req->type == REQ_READ)
322 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
323
324 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
325 SvREADONLY_off (req->data);
326
327 if (req->statdata)
328 {
329 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
330 PL_laststatval = req->result;
331 PL_statcache = *(req->statdata);
332 }
333
334 req_invoke (req);
335
336 count++;
337 }
338
339 req_free (req);
340 }
341
342 return count;
343} 573}
344 574
345static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
346 576
347static void start_thread (void) 577static void start_thread (void)
348{ 578{
349 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
350 pthread_t tid;
351 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
352 586
353 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
354 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
355 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
590#ifdef PTHREAD_SCOPE_PROCESS
591 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
592#endif
356 593
357 sigfillset (&fullsigset); 594 sigfillset (&fullsigset);
595
596 LOCK (wrklock);
358 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 597 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
359 598
360 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 599 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
361 started++;
362
363 sigprocmask (SIG_SETMASK, &oldsigset, 0);
364}
365
366static void req_send (aio_req req)
367{
368 while (started < wanted && nreqs >= started)
369 start_thread ();
370
371 nreqs++;
372
373 pthread_mutex_lock (&reqlock);
374
375 req->next = 0;
376
377 if (reqe)
378 { 600 {
379 reqe->next = req; 601 wrk->prev = &wrk_first;
380 reqe = req; 602 wrk->next = wrk_first.next;
603 wrk_first.next->prev = wrk;
604 wrk_first.next = wrk;
605 ++started;
381 } 606 }
382 else 607 else
383 reqe = reqs = req; 608 free (wrk);
384 609
610 sigprocmask (SIG_SETMASK, &oldsigset, 0);
611 UNLOCK (wrklock);
612}
613
614static void maybe_start_thread ()
615{
616 if (get_nthreads () >= wanted)
617 return;
618
619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
621 return;
622
623 start_thread ();
624}
625
626static void req_send (aio_req req)
627{
628 ++nreqs;
629
630 LOCK (reqlock);
631 ++nready;
632 reqq_push (&req_queue, req);
385 pthread_cond_signal (&reqwait); 633 pthread_cond_signal (&reqwait);
386 pthread_mutex_unlock (&reqlock); 634 UNLOCK (reqlock);
387 635
388 if (nreqs > max_outstanding) 636 maybe_start_thread ();
389 for (;;)
390 {
391 poll_cb ();
392
393 if (nreqs <= max_outstanding)
394 break;
395
396 poll_wait ();
397 }
398} 637}
399 638
400static void end_thread (void) 639static void end_thread (void)
401{ 640{
402 aio_req req; 641 aio_req req;
642
403 Newz (0, req, 1, aio_cb); 643 Newz (0, req, 1, aio_cb);
644
404 req->type = REQ_QUIT; 645 req->type = REQ_QUIT;
646 req->pri = PRI_MAX + PRI_BIAS;
405 647
406 req_send (req); 648 LOCK (reqlock);
649 reqq_push (&req_queue, req);
650 pthread_cond_signal (&reqwait);
651 UNLOCK (reqlock);
652
653 LOCK (wrklock);
654 --started;
655 UNLOCK (wrklock);
656}
657
658static void set_max_idle (int nthreads)
659{
660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
661 max_idle = nthreads <= 0 ? 1 : nthreads;
662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
407} 663}
408 664
409static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
410{ 666{
411 if (wanted < nthreads) 667 if (wanted < nthreads)
412 wanted = nthreads; 668 wanted = nthreads;
413} 669}
414 670
415static void max_parallel (int nthreads) 671static void max_parallel (int nthreads)
416{ 672{
417 int cur = started;
418
419 if (wanted > nthreads) 673 if (wanted > nthreads)
420 wanted = nthreads; 674 wanted = nthreads;
421 675
422 while (cur > wanted) 676 while (started > wanted)
677 end_thread ();
678}
679
680static void poll_wait ()
681{
682 fd_set rfd;
683
684 while (nreqs)
423 { 685 {
686 int size;
687 if (WORDACCESS_UNSAFE) LOCK (reslock);
688 size = res_queue.size;
689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
690
691 if (size)
692 return;
693
424 end_thread (); 694 maybe_start_thread ();
425 cur--; 695
696 FD_ZERO(&rfd);
697 FD_SET(respipe [0], &rfd);
698
699 select (respipe [0] + 1, &rfd, 0, 0, 0);
426 } 700 }
701}
427 702
428 while (started > wanted) 703static int poll_cb ()
704{
705 dSP;
706 int count = 0;
707 int maxreqs = max_poll_reqs;
708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
714
715 for (;;)
429 { 716 {
717 for (;;)
718 {
719 maybe_start_thread ();
720
721 LOCK (reslock);
722 req = reqq_shift (&res_queue);
723
724 if (req)
725 {
726 --npending;
727
728 if (!res_queue.size)
729 {
730 /* read any signals sent by the worker threads */
731 char buf [32];
732 while (read (respipe [0], buf, 32) == 32)
733 ;
734 }
735 }
736
737 UNLOCK (reslock);
738
739 if (!req)
740 break;
741
742 --nreqs;
743
744 if (req->type == REQ_GROUP && req->size)
745 {
746 req->int1 = 1; /* mark request as delayed */
747 continue;
748 }
749 else
750 {
751 req_invoke (req);
752
753 count++;
754 }
755
756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
768 }
769
770 if (nreqs <= max_outstanding)
771 break;
772
430 poll_wait (); 773 poll_wait ();
431 poll_cb (); 774
775 ++maxreqs;
432 } 776 }
777
778 return count;
433} 779}
434 780
435static void create_pipe () 781static void create_pipe ()
436{ 782{
437 if (pipe (respipe)) 783 if (pipe (respipe))
461static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 807static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
462{ 808{
463 ssize_t res; 809 ssize_t res;
464 off_t ooffset; 810 off_t ooffset;
465 811
466 pthread_mutex_lock (&preadwritelock); 812 LOCK (preadwritelock);
467 ooffset = lseek (fd, 0, SEEK_CUR); 813 ooffset = lseek (fd, 0, SEEK_CUR);
468 lseek (fd, offset, SEEK_SET); 814 lseek (fd, offset, SEEK_SET);
469 res = read (fd, buf, count); 815 res = read (fd, buf, count);
470 lseek (fd, ooffset, SEEK_SET); 816 lseek (fd, ooffset, SEEK_SET);
471 pthread_mutex_unlock (&preadwritelock); 817 UNLOCK (preadwritelock);
472 818
473 return res; 819 return res;
474} 820}
475 821
476static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 822static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
477{ 823{
478 ssize_t res; 824 ssize_t res;
479 off_t ooffset; 825 off_t ooffset;
480 826
481 pthread_mutex_lock (&preadwritelock); 827 LOCK (preadwritelock);
482 ooffset = lseek (fd, 0, SEEK_CUR); 828 ooffset = lseek (fd, 0, SEEK_CUR);
483 lseek (fd, offset, SEEK_SET); 829 lseek (fd, offset, SEEK_SET);
484 res = write (fd, buf, count); 830 res = write (fd, buf, count);
485 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
486 pthread_mutex_unlock (&preadwritelock); 832 UNLOCK (preadwritelock);
487 833
488 return res; 834 return res;
489} 835}
490#endif 836#endif
491 837
492#if !HAVE_FDATASYNC 838#if !HAVE_FDATASYNC
493# define fdatasync fsync 839# define fdatasync fsync
494#endif 840#endif
495 841
496#if !HAVE_READAHEAD 842#if !HAVE_READAHEAD
497# define readahead aio_readahead 843# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
498 844
499static ssize_t readahead (int fd, off_t offset, size_t count) 845static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
500{ 846{
501 char readahead_buf[4096]; 847 dBUF;
502 848
503 while (count > 0) 849 while (count > 0)
504 { 850 {
505 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 851 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
506 852
507 pread (fd, readahead_buf, len, offset); 853 pread (fd, aio_buf, len, offset);
508 offset += len; 854 offset += len;
509 count -= len; 855 count -= len;
510 } 856 }
511 857
512 errno = 0; 858 errno = 0;
513} 859}
860
514#endif 861#endif
515 862
516#if !HAVE_READDIR_R 863#if !HAVE_READDIR_R
517# define readdir_r aio_readdir_r 864# define readdir_r aio_readdir_r
518 865
521static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 868static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
522{ 869{
523 struct dirent *e; 870 struct dirent *e;
524 int errorno; 871 int errorno;
525 872
526 pthread_mutex_lock (&readdirlock); 873 LOCK (readdirlock);
527 874
528 e = readdir (dirp); 875 e = readdir (dirp);
529 errorno = errno; 876 errorno = errno;
530 877
531 if (e) 878 if (e)
534 strcpy (ent->d_name, e->d_name); 881 strcpy (ent->d_name, e->d_name);
535 } 882 }
536 else 883 else
537 *res = 0; 884 *res = 0;
538 885
539 pthread_mutex_unlock (&readdirlock); 886 UNLOCK (readdirlock);
540 887
541 errno = errorno; 888 errno = errorno;
542 return e ? 0 : -1; 889 return e ? 0 : -1;
543} 890}
544#endif 891#endif
545 892
546/* sendfile always needs emulation */ 893/* sendfile always needs emulation */
547static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 894static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
548{ 895{
549 ssize_t res; 896 ssize_t res;
550 897
551 if (!count) 898 if (!count)
552 return 0; 899 return 0;
563 { 910 {
564 off_t sbytes; 911 off_t sbytes;
565 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 912 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
566 913
567 if (res < 0 && sbytes) 914 if (res < 0 && sbytes)
568 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 915 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
569 res = sbytes; 916 res = sbytes;
570 } 917 }
571 918
572# elif __hpux 919# elif __hpux
573 res = sendfile (ofd, ifd, offset, count, 0, 0); 920 res = sendfile (ofd, ifd, offset, count, 0, 0);
601#endif 948#endif
602 ) 949 )
603 ) 950 )
604 { 951 {
605 /* emulate sendfile. this is a major pain in the ass */ 952 /* emulate sendfile. this is a major pain in the ass */
606 char buf[4096]; 953 dBUF;
954
607 res = 0; 955 res = 0;
608 956
609 while (count) 957 while (count)
610 { 958 {
611 ssize_t cnt; 959 ssize_t cnt;
612 960
613 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 961 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
614 962
615 if (cnt <= 0) 963 if (cnt <= 0)
616 { 964 {
617 if (cnt && !res) res = -1; 965 if (cnt && !res) res = -1;
618 break; 966 break;
619 } 967 }
620 968
621 cnt = write (ofd, buf, cnt); 969 cnt = write (ofd, aio_buf, cnt);
622 970
623 if (cnt <= 0) 971 if (cnt <= 0)
624 { 972 {
625 if (cnt && !res) res = -1; 973 if (cnt && !res) res = -1;
626 break; 974 break;
634 982
635 return res; 983 return res;
636} 984}
637 985
638/* read a full directory */ 986/* read a full directory */
639static int scandir_ (const char *path, void **namesp) 987static void scandir_ (aio_req req, worker *self)
640{ 988{
641 DIR *dirp = opendir (path); 989 DIR *dirp;
642 union 990 union
643 { 991 {
644 struct dirent d; 992 struct dirent d;
645 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 993 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
646 } u; 994 } *u;
647 struct dirent *entp; 995 struct dirent *entp;
648 char *name, *names; 996 char *name, *names;
649 int memlen = 4096; 997 int memlen = 4096;
650 int memofs = 0; 998 int memofs = 0;
651 int res = 0; 999 int res = 0;
652 int errorno; 1000 int errorno;
653 1001
654 if (!dirp) 1002 LOCK (wrklock);
655 return -1; 1003 self->dirp = dirp = opendir (req->ptr1);
656 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
657 names = malloc (memlen); 1006 req->ptr2 = names = malloc (memlen);
1007 UNLOCK (wrklock);
1008
1009 if (dirp && u && names)
1010 for (;;)
1011 {
1012 errno = 0;
1013 readdir_r (dirp, &u->d, &entp);
1014
1015 if (!entp)
1016 break;
1017
1018 name = entp->d_name;
1019
1020 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1021 {
1022 int len = strlen (name) + 1;
1023
1024 res++;
1025
1026 while (memofs + len > memlen)
1027 {
1028 memlen *= 2;
1029 LOCK (wrklock);
1030 req->ptr2 = names = realloc (names, memlen);
1031 UNLOCK (wrklock);
1032
1033 if (!names)
1034 break;
1035 }
1036
1037 memcpy (names + memofs, name, len);
1038 memofs += len;
1039 }
1040 }
1041
1042 if (errno)
1043 res = -1;
1044
1045 req->result = res;
1046}
1047
1048/*****************************************************************************/
1049
1050static void *aio_proc (void *thr_arg)
1051{
1052 aio_req req;
1053 struct timespec ts;
1054 worker *self = (worker *)thr_arg;
1055
1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
658 1059
659 for (;;) 1060 for (;;)
660 { 1061 {
661 errno = 0, readdir_r (dirp, &u.d, &entp); 1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
662 1063
663 if (!entp) 1064 LOCK (reqlock);
664 break;
665
666 name = entp->d_name;
667
668 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
669 {
670 int len = strlen (name) + 1;
671
672 res++;
673
674 while (memofs + len > memlen)
675 {
676 memlen *= 2;
677 names = realloc (names, memlen);
678 if (!names)
679 break;
680 }
681
682 memcpy (names + memofs, name, len);
683 memofs += len;
684 }
685 }
686
687 errorno = errno;
688 closedir (dirp);
689
690 if (errorno)
691 {
692 free (names);
693 errno = errorno;
694 res = -1;
695 }
696
697 *namesp = (void *)names;
698 return res;
699}
700
701/*****************************************************************************/
702
703static void *aio_proc (void *thr_arg)
704{
705 aio_req req;
706 int type;
707
708 do
709 {
710 pthread_mutex_lock (&reqlock);
711 1065
712 for (;;) 1066 for (;;)
713 { 1067 {
714 req = reqs; 1068 self->req = req = reqq_shift (&req_queue);
715
716 if (reqs)
717 {
718 reqs = reqs->next;
719 if (!reqs) reqe = 0;
720 }
721 1069
722 if (req) 1070 if (req)
723 break; 1071 break;
724 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
725 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
726 } 1094 }
727 1095
728 pthread_mutex_unlock (&reqlock); 1096 --nready;
1097
1098 UNLOCK (reqlock);
729 1099
730 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
731 1101
732 if (!req->cancelled) 1102 if (!(req->flags & FLAG_CANCELLED))
733 switch (req->type) 1103 switch (req->type)
734 { 1104 {
735 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
736 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
737 1107
738 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
739 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
740 1110
741 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
742 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1112 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
743 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
744 1114
745 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
746 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
747 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
748 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
749 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
750 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
751 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
752 1124
753 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
754 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
755 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
756 1128
757 case REQ_SLEEP: 1129 case REQ_BUSY:
758 { 1130 {
759 struct timeval tv; 1131 struct timeval tv;
760 1132
761 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
762 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
763 1135
764 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
765 } 1137 }
766 1138
1139 case REQ_GROUP:
1140 case REQ_NOP:
1141 break;
1142
767 case REQ_QUIT: 1143 case REQ_QUIT:
768 break; 1144 goto quit;
769 1145
770 default: 1146 default:
771 req->result = ENOSYS; 1147 req->result = ENOSYS;
772 break; 1148 break;
773 } 1149 }
774 1150
775 req->errorno = errno; 1151 req->errorno = errno;
776 1152
777 pthread_mutex_lock (&reslock); 1153 LOCK (reslock);
778 1154
779 req->next = 0; 1155 ++npending;
780 1156
781 if (rese) 1157 if (!reqq_push (&res_queue, req))
782 {
783 rese->next = req;
784 rese = req;
785 }
786 else
787 {
788 rese = ress = req;
789
790 /* write a dummy byte to the pipe so fh becomes ready */ 1158 /* write a dummy byte to the pipe so fh becomes ready */
791 write (respipe [1], &respipe, 1); 1159 write (respipe [1], &respipe, 1);
792 }
793 1160
794 pthread_mutex_unlock (&reslock); 1161 self->req = 0;
1162 worker_clear (self);
1163
1164 UNLOCK (reslock);
795 } 1165 }
796 while (type != REQ_QUIT); 1166
1167quit:
1168 LOCK (wrklock);
1169 worker_free (self);
1170 UNLOCK (wrklock);
797 1171
798 return 0; 1172 return 0;
799} 1173}
800 1174
801/*****************************************************************************/ 1175/*****************************************************************************/
802 1176
803static void atfork_prepare (void) 1177static void atfork_prepare (void)
804{ 1178{
805 pthread_mutex_lock (&reqlock); 1179 LOCK (wrklock);
806 pthread_mutex_lock (&reslock); 1180 LOCK (reqlock);
1181 LOCK (reslock);
807#if !HAVE_PREADWRITE 1182#if !HAVE_PREADWRITE
808 pthread_mutex_lock (&preadwritelock); 1183 LOCK (preadwritelock);
809#endif 1184#endif
810#if !HAVE_READDIR_R 1185#if !HAVE_READDIR_R
811 pthread_mutex_lock (&readdirlock); 1186 LOCK (readdirlock);
812#endif 1187#endif
813} 1188}
814 1189
815static void atfork_parent (void) 1190static void atfork_parent (void)
816{ 1191{
817#if !HAVE_READDIR_R 1192#if !HAVE_READDIR_R
818 pthread_mutex_unlock (&readdirlock); 1193 UNLOCK (readdirlock);
819#endif 1194#endif
820#if !HAVE_PREADWRITE 1195#if !HAVE_PREADWRITE
821 pthread_mutex_unlock (&preadwritelock); 1196 UNLOCK (preadwritelock);
822#endif 1197#endif
823 pthread_mutex_unlock (&reslock); 1198 UNLOCK (reslock);
824 pthread_mutex_unlock (&reqlock); 1199 UNLOCK (reqlock);
1200 UNLOCK (wrklock);
825} 1201}
826 1202
827static void atfork_child (void) 1203static void atfork_child (void)
828{ 1204{
829 aio_req prv; 1205 aio_req prv;
830 1206
831 started = 0; 1207 while (prv = reqq_shift (&req_queue))
1208 req_free (prv);
832 1209
833 while (reqs) 1210 while (prv = reqq_shift (&res_queue))
1211 req_free (prv);
1212
1213 while (wrk_first.next != &wrk_first)
834 { 1214 {
835 prv = reqs; 1215 worker *wrk = wrk_first.next;
836 reqs = prv->next; 1216
1217 if (wrk->req)
1218 req_free (wrk->req);
1219
1220 worker_clear (wrk);
837 req_free (prv); 1221 worker_free (wrk);
838 } 1222 }
839 1223
840 reqs = reqe = 0; 1224 started = 0;
841 1225 idle = 0;
842 while (ress) 1226 nreqs = 0;
843 { 1227 nready = 0;
844 prv = ress; 1228 npending = 0;
845 ress = prv->next;
846 req_free (prv);
847 }
848
849 ress = rese = 0;
850 1229
851 close (respipe [0]); 1230 close (respipe [0]);
852 close (respipe [1]); 1231 close (respipe [1]);
853 create_pipe (); 1232 create_pipe ();
854 1233
855 atfork_parent (); 1234 atfork_parent ();
856} 1235}
857 1236
858#define dREQ \ 1237#define dREQ \
859 aio_req req; \ 1238 aio_req req; \
1239 int req_pri = next_pri; \
1240 next_pri = DEFAULT_PRI + PRI_BIAS; \
860 \ 1241 \
861 if (SvOK (callback) && !SvROK (callback)) \ 1242 if (SvOK (callback) && !SvROK (callback)) \
862 croak ("callback must be undef or of reference type"); \ 1243 croak ("callback must be undef or of reference type"); \
863 \ 1244 \
864 Newz (0, req, 1, aio_cb); \ 1245 Newz (0, req, 1, aio_cb); \
865 if (!req) \ 1246 if (!req) \
866 croak ("out of memory during aio_req allocation"); \ 1247 croak ("out of memory during aio_req allocation"); \
867 \ 1248 \
868 req->callback = newSVsv (callback) 1249 req->callback = newSVsv (callback); \
1250 req->pri = req_pri
869 1251
870#define REQ_SEND \ 1252#define REQ_SEND \
871 req_send (req); \ 1253 req_send (req); \
872 \ 1254 \
873 if (GIMME_V != G_VOID) \ 1255 if (GIMME_V != G_VOID) \
878PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
879 1261
880BOOT: 1262BOOT:
881{ 1263{
882 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
883 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
884 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
885 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
886 1272
887 create_pipe (); 1273 create_pipe ();
888 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
889} 1275}
890 1276
891void 1277void
892min_parallel (nthreads) 1278max_poll_reqs (int nreqs)
893 int nthreads
894 PROTOTYPE: $ 1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
895 1282
896void 1283void
897max_parallel (nthreads) 1284max_poll_time (double nseconds)
898 int nthreads
899 PROTOTYPE: $ 1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1288
1289void
1290min_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_parallel (int nthreads)
1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
900 1302
901int 1303int
902max_outstanding (nreqs) 1304max_outstanding (int maxreqs)
903 int nreqs 1305 PROTOTYPE: $
904 PROTOTYPE: $
905 CODE: 1306 CODE:
906 RETVAL = max_outstanding; 1307 RETVAL = max_outstanding;
907 max_outstanding = nreqs; 1308 max_outstanding = maxreqs;
1309 OUTPUT:
1310 RETVAL
908 1311
909void 1312void
910aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1313aio_open (pathname,flags,mode,callback=&PL_sv_undef)
911 SV * pathname 1314 SV * pathname
912 int flags 1315 int flags
916 PPCODE: 1319 PPCODE:
917{ 1320{
918 dREQ; 1321 dREQ;
919 1322
920 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
921 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
922 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (pathname);
923 req->fd = flags; 1326 req->int1 = flags;
924 req->mode = mode; 1327 req->mode = mode;
925 1328
926 REQ_SEND; 1329 REQ_SEND;
927} 1330}
928 1331
938 PPCODE: 1341 PPCODE:
939{ 1342{
940 dREQ; 1343 dREQ;
941 1344
942 req->type = ix; 1345 req->type = ix;
943 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
944 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
945 1348
946 REQ_SEND (req); 1349 REQ_SEND (req);
947} 1350}
948 1351
949void 1352void
958 aio_read = REQ_READ 1361 aio_read = REQ_READ
959 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
960 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
961 PPCODE: 1364 PPCODE:
962{ 1365{
963 aio_req req;
964 STRLEN svlen; 1366 STRLEN svlen;
965 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
966 1368
967 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
968 SvPOK_on (data); 1370 SvPOK_on (data);
990 1392
991 { 1393 {
992 dREQ; 1394 dREQ;
993 1395
994 req->type = ix; 1396 req->type = ix;
995 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
996 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
997 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
998 req->offset = offset; 1400 req->offs = offset;
999 req->length = length; 1401 req->size = length;
1000 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1001 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1002 1405
1003 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1004 { 1407 {
1005 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1006 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1007 } 1410 }
1008 1411
1009 REQ_SEND; 1412 REQ_SEND;
1010 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (path);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1011} 1436}
1012 1437
1013void 1438void
1014aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1015 SV * out_fh 1440 SV * out_fh
1021 PPCODE: 1446 PPCODE:
1022{ 1447{
1023 dREQ; 1448 dREQ;
1024 1449
1025 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1026 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1027 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1028 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1029 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1030 req->offset = in_offset; 1455 req->offs = in_offset;
1031 req->length = length; 1456 req->size = length;
1032 1457
1033 REQ_SEND; 1458 REQ_SEND;
1034} 1459}
1035 1460
1036void 1461void
1043 PPCODE: 1468 PPCODE:
1044{ 1469{
1045 dREQ; 1470 dREQ;
1046 1471
1047 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1048 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1049 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1050 req->offset = offset; 1475 req->offs = offset;
1051 req->length = length; 1476 req->size = length;
1052 1477
1053 REQ_SEND; 1478 REQ_SEND;
1054} 1479}
1055 1480
1056void 1481void
1062 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1063 PPCODE: 1488 PPCODE:
1064{ 1489{
1065 dREQ; 1490 dREQ;
1066 1491
1067 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1068 if (!req->statdata) 1493 if (!req->ptr2)
1069 { 1494 {
1070 req_free (req); 1495 req_free (req);
1071 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_req statdata allocation");
1072 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1073 1500
1074 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1075 { 1502 {
1076 req->type = ix; 1503 req->type = ix;
1077 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1078 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1079 } 1506 }
1080 else 1507 else
1081 { 1508 {
1082 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1083 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1084 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1085 } 1512 }
1086 1513
1087 REQ_SEND; 1514 REQ_SEND;
1088} 1515}
1089 1516
1090void 1517void
1091aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1092 SV * pathname 1519 SV * pathname
1093 SV * callback 1520 SV * callback
1094 ALIAS: 1521 ALIAS:
1095 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1096 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1097 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1098 PPCODE: 1525 PPCODE:
1099{ 1526{
1100 dREQ; 1527 dREQ;
1101 1528
1102 req->type = ix; 1529 req->type = ix;
1103 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1104 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (pathname);
1105 1532
1106 REQ_SEND; 1533 REQ_SEND;
1107} 1534}
1108 1535
1109void 1536void
1110aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1111 SV * oldpath 1538 SV * oldpath
1112 SV * newpath 1539 SV * newpath
1113 SV * callback 1540 SV * callback
1114 ALIAS: 1541 ALIAS:
1115 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1116 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1117 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1118 PPCODE: 1545 PPCODE:
1119{ 1546{
1120 dREQ; 1547 dREQ;
1121 1548
1122 req->type = ix; 1549 req->type = ix;
1123 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1124 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1125 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1126 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (newpath);
1127 1554
1128 REQ_SEND; 1555 REQ_SEND;
1129} 1556}
1130 1557
1131void 1558void
1132aio_sleep (delay,callback=&PL_sv_undef) 1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1133 double delay 1560 SV * pathname
1134 SV * callback 1561 SV * callback
1562 UV mode
1563 UV dev
1135 PPCODE: 1564 PPCODE:
1136{ 1565{
1137 dREQ; 1566 dREQ;
1567
1568 req->type = REQ_MKNOD;
1569 req->sv1 = newSVsv (pathname);
1570 req->ptr1 = SvPVbyte_nolen (pathname);
1571 req->mode = (mode_t)mode;
1572 req->offs = dev;
1573
1574 REQ_SEND;
1575}
1138 1576
1577void
1578aio_busy (delay,callback=&PL_sv_undef)
1579 double delay
1580 SV * callback
1581 PPCODE:
1582{
1583 dREQ;
1584
1139 req->type = REQ_SLEEP; 1585 req->type = REQ_BUSY;
1140 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1141 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1142 1588
1143 REQ_SEND; 1589 REQ_SEND;
1144} 1590}
1145 1591
1146void 1592void
1148 SV * callback 1594 SV * callback
1149 PROTOTYPE: ;$ 1595 PROTOTYPE: ;$
1150 PPCODE: 1596 PPCODE:
1151{ 1597{
1152 dREQ; 1598 dREQ;
1599
1153 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1154 req->grp_next = req;
1155 req->grp_prev = req;
1156 1601
1157 req_send (req); 1602 req_send (req);
1158 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1159} 1604}
1605
1606void
1607aio_nop (callback=&PL_sv_undef)
1608 SV * callback
1609 PPCODE:
1610{
1611 dREQ;
1612
1613 req->type = REQ_NOP;
1614
1615 REQ_SEND;
1616}
1617
1618int
1619aioreq_pri (int pri = 0)
1620 PROTOTYPE: ;$
1621 CODE:
1622 RETVAL = next_pri - PRI_BIAS;
1623 if (items > 0)
1624 {
1625 if (pri < PRI_MIN) pri = PRI_MIN;
1626 if (pri > PRI_MAX) pri = PRI_MAX;
1627 next_pri = pri + PRI_BIAS;
1628 }
1629 OUTPUT:
1630 RETVAL
1631
1632void
1633aioreq_nice (int nice = 0)
1634 CODE:
1635 nice = next_pri - nice;
1636 if (nice < PRI_MIN) nice = PRI_MIN;
1637 if (nice > PRI_MAX) nice = PRI_MAX;
1638 next_pri = nice + PRI_BIAS;
1160 1639
1161void 1640void
1162flush () 1641flush ()
1163 PROTOTYPE: 1642 PROTOTYPE:
1164 CODE: 1643 CODE:
1165 while (nreqs) 1644 while (nreqs)
1166 { 1645 {
1167 poll_wait (); 1646 poll_wait ();
1168 poll_cb (); 1647 poll_cb (0);
1169 } 1648 }
1170 1649
1171void 1650void
1172poll() 1651poll()
1173 PROTOTYPE: 1652 PROTOTYPE:
1174 CODE: 1653 CODE:
1175 if (nreqs) 1654 if (nreqs)
1176 { 1655 {
1177 poll_wait (); 1656 poll_wait ();
1178 poll_cb (); 1657 poll_cb (0);
1179 } 1658 }
1180 1659
1181int 1660int
1182poll_fileno() 1661poll_fileno()
1183 PROTOTYPE: 1662 PROTOTYPE:
1207 CODE: 1686 CODE:
1208 RETVAL = nreqs; 1687 RETVAL = nreqs;
1209 OUTPUT: 1688 OUTPUT:
1210 RETVAL 1689 RETVAL
1211 1690
1212MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1691int
1213 1692nready()
1214void
1215cancel (aio_req_ornot req)
1216 PROTOTYPE: 1693 PROTOTYPE:
1217 CODE: 1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1717PROTOTYPES: DISABLE
1718
1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1720
1721void
1722cancel (aio_req_ornot req)
1723 CODE:
1218 req_cancel (req); 1724 req_cancel (req);
1219 1725
1726void
1727cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1728 CODE:
1729 SvREFCNT_dec (req->callback);
1730 req->callback = newSVsv (callback);
1731
1220MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1732MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221 1733
1222void 1734void
1223add (aio_req grp, ...) 1735add (aio_req grp, ...)
1224 PROTOTYPE: $;@
1225 PPCODE: 1736 PPCODE:
1226{ 1737{
1227 int i; 1738 int i;
1739 aio_req req;
1740
1741 if (grp->int1 == 2)
1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1228 1743
1229 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1230 { 1745 {
1231 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
1232 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1747 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233 1748
1234 aio_req req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1235 1750
1236 if (req) 1751 if (req)
1237 { 1752 {
1238 req->grp_prev = grp; 1753 ++grp->size;
1239 req->grp_next = grp->grp_next;
1240 grp->grp_next->grp_prev = req;
1241 grp->grp_next = req;
1242
1243 req->grp = grp; 1754 req->grp = grp;
1755
1756 req->grp_prev = 0;
1757 req->grp_next = grp->grp_first;
1758
1759 if (grp->grp_first)
1760 grp->grp_first->grp_prev = req;
1761
1762 grp->grp_first = req;
1244 } 1763 }
1245 } 1764 }
1246} 1765}
1247 1766
1767void
1768cancel_subs (aio_req_ornot req)
1769 CODE:
1770 req_cancel_subs (req);
1771
1772void
1773result (aio_req grp, ...)
1774 CODE:
1775{
1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1781 av = newAV ();
1782
1783 for (i = 1; i < items; ++i )
1784 av_push (av, newSVsv (ST (i)));
1785
1786 SvREFCNT_dec (grp->sv1);
1787 grp->sv1 = (SV *)av;
1788}
1789
1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1794
1795void
1796limit (aio_req grp, int limit)
1797 CODE:
1798 grp->int2 = limit;
1799 aio_grp_feed (grp);
1800
1801void
1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1803 CODE:
1804{
1805 SvREFCNT_dec (grp->sv2);
1806 grp->sv2 = newSVsv (callback);
1807
1808 if (grp->int2 <= 0)
1809 grp->int2 = 2;
1810
1811 aio_grp_feed (grp);
1812}
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines