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.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.66 by root, Tue Oct 24 00:34:47 2006 UTC

1#if __linux
2# define _GNU_SOURCE
3#endif
4
1#define _REENTRANT 1 5#define _REENTRANT 1
6
2#include <errno.h> 7#include <errno.h>
3 8
4#include "EXTERN.h" 9#include "EXTERN.h"
5#include "perl.h" 10#include "perl.h"
6#include "XSUB.h" 11#include "XSUB.h"
… …
41# define NAME_MAX 4096 46# define NAME_MAX 4096
42#endif 47#endif
43 48
44#if __ia64 49#if __ia64
45# define STACKSIZE 65536 50# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN
46#else 53#else
47# define STACKSIZE 8192 54# define STACKSIZE 16384
48#endif 55#endif
56
57/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536
59
60#define dBUF \
61 char *aio_buf = malloc (AIO_BUFSIZE); \
62 if (!aio_buf) \
63 return -1;
64
65#define fBUF free (aio_buf)
49 66
50enum { 67enum {
51 REQ_QUIT, 68 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 69 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 70 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 72 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 73 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 75 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 76 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP,
60 REQ_SLEEP, 78 REQ_SLEEP,
61 REQ_GROUP,
62}; 79};
63 80
64#define AIO_REQ_KLASS "IO::AIO::REQ" 81#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 82#define AIO_GRP_KLASS "IO::AIO::GRP"
66 83
67typedef struct aio_cb 84typedef struct aio_cb
68{ 85{
69 struct aio_cb *grp, *grp_prev, *grp_next;
70
71 struct aio_cb *volatile next; 86 struct aio_cb *volatile next;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 87
75 SV *data, *callback; 88 SV *data, *callback;
76 SV *fh, *fh2; 89 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 90 void *dataptr, *data2ptr;
78 Stat_t *statdata; 91 Stat_t *statdata;
79 off_t offset; 92 off_t offset;
80 size_t length; 93 size_t length;
81 ssize_t result; 94 ssize_t result;
82 95
96 STRLEN dataoffset;
83 int type; 97 int type;
84 int fd, fd2; 98 int fd, fd2;
85 int errorno; 99 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 100 mode_t mode; /* open */
101
88 unsigned char cancelled; 102 unsigned char flags;
103 unsigned char pri;
104
105 SV *self; /* the perl counterpart of this request, if any */
106 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 107} aio_cb;
108
109enum {
110 FLAG_CANCELLED = 0x01,
111};
90 112
91typedef aio_cb *aio_req; 113typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 114typedef aio_cb *aio_req_ornot;
115
116enum {
117 PRI_MIN = -4,
118 PRI_MAX = 4,
119
120 DEFAULT_PRI = 0,
121 PRI_BIAS = -PRI_MIN,
122};
123
124static int next_pri = DEFAULT_PRI + PRI_BIAS;
93 125
94static int started, wanted; 126static int started, wanted;
95static volatile int nreqs; 127static volatile int nreqs;
96static int max_outstanding = 1<<30; 128static int max_outstanding = 1<<30;
97static int respipe [2]; 129static int respipe [2];
98 130
131#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133#else
134# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135#endif
136
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 137static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 138static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 139static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 140
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 141static volatile aio_req reqs, reqe; /* queue start, queue end */
104static volatile aio_req ress, rese; /* queue start, queue end */ 142static volatile aio_req ress, rese; /* queue start, queue end */
105 143
144static void req_invoke (aio_req req);
106static void req_free (aio_req req); 145static void req_free (aio_req req);
107 146
108/* must be called at most once */ 147/* must be called at most once */
109static SV *req_sv (aio_req req, const char *klass) 148static SV *req_sv (aio_req req, const char *klass)
110{ 149{
150 if (!req->self)
151 {
111 req->self = (SV *)newHV (); 152 req->self = (SV *)newHV ();
112 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 153 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
154 }
113 155
114 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 156 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
115} 157}
116 158
117static aio_req SvAIO_REQ (SV *sv) 159static aio_req SvAIO_REQ (SV *sv)
118{ 160{
161 MAGIC *mg;
162
119 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 163 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
120 croak ("object of class " AIO_REQ_KLASS " expected"); 164 croak ("object of class " AIO_REQ_KLASS " expected");
121 165
122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 166 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123 167
124 return mg ? (aio_req)mg->mg_ptr : 0; 168 return mg ? (aio_req)mg->mg_ptr : 0;
125} 169}
126 170
171static void aio_grp_feed (aio_req grp)
172{
173 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
174 {
175 int old_len = grp->length;
176
177 if (grp->fh2 && SvOK (grp->fh2))
178 {
179 dSP;
180
181 ENTER;
182 SAVETMPS;
183 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK;
186 call_sv (grp->fh2, G_VOID | G_EVAL);
187 SPAGAIN;
188 FREETMPS;
189 LEAVE;
190 }
191
192 /* stop if no progress has been made */
193 if (old_len == grp->length)
194 {
195 SvREFCNT_dec (grp->fh2);
196 grp->fh2 = 0;
197 break;
198 }
199 }
200}
201
202static void aio_grp_dec (aio_req grp)
203{
204 --grp->length;
205
206 /* call feeder, if applicable */
207 aio_grp_feed (grp);
208
209 /* finish, if done */
210 if (!grp->length && grp->fd)
211 {
212 req_invoke (grp);
213 req_free (grp);
214 }
215}
216
127static void poll_wait () 217static void poll_wait ()
128{ 218{
129 if (nreqs && !ress)
130 {
131 fd_set rfd; 219 fd_set rfd;
220
221 while (nreqs)
222 {
223 aio_req req;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
225 pthread_mutex_lock (&reslock);
226#endif
227 req = ress;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
229 pthread_mutex_unlock (&reslock);
230#endif
231
232 if (req)
233 return;
234
132 FD_ZERO(&rfd); 235 FD_ZERO(&rfd);
133 FD_SET(respipe [0], &rfd); 236 FD_SET(respipe [0], &rfd);
134 237
135 select (respipe [0] + 1, &rfd, 0, 0, 0); 238 select (respipe [0] + 1, &rfd, 0, 0, 0);
136 } 239 }
… …
139static void req_invoke (aio_req req) 242static void req_invoke (aio_req req)
140{ 243{
141 dSP; 244 dSP;
142 int errorno = errno; 245 int errorno = errno;
143 246
144 if (req->cancelled || !SvOK (req->callback)) 247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
145 return; 248 return;
146 249
147 errno = req->errorno; 250 errno = req->errorno;
148 251
149 ENTER; 252 ENTER;
253 SAVETMPS;
150 PUSHMARK (SP); 254 PUSHMARK (SP);
151 EXTEND (SP, 1); 255 EXTEND (SP, 1);
152 256
153 switch (req->type) 257 switch (req->type)
154 { 258 {
… …
193 XPUSHs (sv_2mortal (fh)); 297 XPUSHs (sv_2mortal (fh));
194 } 298 }
195 break; 299 break;
196 300
197 case REQ_GROUP: 301 case REQ_GROUP:
302 req->fd = 2; /* mark group as finished */
303
198 if (req->data) 304 if (req->data)
199 { 305 {
200 int i; 306 int i;
201 AV *av = (AV *)req->data; 307 AV *av = (AV *)req->data;
202 308
… …
204 for (i = 0; i <= AvFILL (av); ++i) 310 for (i = 0; i <= AvFILL (av); ++i)
205 PUSHs (*av_fetch (av, i, 0)); 311 PUSHs (*av_fetch (av, i, 0));
206 } 312 }
207 break; 313 break;
208 314
315 case REQ_NOP:
209 case REQ_SLEEP: 316 case REQ_SLEEP:
210 break; 317 break;
211 318
212 default: 319 default:
213 PUSHs (sv_2mortal (newSViv (req->result))); 320 PUSHs (sv_2mortal (newSViv (req->result)));
… …
217 324
218 PUTBACK; 325 PUTBACK;
219 call_sv (req->callback, G_VOID | G_EVAL); 326 call_sv (req->callback, G_VOID | G_EVAL);
220 SPAGAIN; 327 SPAGAIN;
221 328
329 FREETMPS;
330 LEAVE;
331
332 errno = errorno;
333
222 if (SvTRUE (ERRSV)) 334 if (SvTRUE (ERRSV))
223 { 335 {
224 req_free (req); 336 req_free (req);
225 croak (0); 337 croak (0);
226 } 338 }
227
228 LEAVE;
229
230 errno = errorno;
231} 339}
232 340
233static void req_free (aio_req req) 341static void req_free (aio_req req)
234{ 342{
235 if (req->grp) 343 if (req->grp)
236 { 344 {
237 aio_req grp = req->grp; 345 aio_req grp = req->grp;
238 346
239 /* unlink request */ 347 /* unlink request */
240 req->grp_next->grp_prev = req->grp_prev; 348 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
241 req->grp_prev->grp_next = req->grp_next; 349 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
242 350
243 if (grp->grp_next == grp && grp->fd) 351 if (grp->grp_first == req)
244 { 352 grp->grp_first = req->grp_next;
245 req_invoke (grp); 353
246 req_free (grp); 354 aio_grp_dec (grp);
247 }
248 } 355 }
249 356
250 if (req->self) 357 if (req->self)
251 { 358 {
252 sv_unmagic (req->self, PERL_MAGIC_ext); 359 sv_unmagic (req->self, PERL_MAGIC_ext);
253 SvREFCNT_dec (req->self); 360 SvREFCNT_dec (req->self);
254 } 361 }
255 362
256 if (req->data)
257 SvREFCNT_dec (req->data); 363 SvREFCNT_dec (req->data);
258
259 if (req->fh)
260 SvREFCNT_dec (req->fh); 364 SvREFCNT_dec (req->fh);
261
262 if (req->fh2)
263 SvREFCNT_dec (req->fh2); 365 SvREFCNT_dec (req->fh2);
264
265 if (req->statdata)
266 Safefree (req->statdata);
267
268 if (req->callback)
269 SvREFCNT_dec (req->callback); 366 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata);
270 368
271 if (req->type == REQ_READDIR && req->result >= 0) 369 if (req->type == REQ_READDIR && req->result >= 0)
272 free (req->data2ptr); 370 free (req->data2ptr);
273 371
274 Safefree (req); 372 Safefree (req);
275} 373}
276 374
277static void req_cancel (aio_req req) 375static void req_cancel (aio_req req)
278{ 376{
279 req->cancelled = 1; 377 req->flags |= FLAG_CANCELLED;
280 378
281 if (req->type == REQ_GROUP) 379 if (req->type == REQ_GROUP)
282 { 380 {
283 aio_req sub; 381 aio_req sub;
284 382
285 for (sub = req->grp_next; sub != req; sub = sub->grp_next) 383 for (sub = req->grp_first; sub; sub = sub->grp_next)
286 req_cancel (sub); 384 req_cancel (sub);
287 } 385 }
288} 386}
289 387
290static int poll_cb () 388static int poll_cb ()
… …
317 pthread_mutex_unlock (&reslock); 415 pthread_mutex_unlock (&reslock);
318 416
319 if (!req) 417 if (!req)
320 break; 418 break;
321 419
322 nreqs--; 420 --nreqs;
323 421
324 if (req->type == REQ_QUIT) 422 if (req->type == REQ_QUIT)
325 started--; 423 started--;
326 else if (req->type == REQ_GROUP && req->grp_next != req) 424 else if (req->type == REQ_GROUP && req->length)
327 { 425 {
328 req->fd = 1; /* mark request as delayed */ 426 req->fd = 1; /* mark request as delayed */
329 continue; 427 continue;
330 } 428 }
331 else 429 else
… …
378static void req_send (aio_req req) 476static void req_send (aio_req req)
379{ 477{
380 while (started < wanted && nreqs >= started) 478 while (started < wanted && nreqs >= started)
381 start_thread (); 479 start_thread ();
382 480
383 nreqs++; 481 ++nreqs;
384 482
385 pthread_mutex_lock (&reqlock); 483 pthread_mutex_lock (&reqlock);
386 484
387 req->next = 0; 485 req->next = 0;
388 486
… …
508#if !HAVE_READAHEAD 606#if !HAVE_READAHEAD
509# define readahead aio_readahead 607# define readahead aio_readahead
510 608
511static ssize_t readahead (int fd, off_t offset, size_t count) 609static ssize_t readahead (int fd, off_t offset, size_t count)
512{ 610{
513 char readahead_buf[4096]; 611 dBUF;
514 612
515 while (count > 0) 613 while (count > 0)
516 { 614 {
517 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 615 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
518 616
519 pread (fd, readahead_buf, len, offset); 617 pread (fd, aio_buf, len, offset);
520 offset += len; 618 offset += len;
521 count -= len; 619 count -= len;
522 } 620 }
621
622 fBUF;
523 623
524 errno = 0; 624 errno = 0;
525} 625}
526#endif 626#endif
527 627
… …
613#endif 713#endif
614 ) 714 )
615 ) 715 )
616 { 716 {
617 /* emulate sendfile. this is a major pain in the ass */ 717 /* emulate sendfile. this is a major pain in the ass */
618 char buf[4096]; 718 dBUF;
719
619 res = 0; 720 res = 0;
620 721
621 while (count) 722 while (count)
622 { 723 {
623 ssize_t cnt; 724 ssize_t cnt;
624 725
625 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 726 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
626 727
627 if (cnt <= 0) 728 if (cnt <= 0)
628 { 729 {
629 if (cnt && !res) res = -1; 730 if (cnt && !res) res = -1;
630 break; 731 break;
631 } 732 }
632 733
633 cnt = write (ofd, buf, cnt); 734 cnt = write (ofd, aio_buf, cnt);
634 735
635 if (cnt <= 0) 736 if (cnt <= 0)
636 { 737 {
637 if (cnt && !res) res = -1; 738 if (cnt && !res) res = -1;
638 break; 739 break;
… …
640 741
641 offset += cnt; 742 offset += cnt;
642 res += cnt; 743 res += cnt;
643 count -= cnt; 744 count -= cnt;
644 } 745 }
746
747 fBUF;
645 } 748 }
646 749
647 return res; 750 return res;
648} 751}
649 752
650/* read a full directory */ 753/* read a full directory */
651static int scandir_ (const char *path, void **namesp) 754static int scandir_ (const char *path, void **namesp)
652{ 755{
653 DIR *dirp = opendir (path); 756 DIR *dirp;
654 union 757 union
655 { 758 {
656 struct dirent d; 759 struct dirent d;
657 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 760 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
658 } u; 761 } *u;
659 struct dirent *entp; 762 struct dirent *entp;
660 char *name, *names; 763 char *name, *names;
661 int memlen = 4096; 764 int memlen = 4096;
662 int memofs = 0; 765 int memofs = 0;
663 int res = 0; 766 int res = 0;
664 int errorno; 767 int errorno;
665 768
769 dirp = opendir (path);
666 if (!dirp) 770 if (!dirp)
667 return -1; 771 return -1;
668 772
773 u = malloc (sizeof (*u));
669 names = malloc (memlen); 774 names = malloc (memlen);
670 775
776 if (u && names)
671 for (;;) 777 for (;;)
672 { 778 {
779 errno = 0;
673 errno = 0, readdir_r (dirp, &u.d, &entp); 780 readdir_r (dirp, &u->d, &entp);
674 781
675 if (!entp) 782 if (!entp)
676 break; 783 break;
677 784
678 name = entp->d_name; 785 name = entp->d_name;
679 786
680 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 787 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
681 { 788 {
682 int len = strlen (name) + 1; 789 int len = strlen (name) + 1;
683 790
684 res++; 791 res++;
685 792
686 while (memofs + len > memlen) 793 while (memofs + len > memlen)
687 { 794 {
688 memlen *= 2; 795 memlen *= 2;
689 names = realloc (names, memlen); 796 names = realloc (names, memlen);
690 if (!names) 797 if (!names)
691 break; 798 break;
692 } 799 }
693 800
694 memcpy (names + memofs, name, len); 801 memcpy (names + memofs, name, len);
695 memofs += len; 802 memofs += len;
696 } 803 }
697 } 804 }
698 805
699 errorno = errno; 806 errorno = errno;
807 free (u);
700 closedir (dirp); 808 closedir (dirp);
701 809
702 if (errorno) 810 if (errorno)
703 { 811 {
704 free (names); 812 free (names);
… …
738 } 846 }
739 847
740 pthread_mutex_unlock (&reqlock); 848 pthread_mutex_unlock (&reqlock);
741 849
742 errno = 0; /* strictly unnecessary */ 850 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */
743 852
744 if (!req->cancelled) 853 if (!(req->flags & FLAG_CANCELLED))
745 switch (req->type) 854 switch (type)
746 { 855 {
747 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 856 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
748 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 857 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
749 858
750 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 859 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
… …
774 tv.tv_usec = req->fd2; 883 tv.tv_usec = req->fd2;
775 884
776 req->result = select (0, 0, 0, 0, &tv); 885 req->result = select (0, 0, 0, 0, &tv);
777 } 886 }
778 887
888 case REQ_GROUP:
889 case REQ_NOP:
779 case REQ_QUIT: 890 case REQ_QUIT:
780 break; 891 break;
781 892
782 default: 893 default:
783 req->result = ENOSYS; 894 req->result = ENOSYS;
… …
867 atfork_parent (); 978 atfork_parent ();
868} 979}
869 980
870#define dREQ \ 981#define dREQ \
871 aio_req req; \ 982 aio_req req; \
983 int req_pri = next_pri; \
984 next_pri = DEFAULT_PRI + PRI_BIAS; \
872 \ 985 \
873 if (SvOK (callback) && !SvROK (callback)) \ 986 if (SvOK (callback) && !SvROK (callback)) \
874 croak ("callback must be undef or of reference type"); \ 987 croak ("callback must be undef or of reference type"); \
875 \ 988 \
876 Newz (0, req, 1, aio_cb); \ 989 Newz (0, req, 1, aio_cb); \
877 if (!req) \ 990 if (!req) \
878 croak ("out of memory during aio_req allocation"); \ 991 croak ("out of memory during aio_req allocation"); \
879 \ 992 \
880 req->callback = newSVsv (callback) 993 req->callback = newSVsv (callback); \
994 req->pri = req_pri
881 995
882#define REQ_SEND \ 996#define REQ_SEND \
883 req_send (req); \ 997 req_send (req); \
884 \ 998 \
885 if (GIMME_V != G_VOID) \ 999 if (GIMME_V != G_VOID) \
… …
1160 SV * callback 1274 SV * callback
1161 PROTOTYPE: ;$ 1275 PROTOTYPE: ;$
1162 PPCODE: 1276 PPCODE:
1163{ 1277{
1164 dREQ; 1278 dREQ;
1279
1165 req->type = REQ_GROUP; 1280 req->type = REQ_GROUP;
1166 req->grp_next = req;
1167 req->grp_prev = req;
1168
1169 req_send (req); 1281 req_send (req);
1282
1170 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1283 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1171} 1284}
1285
1286void
1287aio_nop (callback=&PL_sv_undef)
1288 SV * callback
1289 PPCODE:
1290{
1291 dREQ;
1292
1293 req->type = REQ_NOP;
1294
1295 REQ_SEND;
1296}
1297
1298#if 0
1299
1300void
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE:
1303 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS;
1306
1307#endif
1172 1308
1173void 1309void
1174flush () 1310flush ()
1175 PROTOTYPE: 1311 PROTOTYPE:
1176 CODE: 1312 CODE:
… …
1225 1361
1226MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1227 1363
1228void 1364void
1229cancel (aio_req_ornot req) 1365cancel (aio_req_ornot req)
1230 PROTOTYPE:
1231 CODE: 1366 CODE:
1232 req_cancel (req); 1367 req_cancel (req);
1233 1368
1369void
1370cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1371 CODE:
1372 SvREFCNT_dec (req->callback);
1373 req->callback = newSVsv (callback);
1374
1234MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1375MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1235 1376
1236void 1377void
1237add (aio_req grp, ...) 1378add (aio_req grp, ...)
1238 PPCODE: 1379 PPCODE:
1239{ 1380{
1240 int i; 1381 int i;
1382 aio_req req;
1383
1384 if (grp->fd == 2)
1385 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1241 1386
1242 for (i = 1; i < items; ++i ) 1387 for (i = 1; i < items; ++i )
1243 { 1388 {
1244 if (GIMME_V != G_VOID) 1389 if (GIMME_V != G_VOID)
1245 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1390 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1246 1391
1247 aio_req req = SvAIO_REQ (ST (i)); 1392 req = SvAIO_REQ (ST (i));
1248 1393
1249 if (req) 1394 if (req)
1250 { 1395 {
1251 req->grp_prev = grp; 1396 ++grp->length;
1252 req->grp_next = grp->grp_next;
1253 grp->grp_next->grp_prev = req;
1254 grp->grp_next = req;
1255
1256 req->grp = grp; 1397 req->grp = grp;
1398
1399 req->grp_prev = 0;
1400 req->grp_next = grp->grp_first;
1401
1402 if (grp->grp_first)
1403 grp->grp_first->grp_prev = req;
1404
1405 grp->grp_first = req;
1257 } 1406 }
1258 } 1407 }
1259} 1408}
1260 1409
1261void 1410void
1262result (aio_req grp, ...) 1411result (aio_req grp, ...)
1412 CODE:
1413{
1414 int i;
1415 AV *av = newAV ();
1416
1417 for (i = 1; i < items; ++i )
1418 av_push (av, newSVsv (ST (i)));
1419
1420 SvREFCNT_dec (grp->data);
1421 grp->data = (SV *)av;
1422}
1423
1424void
1425feed_limit (aio_req grp, int limit)
1263 CODE: 1426 CODE:
1264{ 1427 grp->fd2 = limit;
1265 int i; 1428 aio_grp_feed (grp);
1266 AV *av = newAV ();
1267 1429
1268 if (grp->data) 1430void
1431feed (aio_req grp, SV *callback=&PL_sv_undef)
1432 CODE:
1433{
1269 SvREFCNT_dec (grp->data); 1434 SvREFCNT_dec (grp->fh2);
1435 grp->fh2 = newSVsv (callback);
1270 1436
1271 for (i = 1; i < items; ++i ) 1437 if (grp->fd2 <= 0)
1272 av_push (av, newSVsv (ST (i))); 1438 grp->fd2 = 2;
1273 1439
1274 grp->data = (SV *)av; 1440 aio_grp_feed (grp);
1275} 1441}
1276 1442

Diff Legend

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