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.26 by root, Wed Aug 17 03:52:20 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 */
72
73static void free_req (aio_req req)
74{
75 if (req->data)
76 SvREFCNT_dec (req->data);
77
78 if (req->fh)
79 SvREFCNT_dec (req->fh);
80
81 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
82 Safefree (req->statdata);
83
84 if (req->callback)
85 SvREFCNT_dec (req->callback);
86
87 Safefree (req);
88}
69 89
70static void 90static void
71poll_wait () 91poll_wait ()
72{ 92{
73 if (nreqs && !ress) 93 if (nreqs && !ress)
… …
83static int 103static int
84poll_cb () 104poll_cb ()
85{ 105{
86 dSP; 106 dSP;
87 int count = 0; 107 int count = 0;
108 int do_croak = 0;
88 aio_req req, prv; 109 aio_req req, prv;
89 110
90 pthread_mutex_lock (&reslock); 111 pthread_mutex_lock (&reslock);
91 112
92 { 113 {
93 /* read any signals sent by the worker threads */ 114 /* read any signals sent by the worker threads */
94 char buf [32]; 115 char buf [32];
95 while (read (respipe [0], buf, 32) > 0) 116 while (read (respipe [0], buf, 32) == 32)
96 ; 117 ;
97 } 118 }
98 119
99 req = ress; 120 req = ress;
100 ress = rese = 0; 121 ress = rese = 0;
… …
114 135
115 if (req->type == REQ_READ) 136 if (req->type == REQ_READ)
116 SvCUR_set (req->data, req->dataoffset 137 SvCUR_set (req->data, req->dataoffset
117 + req->result > 0 ? req->result : 0); 138 + req->result > 0 ? req->result : 0);
118 139
119 if (req->data)
120 SvREFCNT_dec (req->data);
121
122 if (req->fh)
123 SvREFCNT_dec (req->fh);
124
125 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) 140 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
126 { 141 {
127 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 142 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
128 PL_laststatval = req->result; 143 PL_laststatval = req->result;
129 PL_statcache = *(req->statdata); 144 PL_statcache = *(req->statdata);
130
131 Safefree (req->statdata);
132 } 145 }
133 146
134 ENTER; 147 ENTER;
135 PUSHMARK (SP); 148 PUSHMARK (SP);
136 XPUSHs (sv_2mortal (newSViv (req->result))); 149 XPUSHs (sv_2mortal (newSViv (req->result)));
… …
156 call_sv (req->callback, G_VOID | G_EVAL); 169 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 170 SPAGAIN;
158 } 171 }
159 172
160 LEAVE; 173 LEAVE;
174
175 do_croak = SvTRUE (ERRSV);
161 176
162 if (req->callback)
163 SvREFCNT_dec (req->callback);
164
165 errno = errorno; 177 errno = errorno;
166 count++; 178 count++;
167 } 179 }
168 180
169 prv = req; 181 prv = req;
170 req = req->next; 182 req = req->next;
171 Safefree (prv); 183 free_req (prv);
172 184
173 /* TODO: croak on errors? */ 185 if (do_croak)
186 croak (0);
174 } 187 }
175 188
176 return count; 189 return count;
177} 190}
178 191
… …
227 240
228static void 241static void
229end_thread (void) 242end_thread (void)
230{ 243{
231 aio_req req; 244 aio_req req;
232 New (0, req, 1, aio_cb); 245 Newz (0, req, 1, aio_cb);
233 req->type = REQ_QUIT; 246 req->type = REQ_QUIT;
234 247
235 send_req (req); 248 send_req (req);
236} 249}
237 250
251
252static void min_parallel (int nthreads)
253{
254 while (nthreads > started)
255 start_thread ();
256}
257
258static void max_parallel (int nthreads)
259{
260 int cur = started;
261 while (cur > nthreads)
262 {
263 end_thread ();
264 cur--;
265 }
266
267 while (started > nthreads)
268 {
269 poll_wait ();
270 poll_cb ();
271 }
272}
273
274static void create_pipe ()
275{
276 if (pipe (respipe))
277 croak ("unable to initialize result pipe");
278
279 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
280 croak ("cannot set result pipe to nonblocking mode");
281
282 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
283 croak ("cannot set result pipe to nonblocking mode");
284}
285
286static void atfork_prepare (void)
287{
288 pthread_mutex_lock (&frklock);
289 pthread_mutex_lock (&reqlock);
290 pthread_mutex_lock (&reslock);
291}
292
293static void atfork_parent (void)
294{
295 pthread_mutex_unlock (&reslock);
296 pthread_mutex_unlock (&reqlock);
297 pthread_mutex_unlock (&frklock);
298}
299
300static void atfork_child (void)
301{
302 int restart = started;
303 started = 0;
304
305 while (reqs)
306 {
307 free_req (reqs);
308 reqs = reqs->next;
309 }
310
311 reqs = reqe = 0;
312
313 while (ress)
314 {
315 free_req (ress);
316 ress = ress->next;
317 }
318
319 ress = rese = 0;
320
321 close (respipe [0]);
322 close (respipe [1]);
323
324 create_pipe ();
325
326 atfork_parent ();
327
328 min_parallel (restart);
329}
330
331/*****************************************************************************/
238/* work around various missing functions */ 332/* work around various missing functions */
239 333
240#if !HAVE_PREADWRITE 334#if !HAVE_PREADWRITE
241# define pread aio_pread 335# define pread aio_pread
242# define pwrite aio_pwrite 336# define pwrite aio_pwrite
… …
304 398
305 errno = 0; 399 errno = 0;
306} 400}
307#endif 401#endif
308 402
403/*****************************************************************************/
404
309static void * 405static void *
310aio_proc (void *thr_arg) 406aio_proc (void *thr_arg)
311{ 407{
312 aio_req req; 408 aio_req req;
313 int type; 409 int type;
… …
350 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 446 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
351 447
352 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 448 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
353 case REQ_CLOSE: req->result = close (req->fd); break; 449 case REQ_CLOSE: req->result = close (req->fd); break;
354 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 450 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
451 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
452 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
355 453
356 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 454 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
357 case REQ_FSYNC: req->result = fsync (req->fd); break; 455 case REQ_FSYNC: req->result = fsync (req->fd); break;
358 456
359 case REQ_QUIT: 457 case REQ_QUIT:
… …
388 while (type != REQ_QUIT); 486 while (type != REQ_QUIT);
389 487
390 return 0; 488 return 0;
391} 489}
392 490
491#define dREQ \
492 aio_req req; \
493 \
494 if (SvOK (callback) && !SvROK (callback)) \
495 croak ("clalback must be undef or of reference type"); \
496 \
497 Newz (0, req, 1, aio_cb); \
498 if (!req) \
499 croak ("out of memory during aio_req allocation"); \
500 \
501 req->callback = SvREFCNT_inc (callback);
502
393MODULE = IO::AIO PACKAGE = IO::AIO 503MODULE = IO::AIO PACKAGE = IO::AIO
394 504
395PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
396 506
397BOOT: 507BOOT:
398{ 508{
399 if (pipe (respipe)) 509 create_pipe ();
400 croak ("unable to initialize result pipe"); 510 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
401
402 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
403 croak ("cannot set result pipe to nonblocking mode");
404
405 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
406 croak ("cannot set result pipe to nonblocking mode");
407} 511}
408 512
409void 513void
410min_parallel(nthreads) 514min_parallel(nthreads)
411 int nthreads 515 int nthreads
412 PROTOTYPE: $ 516 PROTOTYPE: $
413 CODE:
414 while (nthreads > started)
415 start_thread ();
416 517
417void 518void
418max_parallel(nthreads) 519max_parallel(nthreads)
419 int nthreads 520 int nthreads
420 PROTOTYPE: $ 521 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 522
437int 523int
438max_outstanding(nreqs) 524max_outstanding(nreqs)
439 int nreqs 525 int nreqs
440 PROTOTYPE: $ 526 PROTOTYPE: $
… …
449 int mode 535 int mode
450 SV * callback 536 SV * callback
451 PROTOTYPE: $$$;$ 537 PROTOTYPE: $$$;$
452 CODE: 538 CODE:
453{ 539{
454 aio_req req; 540 dREQ;
455
456 Newz (0, req, 1, aio_cb);
457
458 if (!req)
459 croak ("out of memory during aio_req allocation");
460 541
461 req->type = REQ_OPEN; 542 req->type = REQ_OPEN;
462 req->data = newSVsv (pathname); 543 req->data = newSVsv (pathname);
463 req->dataptr = SvPV_nolen (req->data); 544 req->dataptr = SvPVbyte_nolen (req->data);
464 req->fd = flags; 545 req->fd = flags;
465 req->mode = mode; 546 req->mode = mode;
466 req->callback = SvREFCNT_inc (callback);
467 547
468 send_req (req); 548 send_req (req);
469} 549}
470 550
471void 551void
… …
477 aio_close = REQ_CLOSE 557 aio_close = REQ_CLOSE
478 aio_fsync = REQ_FSYNC 558 aio_fsync = REQ_FSYNC
479 aio_fdatasync = REQ_FDATASYNC 559 aio_fdatasync = REQ_FDATASYNC
480 CODE: 560 CODE:
481{ 561{
482 aio_req req; 562 dREQ;
483
484 Newz (0, req, 1, aio_cb);
485
486 if (!req)
487 croak ("out of memory during aio_req allocation");
488 563
489 req->type = ix; 564 req->type = ix;
490 req->fh = newSVsv (fh); 565 req->fh = newSVsv (fh);
491 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 566 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
492 req->callback = SvREFCNT_inc (callback);
493 567
494 send_req (req); 568 send_req (req);
495} 569}
496 570
497void 571void
… …
508 PROTOTYPE: $$$$$;$ 582 PROTOTYPE: $$$$$;$
509 CODE: 583 CODE:
510{ 584{
511 aio_req req; 585 aio_req req;
512 STRLEN svlen; 586 STRLEN svlen;
513 char *svptr = SvPV (data, svlen); 587 char *svptr = SvPVbyte (data, svlen);
514 588
515 SvUPGRADE (data, SVt_PV); 589 SvUPGRADE (data, SVt_PV);
516 SvPOK_on (data); 590 SvPOK_on (data);
517 591
518 if (dataoffset < 0) 592 if (dataoffset < 0)
… …
534 } 608 }
535 609
536 if (length < 0) 610 if (length < 0)
537 croak ("length must not be negative"); 611 croak ("length must not be negative");
538 612
539 Newz (0, req, 1, aio_cb); 613 {
614 dREQ;
540 615
541 if (!req)
542 croak ("out of memory during aio_req allocation");
543
544 req->type = ix; 616 req->type = ix;
545 req->fh = newSVsv (fh); 617 req->fh = newSVsv (fh);
546 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 618 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
547 : IoOFP (sv_2io (fh))); 619 : IoOFP (sv_2io (fh)));
548 req->offset = offset; 620 req->offset = offset;
549 req->length = length; 621 req->length = length;
550 req->data = SvREFCNT_inc (data); 622 req->data = SvREFCNT_inc (data);
551 req->dataptr = (char *)svptr + dataoffset; 623 req->dataptr = (char *)svptr + dataoffset;
552 req->callback = SvREFCNT_inc (callback); 624 req->callback = SvREFCNT_inc (callback);
553 625
554 send_req (req); 626 send_req (req);
627 }
555} 628}
556 629
557void 630void
558aio_readahead(fh,offset,length,callback=&PL_sv_undef) 631aio_readahead(fh,offset,length,callback=&PL_sv_undef)
559 SV * fh 632 SV * fh
… …
561 IV length 634 IV length
562 SV * callback 635 SV * callback
563 PROTOTYPE: $$$;$ 636 PROTOTYPE: $$$;$
564 CODE: 637 CODE:
565{ 638{
566 aio_req req; 639 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 640
576 req->type = REQ_READAHEAD; 641 req->type = REQ_READAHEAD;
577 req->fh = newSVsv (fh); 642 req->fh = newSVsv (fh);
578 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 643 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
579 req->offset = offset; 644 req->offset = offset;
580 req->length = length; 645 req->length = length;
581 req->callback = SvREFCNT_inc (callback);
582 646
583 send_req (req); 647 send_req (req);
584} 648}
585 649
586void 650void
… …
590 ALIAS: 654 ALIAS:
591 aio_stat = REQ_STAT 655 aio_stat = REQ_STAT
592 aio_lstat = REQ_LSTAT 656 aio_lstat = REQ_LSTAT
593 CODE: 657 CODE:
594{ 658{
595 aio_req req; 659 dREQ;
596
597 Newz (0, req, 1, aio_cb);
598
599 if (!req)
600 croak ("out of memory during aio_req allocation");
601 660
602 New (0, req->statdata, 1, Stat_t); 661 New (0, req->statdata, 1, Stat_t);
603
604 if (!req->statdata) 662 if (!req->statdata)
605 croak ("out of memory during aio_req->statdata allocation"); 663 croak ("out of memory during aio_req->statdata allocation (sorry, i just leaked memory, too)");
606 664
607 if (SvPOK (fh_or_path)) 665 if (SvPOK (fh_or_path))
608 { 666 {
609 req->type = ix; 667 req->type = ix;
610 req->data = newSVsv (fh_or_path); 668 req->data = newSVsv (fh_or_path);
611 req->dataptr = SvPV_nolen (req->data); 669 req->dataptr = SvPVbyte_nolen (req->data);
612 } 670 }
613 else 671 else
614 { 672 {
615 req->type = REQ_FSTAT; 673 req->type = REQ_FSTAT;
616 req->fh = newSVsv (fh_or_path); 674 req->fh = newSVsv (fh_or_path);
617 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 675 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
618 } 676 }
619 677
620 req->callback = SvREFCNT_inc (callback);
621
622 send_req (req); 678 send_req (req);
623} 679}
624 680
625void 681void
626aio_unlink(pathname,callback=&PL_sv_undef) 682aio_unlink(pathname,callback=&PL_sv_undef)
627 SV * pathname 683 SV * pathname
628 SV * callback 684 SV * callback
685 ALIAS:
686 aio_unlink = REQ_UNLINK
687 aio_rmdir = REQ_RMDIR
629 CODE: 688 CODE:
630{ 689{
631 aio_req req; 690 dREQ;
632 691
633 Newz (0, req, 1, aio_cb); 692 req->type = ix;
693 req->data = newSVsv (pathname);
694 req->dataptr = SvPVbyte_nolen (req->data);
634 695
635 if (!req) 696 send_req (req);
636 croak ("out of memory during aio_req allocation"); 697}
698
699void
700aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
701 SV * oldpath
702 SV * newpath
703 SV * callback
704 CODE:
705{
706 dREQ;
637 707
638 req->type = REQ_UNLINK; 708 req->type = REQ_SYMLINK;
709 req->fh = newSVsv (oldpath);
710 req->data2ptr = SvPVbyte_nolen (req->fh);
639 req->data = newSVsv (pathname); 711 req->data = newSVsv (newpath);
640 req->dataptr = SvPV_nolen (req->data); 712 req->dataptr = SvPVbyte_nolen (req->data);
641 req->callback = SvREFCNT_inc (callback);
642 713
643 send_req (req); 714 send_req (req);
644} 715}
645 716
646void 717void

Diff Legend

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