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

Diff Legend

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