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.18 by root, Sun Jul 31 19:00:31 2005 UTC vs.
Revision 1.28 by root, Wed Aug 17 05:06:59 2005 UTC

1#define _REENTRANT 1
2#include <errno.h>
3
1#include "EXTERN.h" 4#include "EXTERN.h"
2#include "perl.h" 5#include "perl.h"
3#include "XSUB.h" 6#include "XSUB.h"
4 7
5#include "autoconf/config.h" 8#include "autoconf/config.h"
… …
9 12
10#include <unistd.h> 13#include <unistd.h>
11#include <fcntl.h> 14#include <fcntl.h>
12#include <signal.h> 15#include <signal.h>
13#include <sched.h> 16#include <sched.h>
14
15#ifndef _REENTRANT
16# define _REENTRANT 1
17#endif
18#include <errno.h>
19 17
20#include <pthread.h> 18#include <pthread.h>
21 19
22typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
23typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
… …
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
… …
66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = 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
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}
71 88
72static void 89static void
73poll_wait () 90poll_wait ()
74{ 91{
75 if (nreqs && !ress) 92 if (nreqs && !ress)
… …
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
92 pthread_mutex_lock (&reslock); 110 for (;;)
93
94 {
95 /* read any signals sent by the worker threads */
96 char buf [32];
97 while (read (respipe [0], buf, 32) > 0)
98 ;
99 }
100
101 req = ress;
102 ress = rese = 0;
103
104 pthread_mutex_unlock (&reslock);
105
106 while (req)
107 { 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
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
… …
218 reqe = reqs = req; 238 reqe = reqs = req;
219 239
220 pthread_cond_signal (&reqwait); 240 pthread_cond_signal (&reqwait);
221 pthread_mutex_unlock (&reqlock); 241 pthread_mutex_unlock (&reqlock);
222 242
223 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)
224 { 282 {
225 poll_wait (); 283 poll_wait ();
226 poll_cb (); 284 poll_cb ();
227 } 285 }
228} 286}
229 287
230static void 288static void create_pipe ()
231end_thread (void)
232{ 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{
233 aio_req req; 314 aio_req prv;
234 New (0, req, 1, aio_cb);
235 req->type = REQ_QUIT;
236 315
237 send_req (req); 316 int restart = started;
238} 317 started = 0;
239 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 atfork_parent ();
338
339 min_parallel (restart);
340}
341
342/*****************************************************************************/
240/* work around various missing functions */ 343/* work around various missing functions */
241 344
242#if !HAVE_PREADWRITE 345#if !HAVE_PREADWRITE
243# define pread aio_pread 346# define pread aio_pread
244# define pwrite aio_pwrite 347# define pwrite aio_pwrite
… …
306 409
307 errno = 0; 410 errno = 0;
308} 411}
309#endif 412#endif
310 413
414/*****************************************************************************/
415
311static void * 416static void *
312aio_proc (void *thr_arg) 417aio_proc (void *thr_arg)
313{ 418{
314 aio_req req; 419 aio_req req;
315 int type; 420 int type;
… …
352 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 457 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
353 458
354 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 459 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
355 case REQ_CLOSE: req->result = close (req->fd); break; 460 case REQ_CLOSE: req->result = close (req->fd); break;
356 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 461 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
462 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
463 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
357 464
358 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 465 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
359 case REQ_FSYNC: req->result = fsync (req->fd); break; 466 case REQ_FSYNC: req->result = fsync (req->fd); break;
360 467
361 case REQ_QUIT: 468 case REQ_QUIT:
… …
390 while (type != REQ_QUIT); 497 while (type != REQ_QUIT);
391 498
392 return 0; 499 return 0;
393} 500}
394 501
502#define dREQ \
503 aio_req req; \
504 \
505 if (SvOK (callback) && !SvROK (callback)) \
506 croak ("clalback must be undef or of reference type"); \
507 \
508 Newz (0, req, 1, aio_cb); \
509 if (!req) \
510 croak ("out of memory during aio_req allocation"); \
511 \
512 req->callback = newSVsv (callback);
513
395MODULE = IO::AIO PACKAGE = IO::AIO 514MODULE = IO::AIO PACKAGE = IO::AIO
396 515
397PROTOTYPES: ENABLE 516PROTOTYPES: ENABLE
398 517
399BOOT: 518BOOT:
400{ 519{
401 if (pipe (respipe)) 520 create_pipe ();
402 croak ("unable to initialize result pipe"); 521 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} 522}
410 523
411void 524void
412min_parallel(nthreads) 525min_parallel(nthreads)
413 int nthreads 526 int nthreads
414 PROTOTYPE: $ 527 PROTOTYPE: $
415 CODE:
416 while (nthreads > started)
417 start_thread ();
418 528
419void 529void
420max_parallel(nthreads) 530max_parallel(nthreads)
421 int nthreads 531 int nthreads
422 PROTOTYPE: $ 532 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 533
439int 534int
440max_outstanding(nreqs) 535max_outstanding(nreqs)
441 int nreqs 536 int nreqs
442 PROTOTYPE: $ 537 PROTOTYPE: $
… …
451 int mode 546 int mode
452 SV * callback 547 SV * callback
453 PROTOTYPE: $$$;$ 548 PROTOTYPE: $$$;$
454 CODE: 549 CODE:
455{ 550{
456 aio_req req; 551 dREQ;
457
458 Newz (0, req, 1, aio_cb);
459
460 if (!req)
461 croak ("out of memory during aio_req allocation");
462 552
463 req->type = REQ_OPEN; 553 req->type = REQ_OPEN;
464 req->data = newSVsv (pathname); 554 req->data = newSVsv (pathname);
465 req->dataptr = SvPV_nolen (req->data); 555 req->dataptr = SvPVbyte_nolen (req->data);
466 req->fd = flags; 556 req->fd = flags;
467 req->mode = mode; 557 req->mode = mode;
468 req->callback = SvREFCNT_inc (callback);
469 558
470 send_req (req); 559 send_req (req);
471} 560}
472 561
473void 562void
… …
479 aio_close = REQ_CLOSE 568 aio_close = REQ_CLOSE
480 aio_fsync = REQ_FSYNC 569 aio_fsync = REQ_FSYNC
481 aio_fdatasync = REQ_FDATASYNC 570 aio_fdatasync = REQ_FDATASYNC
482 CODE: 571 CODE:
483{ 572{
484 aio_req req; 573 dREQ;
485
486 Newz (0, req, 1, aio_cb);
487
488 if (!req)
489 croak ("out of memory during aio_req allocation");
490 574
491 req->type = ix; 575 req->type = ix;
492 req->fh = newSVsv (fh); 576 req->fh = newSVsv (fh);
493 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 577 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
494 req->callback = SvREFCNT_inc (callback);
495 578
496 send_req (req); 579 send_req (req);
497} 580}
498 581
499void 582void
… …
510 PROTOTYPE: $$$$$;$ 593 PROTOTYPE: $$$$$;$
511 CODE: 594 CODE:
512{ 595{
513 aio_req req; 596 aio_req req;
514 STRLEN svlen; 597 STRLEN svlen;
515 char *svptr = SvPV (data, svlen); 598 char *svptr = SvPVbyte (data, svlen);
516 599
517 SvUPGRADE (data, SVt_PV); 600 SvUPGRADE (data, SVt_PV);
518 SvPOK_on (data); 601 SvPOK_on (data);
519 602
520 if (dataoffset < 0) 603 if (dataoffset < 0)
… …
536 } 619 }
537 620
538 if (length < 0) 621 if (length < 0)
539 croak ("length must not be negative"); 622 croak ("length must not be negative");
540 623
541 Newz (0, req, 1, aio_cb); 624 {
625 dREQ;
542 626
543 if (!req)
544 croak ("out of memory during aio_req allocation");
545
546 req->type = ix; 627 req->type = ix;
547 req->fh = newSVsv (fh); 628 req->fh = newSVsv (fh);
548 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 629 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
549 : IoOFP (sv_2io (fh))); 630 : IoOFP (sv_2io (fh)));
550 req->offset = offset; 631 req->offset = offset;
551 req->length = length; 632 req->length = length;
552 req->data = SvREFCNT_inc (data); 633 req->data = SvREFCNT_inc (data);
553 req->dataptr = (char *)svptr + dataoffset; 634 req->dataptr = (char *)svptr + dataoffset;
554 req->callback = SvREFCNT_inc (callback);
555 635
636 if (!SvREADONLY (data))
637 {
638 SvREADONLY_on (data);
639 req->data2ptr = (void *)data;
640 }
641
556 send_req (req); 642 send_req (req);
643 }
557} 644}
558 645
559void 646void
560aio_readahead(fh,offset,length,callback=&PL_sv_undef) 647aio_readahead(fh,offset,length,callback=&PL_sv_undef)
561 SV * fh 648 SV * fh
… …
563 IV length 650 IV length
564 SV * callback 651 SV * callback
565 PROTOTYPE: $$$;$ 652 PROTOTYPE: $$$;$
566 CODE: 653 CODE:
567{ 654{
568 aio_req req; 655 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 656
578 req->type = REQ_READAHEAD; 657 req->type = REQ_READAHEAD;
579 req->fh = newSVsv (fh); 658 req->fh = newSVsv (fh);
580 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 659 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
581 req->offset = offset; 660 req->offset = offset;
582 req->length = length; 661 req->length = length;
583 req->callback = SvREFCNT_inc (callback);
584 662
585 send_req (req); 663 send_req (req);
586} 664}
587 665
588void 666void
… …
592 ALIAS: 670 ALIAS:
593 aio_stat = REQ_STAT 671 aio_stat = REQ_STAT
594 aio_lstat = REQ_LSTAT 672 aio_lstat = REQ_LSTAT
595 CODE: 673 CODE:
596{ 674{
597 aio_req req; 675 dREQ;
598
599 Newz (0, req, 1, aio_cb);
600
601 if (!req)
602 croak ("out of memory during aio_req allocation");
603 676
604 New (0, req->statdata, 1, Stat_t); 677 New (0, req->statdata, 1, Stat_t);
605
606 if (!req->statdata) 678 if (!req->statdata)
679 {
680 free_req (req);
607 croak ("out of memory during aio_req->statdata allocation"); 681 croak ("out of memory during aio_req->statdata allocation");
682 }
608 683
609 if (SvPOK (fh_or_path)) 684 if (SvPOK (fh_or_path))
610 { 685 {
611 req->type = ix; 686 req->type = ix;
612 req->data = newSVsv (fh_or_path); 687 req->data = newSVsv (fh_or_path);
613 req->dataptr = SvPV_nolen (req->data); 688 req->dataptr = SvPVbyte_nolen (req->data);
614 } 689 }
615 else 690 else
616 { 691 {
617 req->type = REQ_FSTAT; 692 req->type = REQ_FSTAT;
618 req->fh = newSVsv (fh_or_path); 693 req->fh = newSVsv (fh_or_path);
619 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 694 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
620 } 695 }
621 696
622 req->callback = SvREFCNT_inc (callback);
623
624 send_req (req); 697 send_req (req);
625} 698}
626 699
627void 700void
628aio_unlink(pathname,callback=&PL_sv_undef) 701aio_unlink(pathname,callback=&PL_sv_undef)
629 SV * pathname 702 SV * pathname
630 SV * callback 703 SV * callback
704 ALIAS:
705 aio_unlink = REQ_UNLINK
706 aio_rmdir = REQ_RMDIR
631 CODE: 707 CODE:
632{ 708{
633 aio_req req; 709 dREQ;
634 710
635 Newz (0, req, 1, aio_cb); 711 req->type = ix;
712 req->data = newSVsv (pathname);
713 req->dataptr = SvPVbyte_nolen (req->data);
636 714
637 if (!req) 715 send_req (req);
638 croak ("out of memory during aio_req allocation"); 716}
717
718void
719aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
720 SV * oldpath
721 SV * newpath
722 SV * callback
723 CODE:
724{
725 dREQ;
639 726
640 req->type = REQ_UNLINK; 727 req->type = REQ_SYMLINK;
728 req->fh = newSVsv (oldpath);
729 req->data2ptr = SvPVbyte_nolen (req->fh);
641 req->data = newSVsv (pathname); 730 req->data = newSVsv (newpath);
642 req->dataptr = SvPV_nolen (req->data); 731 req->dataptr = SvPVbyte_nolen (req->data);
643 req->callback = SvREFCNT_inc (callback);
644 732
645 send_req (req); 733 send_req (req);
646} 734}
647 735
648void 736void

Diff Legend

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