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.63 by root, Mon Oct 23 23:48:31 2006 UTC vs.
Revision 1.79 by root, Thu Oct 26 16:28:33 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
… …
44/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 49#ifndef NAME_MAX
46# define NAME_MAX 4096 50# define NAME_MAX 4096
47#endif 51#endif
48 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
49#if __ia64 58#if __ia64
50# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
51#else 62#else
52# define STACKSIZE 8192 63# define STACKSIZE 16384
53#endif 64#endif
65
66/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes.
69 */
70#ifndef WORDREAD_UNSAFE
71# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0
73# else
74# define WORDREAD_UNSAFE 1
75# endif
76#endif
77
78/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536
80
81#define dBUF \
82 char *aio_buf; \
83 LOCK (wrklock); \
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \
86 if (!aio_buf) \
87 return -1;
54 88
55enum { 89enum {
56 REQ_QUIT, 90 REQ_QUIT,
57 REQ_OPEN, REQ_CLOSE, 91 REQ_OPEN, REQ_CLOSE,
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 92 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
61 REQ_FSYNC, REQ_FDATASYNC, 95 REQ_FSYNC, REQ_FDATASYNC,
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63 REQ_READDIR, 97 REQ_READDIR,
64 REQ_LINK, REQ_SYMLINK, 98 REQ_LINK, REQ_SYMLINK,
65 REQ_GROUP, REQ_NOP, 99 REQ_GROUP, REQ_NOP,
66 REQ_SLEEP, 100 REQ_BUSY,
67}; 101};
68 102
69#define AIO_REQ_KLASS "IO::AIO::REQ" 103#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 104#define AIO_GRP_KLASS "IO::AIO::GRP"
71 105
… …
105 PRI_MIN = -4, 139 PRI_MIN = -4,
106 PRI_MAX = 4, 140 PRI_MAX = 4,
107 141
108 DEFAULT_PRI = 0, 142 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN, 143 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110}; 145};
111 146
112static int next_pri = DEFAULT_PRI + PRI_BIAS; 147static int next_pri = DEFAULT_PRI + PRI_BIAS;
113 148
114static int started, wanted; 149static unsigned int started, wanted;
115static volatile int nreqs; 150static volatile unsigned int nreqs, nready, npending;
116static int max_outstanding = 1<<30; 151static volatile unsigned int max_outstanding = 0xffffffff;
117static int respipe [2]; 152static int respipe [2];
118 153
119#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else 156#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif 158#endif
124 159
160#define LOCK(mutex) pthread_mutex_lock (&(mutex))
161#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
162
163/* worker threads management */
164static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
165
166typedef struct worker {
167 /* locked by wrklock */
168 struct worker *prev, *next;
169
170 pthread_t tid;
171
172 /* locked by reslock, reqlock or wrklock */
173 aio_req req; /* currently processed request */
174 void *dbuf;
175 DIR *dirp;
176} worker;
177
178static worker wrk_first = { &wrk_first, &wrk_first, 0 };
179
180static void worker_clear (worker *wrk)
181{
182 if (wrk->dirp)
183 {
184 closedir (wrk->dirp);
185 wrk->dirp = 0;
186 }
187
188 if (wrk->dbuf)
189 {
190 free (wrk->dbuf);
191 wrk->dbuf = 0;
192 }
193}
194
195static void worker_free (worker *wrk)
196{
197 wrk->next->prev = wrk->prev;
198 wrk->prev->next = wrk->next;
199
200 free (wrk);
201}
202
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 203static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 204static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128 206
129static volatile aio_req reqs, reqe; /* queue start, queue end */ 207/*
130static volatile aio_req ress, rese; /* queue start, queue end */ 208 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation.
211 */
212typedef struct {
213 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
214 int size;
215} reqq;
131 216
217static reqq req_queue;
218static reqq res_queue;
219
220int reqq_push (reqq *q, aio_req req)
221{
222 int pri = req->pri;
223 req->next = 0;
224
225 if (q->qe[pri])
226 {
227 q->qe[pri]->next = req;
228 q->qe[pri] = req;
229 }
230 else
231 q->qe[pri] = q->qs[pri] = req;
232
233 return q->size++;
234}
235
236aio_req reqq_shift (reqq *q)
237{
238 int pri;
239
240 if (!q->size)
241 return 0;
242
243 --q->size;
244
245 for (pri = NUM_PRI; pri--; )
246 {
247 aio_req req = q->qs[pri];
248
249 if (req)
250 {
251 if (!(q->qs[pri] = req->next))
252 q->qe[pri] = 0;
253
254 return req;
255 }
256 }
257
258 abort ();
259}
260
261static int poll_cb (int max);
132static void req_invoke (aio_req req); 262static void req_invoke (aio_req req);
133static void req_free (aio_req req); 263static void req_free (aio_req req);
264static void req_cancel (aio_req req);
134 265
135/* must be called at most once */ 266/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 267static SV *req_sv (aio_req req, const char *klass)
137{ 268{
138 if (!req->self) 269 if (!req->self)
… …
169 ENTER; 300 ENTER;
170 SAVETMPS; 301 SAVETMPS;
171 PUSHMARK (SP); 302 PUSHMARK (SP);
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 303 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173 PUTBACK; 304 PUTBACK;
174 call_sv (grp->fh2, G_VOID | G_EVAL); 305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
175 SPAGAIN; 306 SPAGAIN;
176 FREETMPS; 307 FREETMPS;
177 LEAVE; 308 LEAVE;
178 } 309 }
179 310
… …
206{ 337{
207 fd_set rfd; 338 fd_set rfd;
208 339
209 while (nreqs) 340 while (nreqs)
210 { 341 {
211 aio_req req; 342 int size;
212 pthread_mutex_lock (&reslock); 343 if (WORDREAD_UNSAFE) LOCK (reslock);
213 req = ress; 344 size = res_queue.size;
214 pthread_mutex_unlock (&reslock); 345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
215 346
216 if (req) 347 if (size)
217 return; 348 return;
218 349
219 FD_ZERO(&rfd); 350 FD_ZERO(&rfd);
220 FD_SET(respipe [0], &rfd); 351 FD_SET(respipe [0], &rfd);
221 352
… …
224} 355}
225 356
226static void req_invoke (aio_req req) 357static void req_invoke (aio_req req)
227{ 358{
228 dSP; 359 dSP;
229 int errorno = errno;
230 360
231 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
232 return; 362 {
233
234 errno = req->errorno;
235
236 ENTER; 363 ENTER;
237 SAVETMPS; 364 SAVETMPS;
238 PUSHMARK (SP); 365 PUSHMARK (SP);
239 EXTEND (SP, 1); 366 EXTEND (SP, 1);
240 367
241 switch (req->type) 368 switch (req->type)
242 {
243 case REQ_READDIR:
244 { 369 {
245 SV *rv = &PL_sv_undef; 370 case REQ_READDIR:
246
247 if (req->result >= 0)
248 { 371 {
249 char *buf = req->data2ptr; 372 SV *rv = &PL_sv_undef;
250 AV *av = newAV ();
251 373
252 while (req->result) 374 if (req->result >= 0)
253 { 375 {
376 int i;
377 char *buf = req->data2ptr;
378 AV *av = newAV ();
379
380 av_extend (av, req->result - 1);
381
382 for (i = 0; i < req->result; ++i)
383 {
254 SV *sv = newSVpv (buf, 0); 384 SV *sv = newSVpv (buf, 0);
255 385
256 av_push (av, sv); 386 av_store (av, i, sv);
257 buf += SvCUR (sv) + 1; 387 buf += SvCUR (sv) + 1;
258 req->result--; 388 }
389
390 rv = sv_2mortal (newRV_noinc ((SV *)av));
259 } 391 }
260 392
261 rv = sv_2mortal (newRV_noinc ((SV *)av)); 393 PUSHs (rv);
262 } 394 }
395 break;
263 396
264 PUSHs (rv); 397 case REQ_OPEN:
398 {
399 /* convert fd to fh */
400 SV *fh;
401
402 PUSHs (sv_2mortal (newSViv (req->result)));
403 PUTBACK;
404 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
405 SPAGAIN;
406
407 fh = SvREFCNT_inc (POPs);
408
409 PUSHMARK (SP);
410 XPUSHs (sv_2mortal (fh));
411 }
412 break;
413
414 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */
416
417 if (req->data)
418 {
419 int i;
420 AV *av = (AV *)req->data;
421
422 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0));
425 }
426 break;
427
428 case REQ_NOP:
429 case REQ_BUSY:
430 break;
431
432 default:
433 PUSHs (sv_2mortal (newSViv (req->result)));
434 break;
265 } 435 }
266 break;
267 436
268 case REQ_OPEN: 437 errno = req->errorno;
269 {
270 /* convert fd to fh */
271 SV *fh;
272 438
273 PUSHs (sv_2mortal (newSViv (req->result)));
274 PUTBACK; 439 PUTBACK;
275 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
276 SPAGAIN;
277
278 fh = SvREFCNT_inc (POPs);
279
280 PUSHMARK (SP);
281 XPUSHs (sv_2mortal (fh));
282 }
283 break;
284
285 case REQ_GROUP:
286 req->fd = 2; /* mark group as finished */
287
288 if (req->data)
289 {
290 int i;
291 AV *av = (AV *)req->data;
292
293 EXTEND (SP, AvFILL (av) + 1);
294 for (i = 0; i <= AvFILL (av); ++i)
295 PUSHs (*av_fetch (av, i, 0));
296 }
297 break;
298
299 case REQ_NOP:
300 case REQ_SLEEP:
301 break;
302
303 default:
304 PUSHs (sv_2mortal (newSViv (req->result)));
305 break;
306 }
307
308
309 PUTBACK;
310 call_sv (req->callback, G_VOID | G_EVAL); 440 call_sv (req->callback, G_VOID | G_EVAL);
311 SPAGAIN; 441 SPAGAIN;
312 442
313 FREETMPS; 443 FREETMPS;
314 LEAVE; 444 LEAVE;
315
316 errno = errorno;
317
318 if (SvTRUE (ERRSV))
319 { 445 }
320 req_free (req);
321 croak (0);
322 }
323}
324 446
325static void req_free (aio_req req)
326{
327 if (req->grp) 447 if (req->grp)
328 { 448 {
329 aio_req grp = req->grp; 449 aio_req grp = req->grp;
330 450
331 /* unlink request */ 451 /* unlink request */
… …
336 grp->grp_first = req->grp_next; 456 grp->grp_first = req->grp_next;
337 457
338 aio_grp_dec (grp); 458 aio_grp_dec (grp);
339 } 459 }
340 460
461 if (SvTRUE (ERRSV))
462 {
463 req_free (req);
464 croak (0);
465 }
466}
467
468static void req_free (aio_req req)
469{
341 if (req->self) 470 if (req->self)
342 { 471 {
343 sv_unmagic (req->self, PERL_MAGIC_ext); 472 sv_unmagic (req->self, PERL_MAGIC_ext);
344 SvREFCNT_dec (req->self); 473 SvREFCNT_dec (req->self);
345 } 474 }
… …
348 SvREFCNT_dec (req->fh); 477 SvREFCNT_dec (req->fh);
349 SvREFCNT_dec (req->fh2); 478 SvREFCNT_dec (req->fh2);
350 SvREFCNT_dec (req->callback); 479 SvREFCNT_dec (req->callback);
351 Safefree (req->statdata); 480 Safefree (req->statdata);
352 481
353 if (req->type == REQ_READDIR && req->result >= 0) 482 if (req->type == REQ_READDIR)
354 free (req->data2ptr); 483 free (req->data2ptr);
355 484
356 Safefree (req); 485 Safefree (req);
357} 486}
358 487
488static void req_cancel_subs (aio_req grp)
489{
490 aio_req sub;
491
492 if (grp->type != REQ_GROUP)
493 return;
494
495 SvREFCNT_dec (grp->fh2);
496 grp->fh2 = 0;
497
498 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub);
500}
501
359static void req_cancel (aio_req req) 502static void req_cancel (aio_req req)
360{ 503{
361 req->flags |= FLAG_CANCELLED; 504 req->flags |= FLAG_CANCELLED;
362 505
363 if (req->type == REQ_GROUP) 506 req_cancel_subs (req);
364 {
365 aio_req sub;
366
367 for (sub = req->grp_first; sub; sub = sub->grp_next)
368 req_cancel (sub);
369 }
370} 507}
371 508
372static int poll_cb () 509static int poll_cb (int max)
373{ 510{
374 dSP; 511 dSP;
375 int count = 0; 512 int count = 0;
376 int do_croak = 0; 513 int do_croak = 0;
377 aio_req req; 514 aio_req req;
378 515
379 for (;;) 516 for (;;)
380 { 517 {
381 pthread_mutex_lock (&reslock); 518 while (max <= 0 || count < max)
382 req = ress;
383
384 if (req)
385 { 519 {
386 ress = req->next; 520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
387 522
388 if (!ress) 523 if (req)
389 { 524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
390 /* read any signals sent by the worker threads */ 529 /* read any signals sent by the worker threads */
391 char buf [32]; 530 char buf [32];
392 while (read (respipe [0], buf, 32) == 32) 531 while (read (respipe [0], buf, 32) == 32)
532 ;
393 ; 533 }
394
395 rese = 0;
396 } 534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
397 } 571 }
398 572
399 pthread_mutex_unlock (&reslock); 573 if (nreqs <= max_outstanding)
400
401 if (!req)
402 break; 574 break;
403 575
404 --nreqs; 576 poll_wait ();
405 577
406 if (req->type == REQ_QUIT) 578 max = 0;
407 started--;
408 else if (req->type == REQ_GROUP && req->length)
409 {
410 req->fd = 1; /* mark request as delayed */
411 continue;
412 }
413 else
414 {
415 if (req->type == REQ_READ)
416 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
417
418 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
419 SvREADONLY_off (req->data);
420
421 if (req->statdata)
422 {
423 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
424 PL_laststatval = req->result;
425 PL_statcache = *(req->statdata);
426 }
427
428 req_invoke (req);
429
430 count++;
431 }
432
433 req_free (req);
434 } 579 }
435 580
436 return count; 581 return count;
437} 582}
438 583
439static void *aio_proc(void *arg); 584static void *aio_proc(void *arg);
440 585
441static void start_thread (void) 586static void start_thread (void)
442{ 587{
443 sigset_t fullsigset, oldsigset; 588 sigset_t fullsigset, oldsigset;
444 pthread_t tid;
445 pthread_attr_t attr; 589 pthread_attr_t attr;
590
591 worker *wrk = calloc (1, sizeof (worker));
592
593 if (!wrk)
594 croak ("unable to allocate worker thread data");
446 595
447 pthread_attr_init (&attr); 596 pthread_attr_init (&attr);
448 pthread_attr_setstacksize (&attr, STACKSIZE); 597 pthread_attr_setstacksize (&attr, STACKSIZE);
449 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
450 599
451 sigfillset (&fullsigset); 600 sigfillset (&fullsigset);
601
602 LOCK (wrklock);
452 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
453 604
454 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
606 {
607 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next;
609 wrk_first.next->prev = wrk;
610 wrk_first.next = wrk;
455 started++; 611 ++started;
612 }
613 else
614 free (wrk);
456 615
457 sigprocmask (SIG_SETMASK, &oldsigset, 0); 616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock);
458} 618}
459 619
460static void req_send (aio_req req) 620static void req_send (aio_req req)
461{ 621{
462 while (started < wanted && nreqs >= started) 622 while (started < wanted && nreqs >= started)
463 start_thread (); 623 start_thread ();
464 624
465 ++nreqs; 625 ++nreqs;
466 626
467 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
468 628 ++nready;
469 req->next = 0; 629 reqq_push (&req_queue, req);
470
471 if (reqe)
472 {
473 reqe->next = req;
474 reqe = req;
475 }
476 else
477 reqe = reqs = req;
478
479 pthread_cond_signal (&reqwait); 630 pthread_cond_signal (&reqwait);
480 pthread_mutex_unlock (&reqlock); 631 UNLOCK (reqlock);
481
482 if (nreqs > max_outstanding)
483 for (;;)
484 {
485 poll_cb ();
486
487 if (nreqs <= max_outstanding)
488 break;
489
490 poll_wait ();
491 }
492} 632}
493 633
494static void end_thread (void) 634static void end_thread (void)
495{ 635{
496 aio_req req; 636 aio_req req;
637
497 Newz (0, req, 1, aio_cb); 638 Newz (0, req, 1, aio_cb);
639
498 req->type = REQ_QUIT; 640 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS;
499 642
500 req_send (req); 643 req_send (req);
501} 644}
502 645
503static void min_parallel (int nthreads) 646static void min_parallel (int nthreads)
… …
520 } 663 }
521 664
522 while (started > wanted) 665 while (started > wanted)
523 { 666 {
524 poll_wait (); 667 poll_wait ();
525 poll_cb (); 668 poll_cb (0);
526 } 669 }
527} 670}
528 671
529static void create_pipe () 672static void create_pipe ()
530{ 673{
… …
555static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 698static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
556{ 699{
557 ssize_t res; 700 ssize_t res;
558 off_t ooffset; 701 off_t ooffset;
559 702
560 pthread_mutex_lock (&preadwritelock); 703 LOCK (preadwritelock);
561 ooffset = lseek (fd, 0, SEEK_CUR); 704 ooffset = lseek (fd, 0, SEEK_CUR);
562 lseek (fd, offset, SEEK_SET); 705 lseek (fd, offset, SEEK_SET);
563 res = read (fd, buf, count); 706 res = read (fd, buf, count);
564 lseek (fd, ooffset, SEEK_SET); 707 lseek (fd, ooffset, SEEK_SET);
565 pthread_mutex_unlock (&preadwritelock); 708 UNLOCK (preadwritelock);
566 709
567 return res; 710 return res;
568} 711}
569 712
570static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 713static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
571{ 714{
572 ssize_t res; 715 ssize_t res;
573 off_t ooffset; 716 off_t ooffset;
574 717
575 pthread_mutex_lock (&preadwritelock); 718 LOCK (preadwritelock);
576 ooffset = lseek (fd, 0, SEEK_CUR); 719 ooffset = lseek (fd, 0, SEEK_CUR);
577 lseek (fd, offset, SEEK_SET); 720 lseek (fd, offset, SEEK_SET);
578 res = write (fd, buf, count); 721 res = write (fd, buf, count);
579 lseek (fd, offset, SEEK_SET); 722 lseek (fd, offset, SEEK_SET);
580 pthread_mutex_unlock (&preadwritelock); 723 UNLOCK (preadwritelock);
581 724
582 return res; 725 return res;
583} 726}
584#endif 727#endif
585 728
586#if !HAVE_FDATASYNC 729#if !HAVE_FDATASYNC
587# define fdatasync fsync 730# define fdatasync fsync
588#endif 731#endif
589 732
590#if !HAVE_READAHEAD 733#if !HAVE_READAHEAD
591# define readahead aio_readahead 734# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
592 735
593static ssize_t readahead (int fd, off_t offset, size_t count) 736static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
594{ 737{
595 char readahead_buf[4096]; 738 dBUF;
596 739
597 while (count > 0) 740 while (count > 0)
598 { 741 {
599 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 742 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
600 743
601 pread (fd, readahead_buf, len, offset); 744 pread (fd, aio_buf, len, offset);
602 offset += len; 745 offset += len;
603 count -= len; 746 count -= len;
604 } 747 }
605 748
606 errno = 0; 749 errno = 0;
607} 750}
751
608#endif 752#endif
609 753
610#if !HAVE_READDIR_R 754#if !HAVE_READDIR_R
611# define readdir_r aio_readdir_r 755# define readdir_r aio_readdir_r
612 756
… …
615static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
616{ 760{
617 struct dirent *e; 761 struct dirent *e;
618 int errorno; 762 int errorno;
619 763
620 pthread_mutex_lock (&readdirlock); 764 LOCK (readdirlock);
621 765
622 e = readdir (dirp); 766 e = readdir (dirp);
623 errorno = errno; 767 errorno = errno;
624 768
625 if (e) 769 if (e)
… …
628 strcpy (ent->d_name, e->d_name); 772 strcpy (ent->d_name, e->d_name);
629 } 773 }
630 else 774 else
631 *res = 0; 775 *res = 0;
632 776
633 pthread_mutex_unlock (&readdirlock); 777 UNLOCK (readdirlock);
634 778
635 errno = errorno; 779 errno = errorno;
636 return e ? 0 : -1; 780 return e ? 0 : -1;
637} 781}
638#endif 782#endif
639 783
640/* sendfile always needs emulation */ 784/* sendfile always needs emulation */
641static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 785static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
642{ 786{
643 ssize_t res; 787 ssize_t res;
644 788
645 if (!count) 789 if (!count)
646 return 0; 790 return 0;
… …
657 { 801 {
658 off_t sbytes; 802 off_t sbytes;
659 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 803 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
660 804
661 if (res < 0 && sbytes) 805 if (res < 0 && sbytes)
662 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 806 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
663 res = sbytes; 807 res = sbytes;
664 } 808 }
665 809
666# elif __hpux 810# elif __hpux
667 res = sendfile (ofd, ifd, offset, count, 0, 0); 811 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
695#endif 839#endif
696 ) 840 )
697 ) 841 )
698 { 842 {
699 /* emulate sendfile. this is a major pain in the ass */ 843 /* emulate sendfile. this is a major pain in the ass */
700 char buf[4096]; 844 dBUF;
845
701 res = 0; 846 res = 0;
702 847
703 while (count) 848 while (count)
704 { 849 {
705 ssize_t cnt; 850 ssize_t cnt;
706 851
707 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 852 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
708 853
709 if (cnt <= 0) 854 if (cnt <= 0)
710 { 855 {
711 if (cnt && !res) res = -1; 856 if (cnt && !res) res = -1;
712 break; 857 break;
713 } 858 }
714 859
715 cnt = write (ofd, buf, cnt); 860 cnt = write (ofd, aio_buf, cnt);
716 861
717 if (cnt <= 0) 862 if (cnt <= 0)
718 { 863 {
719 if (cnt && !res) res = -1; 864 if (cnt && !res) res = -1;
720 break; 865 break;
… …
728 873
729 return res; 874 return res;
730} 875}
731 876
732/* read a full directory */ 877/* read a full directory */
733static int scandir_ (const char *path, void **namesp) 878static void scandir_ (aio_req req, worker *self)
734{ 879{
735 DIR *dirp = opendir (path); 880 DIR *dirp;
736 union 881 union
737 { 882 {
738 struct dirent d; 883 struct dirent d;
739 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 884 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
740 } u; 885 } *u;
741 struct dirent *entp; 886 struct dirent *entp;
742 char *name, *names; 887 char *name, *names;
743 int memlen = 4096; 888 int memlen = 4096;
744 int memofs = 0; 889 int memofs = 0;
745 int res = 0; 890 int res = 0;
746 int errorno; 891 int errorno;
747 892
748 if (!dirp) 893 LOCK (wrklock);
749 return -1; 894 self->dirp = dirp = opendir (req->dataptr);
750 895 self->dbuf = u = malloc (sizeof (*u));
751 names = malloc (memlen); 896 req->data2ptr = names = malloc (memlen);
897 UNLOCK (wrklock);
752 898
899 if (dirp && u && names)
753 for (;;) 900 for (;;)
754 { 901 {
902 errno = 0;
755 errno = 0, readdir_r (dirp, &u.d, &entp); 903 readdir_r (dirp, &u->d, &entp);
756 904
757 if (!entp) 905 if (!entp)
758 break; 906 break;
759 907
760 name = entp->d_name; 908 name = entp->d_name;
761 909
762 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 910 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
763 { 911 {
764 int len = strlen (name) + 1; 912 int len = strlen (name) + 1;
765 913
766 res++; 914 res++;
767 915
768 while (memofs + len > memlen) 916 while (memofs + len > memlen)
769 { 917 {
770 memlen *= 2; 918 memlen *= 2;
919 LOCK (wrklock);
771 names = realloc (names, memlen); 920 req->data2ptr = names = realloc (names, memlen);
921 UNLOCK (wrklock);
922
772 if (!names) 923 if (!names)
773 break; 924 break;
774 } 925 }
775 926
776 memcpy (names + memofs, name, len); 927 memcpy (names + memofs, name, len);
777 memofs += len; 928 memofs += len;
778 } 929 }
779 } 930 }
780 931
781 errorno = errno;
782 closedir (dirp);
783
784 if (errorno) 932 if (errno)
785 {
786 free (names);
787 errno = errorno;
788 res = -1; 933 res = -1;
789 } 934
790 935 req->result = res;
791 *namesp = (void *)names;
792 return res;
793} 936}
794 937
795/*****************************************************************************/ 938/*****************************************************************************/
796 939
797static void *aio_proc (void *thr_arg) 940static void *aio_proc (void *thr_arg)
798{ 941{
799 aio_req req; 942 aio_req req;
800 int type; 943 int type;
944 worker *self = (worker *)thr_arg;
801 945
802 do 946 do
803 { 947 {
804 pthread_mutex_lock (&reqlock); 948 LOCK (reqlock);
805 949
806 for (;;) 950 for (;;)
807 { 951 {
808 req = reqs; 952 self->req = req = reqq_shift (&req_queue);
809
810 if (reqs)
811 {
812 reqs = reqs->next;
813 if (!reqs) reqe = 0;
814 }
815 953
816 if (req) 954 if (req)
817 break; 955 break;
818 956
819 pthread_cond_wait (&reqwait, &reqlock); 957 pthread_cond_wait (&reqwait, &reqlock);
820 } 958 }
821 959
822 pthread_mutex_unlock (&reqlock); 960 --nready;
961
962 UNLOCK (reqlock);
823 963
824 errno = 0; /* strictly unnecessary */ 964 errno = 0; /* strictly unnecessary */
825 type = req->type; /* remember type for QUIT check */ 965 type = req->type; /* remember type for QUIT check */
826 966
827 if (!(req->flags & FLAG_CANCELLED)) 967 if (!(req->flags & FLAG_CANCELLED))
… …
829 { 969 {
830 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 970 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
831 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 971 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
832 972
833 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 973 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
834 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 974 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
835 975
836 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
837 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
838 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
839 979
… …
845 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
846 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
847 987
848 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
849 case REQ_FSYNC: req->result = fsync (req->fd); break; 989 case REQ_FSYNC: req->result = fsync (req->fd); break;
850 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 990 case REQ_READDIR: scandir_ (req, self); break;
851 991
852 case REQ_SLEEP: 992 case REQ_BUSY:
853 { 993 {
854 struct timeval tv; 994 struct timeval tv;
855 995
856 tv.tv_sec = req->fd; 996 tv.tv_sec = req->fd;
857 tv.tv_usec = req->fd2; 997 tv.tv_usec = req->fd2;
… …
869 break; 1009 break;
870 } 1010 }
871 1011
872 req->errorno = errno; 1012 req->errorno = errno;
873 1013
874 pthread_mutex_lock (&reslock); 1014 LOCK (reslock);
875 1015
876 req->next = 0; 1016 ++npending;
877 1017
878 if (rese) 1018 if (!reqq_push (&res_queue, req))
879 {
880 rese->next = req;
881 rese = req;
882 }
883 else
884 {
885 rese = ress = req;
886
887 /* write a dummy byte to the pipe so fh becomes ready */ 1019 /* write a dummy byte to the pipe so fh becomes ready */
888 write (respipe [1], &respipe, 1); 1020 write (respipe [1], &respipe, 1);
889 }
890 1021
891 pthread_mutex_unlock (&reslock); 1022 self->req = 0;
1023 worker_clear (self);
1024
1025 UNLOCK (reslock);
892 } 1026 }
893 while (type != REQ_QUIT); 1027 while (type != REQ_QUIT);
894 1028
1029 LOCK (wrklock);
1030 worker_free (self);
1031 UNLOCK (wrklock);
1032
895 return 0; 1033 return 0;
896} 1034}
897 1035
898/*****************************************************************************/ 1036/*****************************************************************************/
899 1037
900static void atfork_prepare (void) 1038static void atfork_prepare (void)
901{ 1039{
902 pthread_mutex_lock (&reqlock); 1040 LOCK (wrklock);
903 pthread_mutex_lock (&reslock); 1041 LOCK (reqlock);
1042 LOCK (reslock);
904#if !HAVE_PREADWRITE 1043#if !HAVE_PREADWRITE
905 pthread_mutex_lock (&preadwritelock); 1044 LOCK (preadwritelock);
906#endif 1045#endif
907#if !HAVE_READDIR_R 1046#if !HAVE_READDIR_R
908 pthread_mutex_lock (&readdirlock); 1047 LOCK (readdirlock);
909#endif 1048#endif
910} 1049}
911 1050
912static void atfork_parent (void) 1051static void atfork_parent (void)
913{ 1052{
914#if !HAVE_READDIR_R 1053#if !HAVE_READDIR_R
915 pthread_mutex_unlock (&readdirlock); 1054 UNLOCK (readdirlock);
916#endif 1055#endif
917#if !HAVE_PREADWRITE 1056#if !HAVE_PREADWRITE
918 pthread_mutex_unlock (&preadwritelock); 1057 UNLOCK (preadwritelock);
919#endif 1058#endif
920 pthread_mutex_unlock (&reslock); 1059 UNLOCK (reslock);
921 pthread_mutex_unlock (&reqlock); 1060 UNLOCK (reqlock);
1061 UNLOCK (wrklock);
922} 1062}
923 1063
924static void atfork_child (void) 1064static void atfork_child (void)
925{ 1065{
926 aio_req prv; 1066 aio_req prv;
927 1067
1068 while (prv = reqq_shift (&req_queue))
1069 req_free (prv);
1070
1071 while (prv = reqq_shift (&res_queue))
1072 req_free (prv);
1073
1074 while (wrk_first.next != &wrk_first)
1075 {
1076 worker *wrk = wrk_first.next;
1077
1078 if (wrk->req)
1079 req_free (wrk->req);
1080
1081 worker_clear (wrk);
1082 worker_free (wrk);
1083 }
1084
928 started = 0; 1085 started = 0;
929 1086 nreqs = 0;
930 while (reqs)
931 {
932 prv = reqs;
933 reqs = prv->next;
934 req_free (prv);
935 }
936
937 reqs = reqe = 0;
938
939 while (ress)
940 {
941 prv = ress;
942 ress = prv->next;
943 req_free (prv);
944 }
945
946 ress = rese = 0;
947 1087
948 close (respipe [0]); 1088 close (respipe [0]);
949 close (respipe [1]); 1089 close (respipe [1]);
950 create_pipe (); 1090 create_pipe ();
951 1091
… …
987 create_pipe (); 1127 create_pipe ();
988 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
989} 1129}
990 1130
991void 1131void
992min_parallel (nthreads) 1132min_parallel (int nthreads)
993 int nthreads
994 PROTOTYPE: $ 1133 PROTOTYPE: $
995 1134
996void 1135void
997max_parallel (nthreads) 1136max_parallel (int nthreads)
998 int nthreads
999 PROTOTYPE: $ 1137 PROTOTYPE: $
1000 1138
1001int 1139int
1002max_outstanding (nreqs) 1140max_outstanding (int maxreqs)
1003 int nreqs 1141 PROTOTYPE: $
1004 PROTOTYPE: $
1005 CODE: 1142 CODE:
1006 RETVAL = max_outstanding; 1143 RETVAL = max_outstanding;
1007 max_outstanding = nreqs; 1144 max_outstanding = maxreqs;
1145 OUTPUT:
1146 RETVAL
1008 1147
1009void 1148void
1010aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1149aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1011 SV * pathname 1150 SV * pathname
1012 int flags 1151 int flags
… …
1227 1366
1228 REQ_SEND; 1367 REQ_SEND;
1229} 1368}
1230 1369
1231void 1370void
1232aio_sleep (delay,callback=&PL_sv_undef) 1371aio_busy (delay,callback=&PL_sv_undef)
1233 double delay 1372 double delay
1234 SV * callback 1373 SV * callback
1235 PPCODE: 1374 PPCODE:
1236{ 1375{
1237 dREQ; 1376 dREQ;
1238 1377
1239 req->type = REQ_SLEEP; 1378 req->type = REQ_BUSY;
1240 req->fd = delay < 0. ? 0 : delay; 1379 req->fd = delay < 0. ? 0 : delay;
1241 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1242 1381
1243 REQ_SEND; 1382 REQ_SEND;
1244} 1383}
… …
1267 req->type = REQ_NOP; 1406 req->type = REQ_NOP;
1268 1407
1269 REQ_SEND; 1408 REQ_SEND;
1270} 1409}
1271 1410
1272#if 0 1411int
1273 1412aioreq_pri (int pri = 0)
1274void 1413 PROTOTYPE: ;$
1275aio_pri (int pri = DEFAULT_PRI)
1276 CODE: 1414 CODE:
1415 RETVAL = next_pri - PRI_BIAS;
1416 if (items > 0)
1417 {
1277 if (pri < PRI_MIN) pri = PRI_MIN; 1418 if (pri < PRI_MIN) pri = PRI_MIN;
1278 if (pri > PRI_MAX) pri = PRI_MAX; 1419 if (pri > PRI_MAX) pri = PRI_MAX;
1279 next_pri = pri + PRI_BIAS; 1420 next_pri = pri + PRI_BIAS;
1421 }
1422 OUTPUT:
1423 RETVAL
1280 1424
1281#endif 1425void
1426aioreq_nice (int nice = 0)
1427 CODE:
1428 nice = next_pri - nice;
1429 if (nice < PRI_MIN) nice = PRI_MIN;
1430 if (nice > PRI_MAX) nice = PRI_MAX;
1431 next_pri = nice + PRI_BIAS;
1282 1432
1283void 1433void
1284flush () 1434flush ()
1285 PROTOTYPE: 1435 PROTOTYPE:
1286 CODE: 1436 CODE:
1287 while (nreqs) 1437 while (nreqs)
1288 { 1438 {
1289 poll_wait (); 1439 poll_wait ();
1290 poll_cb (); 1440 poll_cb (0);
1291 } 1441 }
1292 1442
1293void 1443void
1294poll() 1444poll()
1295 PROTOTYPE: 1445 PROTOTYPE:
1296 CODE: 1446 CODE:
1297 if (nreqs) 1447 if (nreqs)
1298 { 1448 {
1299 poll_wait (); 1449 poll_wait ();
1300 poll_cb (); 1450 poll_cb (0);
1301 } 1451 }
1302 1452
1303int 1453int
1304poll_fileno() 1454poll_fileno()
1305 PROTOTYPE: 1455 PROTOTYPE:
… …
1310 1460
1311int 1461int
1312poll_cb(...) 1462poll_cb(...)
1313 PROTOTYPE: 1463 PROTOTYPE:
1314 CODE: 1464 CODE:
1315 RETVAL = poll_cb (); 1465 RETVAL = poll_cb (0);
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1316 OUTPUT: 1474 OUTPUT:
1317 RETVAL 1475 RETVAL
1318 1476
1319void 1477void
1320poll_wait() 1478poll_wait()
… …
1329 CODE: 1487 CODE:
1330 RETVAL = nreqs; 1488 RETVAL = nreqs;
1331 OUTPUT: 1489 OUTPUT:
1332 RETVAL 1490 RETVAL
1333 1491
1492int
1493nready()
1494 PROTOTYPE:
1495 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready;
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT:
1500 RETVAL
1501
1502int
1503npending()
1504 PROTOTYPE:
1505 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock);
1509 OUTPUT:
1510 RETVAL
1511
1334PROTOTYPES: DISABLE 1512PROTOTYPES: DISABLE
1335 1513
1336MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1514MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1337 1515
1338void 1516void
1339cancel (aio_req_ornot req) 1517cancel (aio_req_ornot req)
1340 PROTOTYPE:
1341 CODE: 1518 CODE:
1342 req_cancel (req); 1519 req_cancel (req);
1343 1520
1344void 1521void
1345cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1522cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1381 } 1558 }
1382 } 1559 }
1383} 1560}
1384 1561
1385void 1562void
1563cancel_subs (aio_req_ornot req)
1564 CODE:
1565 req_cancel_subs (req);
1566
1567void
1386result (aio_req grp, ...) 1568result (aio_req grp, ...)
1387 CODE: 1569 CODE:
1388{ 1570{
1389 int i; 1571 int i;
1572 AV *av;
1573
1574 grp->errorno = errno;
1575
1390 AV *av = newAV (); 1576 av = newAV ();
1391 1577
1392 for (i = 1; i < items; ++i ) 1578 for (i = 1; i < items; ++i )
1393 av_push (av, newSVsv (ST (i))); 1579 av_push (av, newSVsv (ST (i)));
1394 1580
1395 SvREFCNT_dec (grp->data); 1581 SvREFCNT_dec (grp->data);
1396 grp->data = (SV *)av; 1582 grp->data = (SV *)av;
1397} 1583}
1398 1584
1399void 1585void
1586errno (aio_req grp, int errorno = errno)
1587 CODE:
1588 grp->errorno = errorno;
1589
1590void
1400feed_limit (aio_req grp, int limit) 1591limit (aio_req grp, int limit)
1401 CODE: 1592 CODE:
1402 grp->fd2 = limit; 1593 grp->fd2 = limit;
1403 aio_grp_feed (grp); 1594 aio_grp_feed (grp);
1404 1595
1405void 1596void

Diff Legend

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