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.19 by root, Sun Jul 31 19:04:45 2005 UTC vs.
Revision 1.30 by root, Thu Aug 18 16:32:10 2005 UTC

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

Diff Legend

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