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.20 by root, Sun Jul 31 19:08:39 2005 UTC vs.
Revision 1.25 by root, Wed Aug 17 03:16:56 2005 UTC

… …
29 29
30enum { 30enum {
31 REQ_QUIT, 31 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
36}; 38};
37 39
38typedef struct aio_cb { 40typedef struct aio_cb {
39 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
40 42
… …
45 size_t length; 47 size_t length;
46 ssize_t result; 48 ssize_t result;
47 mode_t mode; /* open */ 49 mode_t mode; /* open */
48 int errorno; 50 int errorno;
49 SV *data, *callback, *fh; 51 SV *data, *callback, *fh;
50 void *dataptr; 52 void *dataptr, *data2ptr;
51 STRLEN dataoffset; 53 STRLEN dataoffset;
52 54
53 Stat_t *statdata; 55 Stat_t *statdata;
54} aio_cb; 56} aio_cb;
55 57
… …
60static int max_outstanding = 1<<30; 62static int max_outstanding = 1<<30;
61static int respipe [2]; 63static int respipe [2];
62 64
63static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
64static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
67static pthread_mutex_t frklock = PTHREAD_MUTEX_INITIALIZER;
65static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 68static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
66 69
67static volatile aio_req reqs, reqe; /* queue start, queue end */ 70static volatile aio_req reqs, reqe; /* queue start, queue end */
68static volatile aio_req ress, rese; /* queue start, queue end */ 71static volatile aio_req ress, rese; /* queue start, queue end */
69 72
… …
83static int 86static int
84poll_cb () 87poll_cb ()
85{ 88{
86 dSP; 89 dSP;
87 int count = 0; 90 int count = 0;
91 int do_croak = 0;
88 aio_req req, prv; 92 aio_req req, prv;
89 93
90 pthread_mutex_lock (&reslock); 94 pthread_mutex_lock (&reslock);
91 95
92 { 96 {
93 /* read any signals sent by the worker threads */ 97 /* read any signals sent by the worker threads */
94 char buf [32]; 98 char buf [32];
95 while (read (respipe [0], buf, 32) > 0) 99 while (read (respipe [0], buf, 32) == 32)
96 ; 100 ;
97 } 101 }
98 102
99 req = ress; 103 req = ress;
100 ress = rese = 0; 104 ress = rese = 0;
… …
155 PUTBACK; 159 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL); 160 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 161 SPAGAIN;
158 } 162 }
159 163
164 do_croak = SvTRUE (ERRSV);
165
160 LEAVE; 166 LEAVE;
161 167
162 if (req->callback) 168 if (req->callback)
163 SvREFCNT_dec (req->callback); 169 SvREFCNT_dec (req->callback);
164 170
… …
168 174
169 prv = req; 175 prv = req;
170 req = req->next; 176 req = req->next;
171 Safefree (prv); 177 Safefree (prv);
172 178
173 /* TODO: croak on errors? */ 179 if (do_croak)
180 croak (0);
174 } 181 }
175 182
176 return count; 183 return count;
177} 184}
178 185
… …
233 req->type = REQ_QUIT; 240 req->type = REQ_QUIT;
234 241
235 send_req (req); 242 send_req (req);
236} 243}
237 244
245
246static void min_parallel (int nthreads)
247{
248 while (nthreads > started)
249 start_thread ();
250}
251
252static void max_parallel (int nthreads)
253{
254 int cur = started;
255 while (cur > nthreads)
256 {
257 end_thread ();
258 cur--;
259 }
260
261 while (started > nthreads)
262 {
263 poll_wait ();
264 poll_cb ();
265 }
266}
267
268static int fork_started;
269
270static void atfork_prepare (void)
271{
272 int nstarted;
273
274 for (;;) {
275 while (nreqs)
276 {
277 poll_wait ();
278 poll_cb ();
279 }
280
281 nstarted = started;
282 max_parallel (0);
283
284 pthread_mutex_lock (&reqlock);
285
286 if (!nreqs && !started)
287 break;
288
289 pthread_mutex_unlock (&reqlock);
290
291 min_parallel (fork_started);
292 }
293
294 pthread_mutex_lock (&frklock);
295 fork_started = nstarted;
296 pthread_mutex_lock (&reslock);
297
298 assert (!started);
299 assert (!nreqs);
300 assert (!reqs && !reqe);
301 assert (!ress && !rese);
302}
303
304static void atfork_parent (void)
305{
306 pthread_mutex_unlock (&reslock);
307 pthread_mutex_unlock (&frklock);
308 pthread_mutex_unlock (&reqlock);
309
310 min_parallel (fork_started);
311}
312
313#define atfork_child atfork_parent
314
315/*****************************************************************************/
238/* work around various missing functions */ 316/* work around various missing functions */
239 317
240#if !HAVE_PREADWRITE 318#if !HAVE_PREADWRITE
241# define pread aio_pread 319# define pread aio_pread
242# define pwrite aio_pwrite 320# define pwrite aio_pwrite
… …
304 382
305 errno = 0; 383 errno = 0;
306} 384}
307#endif 385#endif
308 386
387/*****************************************************************************/
388
309static void * 389static void *
310aio_proc (void *thr_arg) 390aio_proc (void *thr_arg)
311{ 391{
312 aio_req req; 392 aio_req req;
313 int type; 393 int type;
… …
350 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 430 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
351 431
352 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 432 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
353 case REQ_CLOSE: req->result = close (req->fd); break; 433 case REQ_CLOSE: req->result = close (req->fd); break;
354 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 434 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
435 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
436 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
355 437
356 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 438 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
357 case REQ_FSYNC: req->result = fsync (req->fd); break; 439 case REQ_FSYNC: req->result = fsync (req->fd); break;
358 440
359 case REQ_QUIT: 441 case REQ_QUIT:
… …
388 while (type != REQ_QUIT); 470 while (type != REQ_QUIT);
389 471
390 return 0; 472 return 0;
391} 473}
392 474
475#define dREQ \
476 aio_req req; \
477 \
478 if (SvOK (callback) && !SvROK (callback)) \
479 croak ("clalback must be undef or of reference type"); \
480 \
481 Newz (0, req, 1, aio_cb); \
482 if (!req) \
483 croak ("out of memory during aio_req allocation"); \
484 \
485 req->callback = SvREFCNT_inc (callback);
486
393MODULE = IO::AIO PACKAGE = IO::AIO 487MODULE = IO::AIO PACKAGE = IO::AIO
394 488
395PROTOTYPES: ENABLE 489PROTOTYPES: ENABLE
396 490
397BOOT: 491BOOT:
… …
402 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 496 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
403 croak ("cannot set result pipe to nonblocking mode"); 497 croak ("cannot set result pipe to nonblocking mode");
404 498
405 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 499 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
406 croak ("cannot set result pipe to nonblocking mode"); 500 croak ("cannot set result pipe to nonblocking mode");
501
502 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
407} 503}
408 504
409void 505void
410min_parallel(nthreads) 506min_parallel(nthreads)
411 int nthreads 507 int nthreads
412 PROTOTYPE: $ 508 PROTOTYPE: $
413 CODE:
414 while (nthreads > started)
415 start_thread ();
416 509
417void 510void
418max_parallel(nthreads) 511max_parallel(nthreads)
419 int nthreads 512 int nthreads
420 PROTOTYPE: $ 513 PROTOTYPE: $
421 CODE:
422{
423 int cur = started;
424 while (cur > nthreads)
425 {
426 end_thread ();
427 cur--;
428 }
429
430 while (started > nthreads)
431 {
432 poll_wait ();
433 poll_cb ();
434 }
435}
436 514
437int 515int
438max_outstanding(nreqs) 516max_outstanding(nreqs)
439 int nreqs 517 int nreqs
440 PROTOTYPE: $ 518 PROTOTYPE: $
… …
449 int mode 527 int mode
450 SV * callback 528 SV * callback
451 PROTOTYPE: $$$;$ 529 PROTOTYPE: $$$;$
452 CODE: 530 CODE:
453{ 531{
454 aio_req req; 532 dREQ;
455
456 Newz (0, req, 1, aio_cb);
457
458 if (!req)
459 croak ("out of memory during aio_req allocation");
460 533
461 req->type = REQ_OPEN; 534 req->type = REQ_OPEN;
462 req->data = newSVsv (pathname); 535 req->data = newSVsv (pathname);
463 req->dataptr = SvPV_nolen (req->data); 536 req->dataptr = SvPVbyte_nolen (req->data);
464 req->fd = flags; 537 req->fd = flags;
465 req->mode = mode; 538 req->mode = mode;
466 req->callback = SvREFCNT_inc (callback);
467 539
468 send_req (req); 540 send_req (req);
469} 541}
470 542
471void 543void
… …
477 aio_close = REQ_CLOSE 549 aio_close = REQ_CLOSE
478 aio_fsync = REQ_FSYNC 550 aio_fsync = REQ_FSYNC
479 aio_fdatasync = REQ_FDATASYNC 551 aio_fdatasync = REQ_FDATASYNC
480 CODE: 552 CODE:
481{ 553{
482 aio_req req; 554 dREQ;
483
484 Newz (0, req, 1, aio_cb);
485
486 if (!req)
487 croak ("out of memory during aio_req allocation");
488 555
489 req->type = ix; 556 req->type = ix;
490 req->fh = newSVsv (fh); 557 req->fh = newSVsv (fh);
491 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 558 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
492 req->callback = SvREFCNT_inc (callback);
493 559
494 send_req (req); 560 send_req (req);
495} 561}
496 562
497void 563void
… …
508 PROTOTYPE: $$$$$;$ 574 PROTOTYPE: $$$$$;$
509 CODE: 575 CODE:
510{ 576{
511 aio_req req; 577 aio_req req;
512 STRLEN svlen; 578 STRLEN svlen;
513 char *svptr = SvPV (data, svlen); 579 char *svptr = SvPVbyte (data, svlen);
514 580
515 SvUPGRADE (data, SVt_PV); 581 SvUPGRADE (data, SVt_PV);
516 SvPOK_on (data); 582 SvPOK_on (data);
517 583
518 if (dataoffset < 0) 584 if (dataoffset < 0)
… …
534 } 600 }
535 601
536 if (length < 0) 602 if (length < 0)
537 croak ("length must not be negative"); 603 croak ("length must not be negative");
538 604
539 Newz (0, req, 1, aio_cb); 605 {
606 dREQ;
540 607
541 if (!req)
542 croak ("out of memory during aio_req allocation");
543
544 req->type = ix; 608 req->type = ix;
545 req->fh = newSVsv (fh); 609 req->fh = newSVsv (fh);
546 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 610 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
547 : IoOFP (sv_2io (fh))); 611 : IoOFP (sv_2io (fh)));
548 req->offset = offset; 612 req->offset = offset;
549 req->length = length; 613 req->length = length;
550 req->data = SvREFCNT_inc (data); 614 req->data = SvREFCNT_inc (data);
551 req->dataptr = (char *)svptr + dataoffset; 615 req->dataptr = (char *)svptr + dataoffset;
552 req->callback = SvREFCNT_inc (callback); 616 req->callback = SvREFCNT_inc (callback);
553 617
554 send_req (req); 618 send_req (req);
619 }
555} 620}
556 621
557void 622void
558aio_readahead(fh,offset,length,callback=&PL_sv_undef) 623aio_readahead(fh,offset,length,callback=&PL_sv_undef)
559 SV * fh 624 SV * fh
… …
561 IV length 626 IV length
562 SV * callback 627 SV * callback
563 PROTOTYPE: $$$;$ 628 PROTOTYPE: $$$;$
564 CODE: 629 CODE:
565{ 630{
566 aio_req req; 631 dREQ;
567
568 if (length < 0)
569 croak ("length must not be negative");
570
571 Newz (0, req, 1, aio_cb);
572
573 if (!req)
574 croak ("out of memory during aio_req allocation");
575 632
576 req->type = REQ_READAHEAD; 633 req->type = REQ_READAHEAD;
577 req->fh = newSVsv (fh); 634 req->fh = newSVsv (fh);
578 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 635 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
579 req->offset = offset; 636 req->offset = offset;
580 req->length = length; 637 req->length = length;
581 req->callback = SvREFCNT_inc (callback);
582 638
583 send_req (req); 639 send_req (req);
584} 640}
585 641
586void 642void
… …
590 ALIAS: 646 ALIAS:
591 aio_stat = REQ_STAT 647 aio_stat = REQ_STAT
592 aio_lstat = REQ_LSTAT 648 aio_lstat = REQ_LSTAT
593 CODE: 649 CODE:
594{ 650{
595 aio_req req; 651 dREQ;
596
597 Newz (0, req, 1, aio_cb);
598
599 if (!req)
600 croak ("out of memory during aio_req allocation");
601 652
602 New (0, req->statdata, 1, Stat_t); 653 New (0, req->statdata, 1, Stat_t);
603
604 if (!req->statdata) 654 if (!req->statdata)
605 croak ("out of memory during aio_req->statdata allocation"); 655 croak ("out of memory during aio_req->statdata allocation (sorry, i just leaked memory, too)");
606 656
607 if (SvPOK (fh_or_path)) 657 if (SvPOK (fh_or_path))
608 { 658 {
609 req->type = ix; 659 req->type = ix;
610 req->data = newSVsv (fh_or_path); 660 req->data = newSVsv (fh_or_path);
611 req->dataptr = SvPV_nolen (req->data); 661 req->dataptr = SvPVbyte_nolen (req->data);
612 } 662 }
613 else 663 else
614 { 664 {
615 req->type = REQ_FSTAT; 665 req->type = REQ_FSTAT;
616 req->fh = newSVsv (fh_or_path); 666 req->fh = newSVsv (fh_or_path);
617 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 667 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
618 } 668 }
619 669
620 req->callback = SvREFCNT_inc (callback);
621
622 send_req (req); 670 send_req (req);
623} 671}
624 672
625void 673void
626aio_unlink(pathname,callback=&PL_sv_undef) 674aio_unlink(pathname,callback=&PL_sv_undef)
627 SV * pathname 675 SV * pathname
628 SV * callback 676 SV * callback
677 ALIAS:
678 aio_unlink = REQ_UNLINK
679 aio_rmdir = REQ_RMDIR
629 CODE: 680 CODE:
630{ 681{
631 aio_req req; 682 dREQ;
632 683
633 Newz (0, req, 1, aio_cb); 684 req->type = ix;
685 req->data = newSVsv (pathname);
686 req->dataptr = SvPVbyte_nolen (req->data);
634 687
635 if (!req) 688 send_req (req);
636 croak ("out of memory during aio_req allocation"); 689}
690
691void
692aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
693 SV * oldpath
694 SV * newpath
695 SV * callback
696 CODE:
697{
698 dREQ;
637 699
638 req->type = REQ_UNLINK; 700 req->type = REQ_SYMLINK;
701 req->fh = newSVsv (oldpath);
702 req->data2ptr = SvPVbyte_nolen (req->fh);
639 req->data = newSVsv (pathname); 703 req->data = newSVsv (newpath);
640 req->dataptr = SvPV_nolen (req->data); 704 req->dataptr = SvPVbyte_nolen (req->data);
641 req->callback = SvREFCNT_inc (callback);
642 705
643 send_req (req); 706 send_req (req);
644} 707}
645 708
646void 709void

Diff Legend

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