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

Diff Legend

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