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.112 by root, Tue Apr 1 19:40:47 2008 UTC vs.
Revision 1.124 by root, Thu May 29 03:20:40 2008 UTC

1#include "xthread.h" 1#include "libeio/xthread.h"
2 2
3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
13#include <sys/stat.h> 13#include <sys/stat.h>
14#include <limits.h> 14#include <limits.h>
15#include <fcntl.h> 15#include <fcntl.h>
16#include <sched.h> 16#include <sched.h>
17 17
18/* perl namespace pollution */
19#undef VERSION
20
18#ifdef _WIN32 21#ifdef _WIN32
19 22
20# define SIGIO 0 23# define EIO_STRUCT_DIRENT Direntry_t
21 typedef Direntry_t X_DIRENT;
22#undef malloc 24# undef malloc
23#undef free 25# undef free
24 26
25// perl overrides all those nice win32 functions 27// perl overrides all those nice win32 functions
26# undef open 28# undef open
27# undef read 29# undef read
28# undef write 30# undef write
54# define closedir(fd) (errno = ENOSYS, -1) 56# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a) 57# define mkdir(a,b) mkdir (a)
56 58
57#else 59#else
58 60
59# include "autoconf/config.h"
60# include <sys/time.h> 61# include <sys/time.h>
61# include <sys/select.h> 62# include <sys/select.h>
62# include <unistd.h> 63# include <unistd.h>
63# include <utime.h> 64# include <utime.h>
64# include <signal.h> 65# include <signal.h>
65 typedef struct dirent X_DIRENT; 66# define EIO_STRUCT_DIRENT struct dirent
66 67
67#endif 68#endif
68 69
69#if HAVE_SENDFILE 70#define EIO_STRUCT_STAT Stat_t
70# if __linux
71# include <sys/sendfile.h>
72# elif __freebsd
73# include <sys/socket.h>
74# include <sys/uio.h>
75# elif __hpux
76# include <sys/socket.h>
77# elif __solaris /* not yet */
78# include <sys/sendfile.h>
79# else
80# error sendfile support requested but not available
81# endif
82#endif
83
84/* number of seconds after which idle threads exit */
85#define IDLE_TIMEOUT 10
86
87/* used for struct dirent, AIX doesn't provide it */
88#ifndef NAME_MAX
89# define NAME_MAX 4096
90#endif
91
92/* buffer size for various temporary buffers */
93#define AIO_BUFSIZE 65536
94 71
95/* use NV for 32 bit perls as it allows larger offsets */ 72/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8 73#if IVSIZE >= 8
97# define SvVAL64 SvIV 74# define SvVAL64 SvIV
98#else 75#else
99# define SvVAL64 SvNV 76# define SvVAL64 SvNV
100#endif 77#endif
101 78
102static HV *stash; 79static HV *stash;
103
104#define dBUF \
105 char *aio_buf; \
106 X_LOCK (wrklock); \
107 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
108 X_UNLOCK (wrklock); \
109 if (!aio_buf) \
110 return -1;
111
112typedef SV SV8; /* byte-sv, used for argument-checking */ 80typedef SV SV8; /* byte-sv, used for argument-checking */
113
114enum {
115 REQ_QUIT,
116 REQ_OPEN, REQ_CLOSE,
117 REQ_READ, REQ_WRITE,
118 REQ_READAHEAD, REQ_SENDFILE,
119 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
120 REQ_TRUNCATE, REQ_FTRUNCATE,
121 REQ_UTIME, REQ_FUTIME,
122 REQ_CHMOD, REQ_FCHMOD,
123 REQ_CHOWN, REQ_FCHOWN,
124 REQ_SYNC, REQ_FSYNC, REQ_FDATASYNC,
125 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
126 REQ_MKNOD, REQ_READDIR,
127 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
128 REQ_GROUP, REQ_NOP,
129 REQ_BUSY,
130};
131 81
132#define AIO_REQ_KLASS "IO::AIO::REQ" 82#define AIO_REQ_KLASS "IO::AIO::REQ"
133#define AIO_GRP_KLASS "IO::AIO::GRP" 83#define AIO_GRP_KLASS "IO::AIO::GRP"
134 84
135typedef struct aio_cb 85#define EIO_REQ_MEMBERS \
136{
137 struct aio_cb *volatile next;
138
139 SV *callback; 86 SV *callback; \
140 SV *sv1, *sv2; 87 SV *sv1, *sv2; \
141 void *ptr1, *ptr2;
142 off_t offs;
143 size_t size;
144 ssize_t result;
145 double nv1, nv2;
146
147 STRLEN stroffset; 88 STRLEN stroffset; \
148 int type; 89 SV *self;
149 int int1, int2, int3;
150 int errorno;
151 mode_t mode; /* open */
152 90
153 unsigned char flags; 91#define EIO_NO_WRAPPERS 1
154 unsigned char pri;
155 92
156 SV *self; /* the perl counterpart of this request, if any */ 93#include "libeio/eio.h"
157 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 94
158} aio_cb; 95static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req)
159 101
160enum { 102enum {
161 FLAG_CANCELLED = 0x01, /* request was cancelled */
162 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
163 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
164}; 104};
165 105
106#include "libeio/eio.c"
107
166typedef aio_cb *aio_req; 108typedef eio_req *aio_req;
167typedef aio_cb *aio_req_ornot; 109typedef eio_req *aio_req_ornot;
168 110
169enum { 111static SV *on_next_submit;
170 PRI_MIN = -4, 112static int next_pri = EIO_PRI_DEFAULT;
171 PRI_MAX = 4, 113static int max_outstanding;
172 114
173 DEFAULT_PRI = 0,
174 PRI_BIAS = -PRI_MIN,
175 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
176};
177
178#define AIO_TICKS ((1000000 + 1023) >> 10)
179
180static unsigned int max_poll_time = 0;
181static unsigned int max_poll_reqs = 0;
182
183/* calculcate time difference in ~1/AIO_TICKS of a second */
184static int tvdiff (struct timeval *tv1, struct timeval *tv2)
185{
186 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
187 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
188}
189
190static thread_t main_tid;
191static int main_sig;
192static int block_sig_level;
193
194void block_sig (void)
195{
196 sigset_t ss;
197
198 if (block_sig_level++)
199 return;
200
201 if (!main_sig)
202 return;
203
204 sigemptyset (&ss);
205 sigaddset (&ss, main_sig);
206 pthread_sigmask (SIG_BLOCK, &ss, 0);
207}
208
209void unblock_sig (void)
210{
211 sigset_t ss;
212
213 if (--block_sig_level)
214 return;
215
216 if (!main_sig)
217 return;
218
219 sigemptyset (&ss);
220 sigaddset (&ss, main_sig);
221 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
222}
223
224static int next_pri = DEFAULT_PRI + PRI_BIAS;
225
226static unsigned int started, idle, wanted;
227
228/* worker threads management */
229static mutex_t wrklock = X_MUTEX_INIT;
230
231typedef struct worker {
232 /* locked by wrklock */
233 struct worker *prev, *next;
234
235 thread_t tid;
236
237 /* locked by reslock, reqlock or wrklock */
238 aio_req req; /* currently processed request */
239 void *dbuf;
240 DIR *dirp;
241} worker;
242
243static worker wrk_first = { &wrk_first, &wrk_first, 0 };
244
245static void worker_clear (worker *wrk)
246{
247 if (wrk->dirp)
248 {
249 closedir (wrk->dirp);
250 wrk->dirp = 0;
251 }
252
253 if (wrk->dbuf)
254 {
255 free (wrk->dbuf);
256 wrk->dbuf = 0;
257 }
258}
259
260static void worker_free (worker *wrk)
261{
262 wrk->next->prev = wrk->prev;
263 wrk->prev->next = wrk->next;
264
265 free (wrk);
266}
267
268static volatile unsigned int nreqs, nready, npending;
269static volatile unsigned int max_idle = 4;
270static volatile unsigned int max_outstanding = 0xffffffff;
271static int respipe_osf [2], respipe [2] = { -1, -1 }; 115static int respipe_osf [2], respipe [2] = { -1, -1 };
272 116
273static mutex_t reslock = X_MUTEX_INIT;
274static mutex_t reqlock = X_MUTEX_INIT;
275static cond_t reqwait = X_COND_INIT;
276
277#if WORDACCESS_UNSAFE
278
279static unsigned int get_nready (void)
280{
281 unsigned int retval;
282
283 X_LOCK (reqlock);
284 retval = nready;
285 X_UNLOCK (reqlock);
286
287 return retval;
288}
289
290static unsigned int get_npending (void)
291{
292 unsigned int retval;
293
294 X_LOCK (reslock);
295 retval = npending;
296 X_UNLOCK (reslock);
297
298 return retval;
299}
300
301static unsigned int get_nthreads (void)
302{
303 unsigned int retval;
304
305 X_LOCK (wrklock);
306 retval = started;
307 X_UNLOCK (wrklock);
308
309 return retval;
310}
311
312#else
313
314# define get_nready() nready
315# define get_npending() npending
316# define get_nthreads() started
317
318#endif
319
320/*
321 * a somewhat faster data structure might be nice, but
322 * with 8 priorities this actually needs <20 insns
323 * per shift, the most expensive operation.
324 */
325typedef struct {
326 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
327 int size;
328} reqq;
329
330static reqq req_queue;
331static reqq res_queue;
332
333int reqq_push (reqq *q, aio_req req)
334{
335 int pri = req->pri;
336 req->next = 0;
337
338 if (q->qe[pri])
339 {
340 q->qe[pri]->next = req;
341 q->qe[pri] = req;
342 }
343 else
344 q->qe[pri] = q->qs[pri] = req;
345
346 return q->size++;
347}
348
349aio_req reqq_shift (reqq *q)
350{
351 int pri;
352
353 if (!q->size)
354 return 0;
355
356 --q->size;
357
358 for (pri = NUM_PRI; pri--; )
359 {
360 aio_req req = q->qs[pri];
361
362 if (req)
363 {
364 if (!(q->qs[pri] = req->next))
365 q->qe[pri] = 0;
366
367 return req;
368 }
369 }
370
371 abort ();
372}
373
374static int poll_cb (void);
375static int req_invoke (aio_req req);
376static void req_destroy (aio_req req); 117static void req_destroy (aio_req req);
377static void req_cancel (aio_req req); 118static void req_cancel (aio_req req);
119
120static void want_poll (void)
121{
122 /* write a dummy byte to the pipe so fh becomes ready */
123 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
124}
125
126static void done_poll (void)
127{
128 /* read any signals sent by the worker threads */
129 char buf [4];
130 while (respipe_read (respipe [0], buf, 4) == 4)
131 ;
132}
378 133
379/* must be called at most once */ 134/* must be called at most once */
380static SV *req_sv (aio_req req, const char *klass) 135static SV *req_sv (aio_req req, const char *klass)
381{ 136{
382 if (!req->self) 137 if (!req->self)
400 return mg ? (aio_req)mg->mg_ptr : 0; 155 return mg ? (aio_req)mg->mg_ptr : 0;
401} 156}
402 157
403static void aio_grp_feed (aio_req grp) 158static void aio_grp_feed (aio_req grp)
404{ 159{
405 block_sig (); 160 if (grp->sv2 && SvOK (grp->sv2))
406
407 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
408 { 161 {
409 int old_len = grp->size;
410
411 if (grp->sv2 && SvOK (grp->sv2))
412 {
413 dSP; 162 dSP;
414 163
415 ENTER; 164 ENTER;
416 SAVETMPS; 165 SAVETMPS;
417 PUSHMARK (SP); 166 PUSHMARK (SP);
418 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 167 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
419 PUTBACK; 168 PUTBACK;
420 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 169 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
421 SPAGAIN; 170 SPAGAIN;
422 FREETMPS; 171 FREETMPS;
423 LEAVE; 172 LEAVE;
424 }
425
426 /* stop if no progress has been made */
427 if (old_len == grp->size)
428 {
429 SvREFCNT_dec (grp->sv2);
430 grp->sv2 = 0;
431 break;
432 }
433 } 173 }
434
435 unblock_sig ();
436} 174}
437 175
438static void aio_grp_dec (aio_req grp) 176static void req_submit (eio_req *req)
439{ 177{
440 --grp->size; 178 eio_submit (req);
441 179
442 /* call feeder, if applicable */ 180 if (on_next_submit)
443 aio_grp_feed (grp);
444
445 /* finish, if done */
446 if (!grp->size && grp->int1)
447 { 181 {
448 block_sig (); 182 dSP;
183 SV *cb = sv_2mortal (on_next_submit);
449 184
450 if (!req_invoke (grp)) 185 on_next_submit = 0;
451 {
452 req_destroy (grp);
453 unblock_sig ();
454 croak (0);
455 }
456 186
457 req_destroy (grp); 187 PUSHMARK (SP);
458 unblock_sig (); 188 PUTBACK;
189 call_sv (cb, G_DISCARD | G_EVAL);
459 } 190 }
460} 191}
461 192
462static int req_invoke (aio_req req) 193static int req_invoke (eio_req *req)
463{ 194{
464 dSP; 195 dSP;
465 196
466 if (req->flags & FLAG_SV2_RO_OFF) 197 if (req->flags & FLAG_SV2_RO_OFF)
467 SvREADONLY_off (req->sv2); 198 SvREADONLY_off (req->sv2);
468 199
469 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 200 if (!EIO_CANCELLED (req) && SvOK (req->callback))
470 { 201 {
471 ENTER; 202 ENTER;
472 SAVETMPS; 203 SAVETMPS;
473 PUSHMARK (SP); 204 PUSHMARK (SP);
474 EXTEND (SP, 1); 205 EXTEND (SP, 1);
475 206
476 switch (req->type) 207 switch (req->type)
477 { 208 {
478 case REQ_READDIR: 209 case EIO_READDIR:
479 { 210 {
480 SV *rv = &PL_sv_undef; 211 SV *rv = &PL_sv_undef;
481 212
482 if (req->result >= 0) 213 if (req->result >= 0)
483 { 214 {
500 231
501 PUSHs (rv); 232 PUSHs (rv);
502 } 233 }
503 break; 234 break;
504 235
505 case REQ_OPEN: 236 case EIO_OPEN:
506 { 237 {
507 /* convert fd to fh */ 238 /* convert fd to fh */
508 SV *fh = &PL_sv_undef; 239 SV *fh = &PL_sv_undef;
509 240
510 if (req->result >= 0) 241 if (req->result >= 0)
531 262
532 PUSHs (fh); 263 PUSHs (fh);
533 } 264 }
534 break; 265 break;
535 266
536 case REQ_GROUP: 267 case EIO_GROUP:
537 req->int1 = 2; /* mark group as finished */ 268 req->int1 = 2; /* mark group as finished */
538 269
539 if (req->sv1) 270 if (req->sv1)
540 { 271 {
541 int i; 272 int i;
545 for (i = 0; i <= AvFILL (av); ++i) 276 for (i = 0; i <= AvFILL (av); ++i)
546 PUSHs (*av_fetch (av, i, 0)); 277 PUSHs (*av_fetch (av, i, 0));
547 } 278 }
548 break; 279 break;
549 280
550 case REQ_NOP: 281 case EIO_NOP:
551 case REQ_BUSY: 282 case EIO_BUSY:
552 break; 283 break;
553 284
554 case REQ_READLINK: 285 case EIO_READLINK:
555 if (req->result > 0) 286 if (req->result > 0)
556 { 287 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
557 SvCUR_set (req->sv2, req->result);
558 *SvEND (req->sv2) = 0;
559 PUSHs (req->sv2);
560 }
561 break; 288 break;
562 289
563 case REQ_STAT: 290 case EIO_STAT:
564 case REQ_LSTAT: 291 case EIO_LSTAT:
565 case REQ_FSTAT: 292 case EIO_FSTAT:
566 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 293 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
567 PL_laststatval = req->result; 294 PL_laststatval = req->result;
568 PL_statcache = *(Stat_t *)(req->ptr2); 295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
569 PUSHs (sv_2mortal (newSViv (req->result))); 296 PUSHs (sv_2mortal (newSViv (req->result)));
570 break; 297 break;
571 298
572 case REQ_READ: 299 case EIO_READ:
573 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
574 *SvEND (req->sv2) = 0; 301 *SvEND (req->sv2) = 0;
575 PUSHs (sv_2mortal (newSViv (req->result))); 302 PUSHs (sv_2mortal (newSViv (req->result)));
576 break; 303 break;
577 304
305 case EIO_DUP2:
306 if (req->result > 0)
307 req->result = 0;
308 /* FALLTHROUGH */
309
578 default: 310 default:
579 PUSHs (sv_2mortal (newSViv (req->result))); 311 PUSHs (sv_2mortal (newSViv (req->result)));
580 break; 312 break;
581 } 313 }
582 314
590 LEAVE; 322 LEAVE;
591 323
592 PUTBACK; 324 PUTBACK;
593 } 325 }
594 326
595 if (req->grp)
596 {
597 aio_req grp = req->grp;
598
599 /* unlink request */
600 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
601 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
602
603 if (grp->grp_first == req)
604 grp->grp_first = req->grp_next;
605
606 aio_grp_dec (grp);
607 }
608
609 return !SvTRUE (ERRSV); 327 return !!SvTRUE (ERRSV);
610} 328}
611 329
612static void req_destroy (aio_req req) 330static void req_destroy (aio_req req)
613{ 331{
614 if (req->self) 332 if (req->self)
619 337
620 SvREFCNT_dec (req->sv1); 338 SvREFCNT_dec (req->sv1);
621 SvREFCNT_dec (req->sv2); 339 SvREFCNT_dec (req->sv2);
622 SvREFCNT_dec (req->callback); 340 SvREFCNT_dec (req->callback);
623 341
624 if (req->flags & FLAG_PTR2_FREE)
625 free (req->ptr2);
626
627 Safefree (req); 342 Safefree (req);
628} 343}
629 344
630static void req_cancel_subs (aio_req grp) 345static void req_cancel_subs (aio_req grp)
631{ 346{
632 aio_req sub; 347 aio_req sub;
633 348
634 if (grp->type != REQ_GROUP) 349 if (grp->type != EIO_GROUP)
635 return; 350 return;
636 351
637 SvREFCNT_dec (grp->sv2); 352 SvREFCNT_dec (grp->sv2);
638 grp->sv2 = 0; 353 grp->sv2 = 0;
639 354
640 for (sub = grp->grp_first; sub; sub = sub->grp_next) 355 eio_grp_cancel (grp);
641 req_cancel (sub);
642}
643
644static void req_cancel (aio_req req)
645{
646 req->flags |= FLAG_CANCELLED;
647
648 req_cancel_subs (req);
649} 356}
650 357
651#ifdef USE_SOCKETS_AS_HANDLES 358#ifdef USE_SOCKETS_AS_HANDLES
652# define TO_SOCKET(x) (win32_get_osfhandle (x)) 359# define TO_SOCKET(x) (win32_get_osfhandle (x))
653#else 360#else
690 397
691 respipe_osf [0] = TO_SOCKET (respipe [0]); 398 respipe_osf [0] = TO_SOCKET (respipe [0]);
692 respipe_osf [1] = TO_SOCKET (respipe [1]); 399 respipe_osf [1] = TO_SOCKET (respipe [1]);
693} 400}
694 401
695X_THREAD_PROC (aio_proc);
696
697static void start_thread (void)
698{
699 worker *wrk = calloc (1, sizeof (worker));
700
701 if (!wrk)
702 croak ("unable to allocate worker thread data");
703
704 X_LOCK (wrklock);
705
706 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
707 {
708 wrk->prev = &wrk_first;
709 wrk->next = wrk_first.next;
710 wrk_first.next->prev = wrk;
711 wrk_first.next = wrk;
712 ++started;
713 }
714 else
715 free (wrk);
716
717 X_UNLOCK (wrklock);
718}
719
720static void maybe_start_thread (void)
721{
722 if (get_nthreads () >= wanted)
723 return;
724
725 /* todo: maybe use idle here, but might be less exact */
726 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
727 return;
728
729 start_thread ();
730}
731
732static void req_send (aio_req req)
733{
734 block_sig ();
735
736 ++nreqs;
737
738 X_LOCK (reqlock);
739 ++nready;
740 reqq_push (&req_queue, req);
741 X_COND_SIGNAL (reqwait);
742 X_UNLOCK (reqlock);
743
744 unblock_sig ();
745
746 maybe_start_thread ();
747}
748
749static void end_thread (void)
750{
751 aio_req req;
752
753 Newz (0, req, 1, aio_cb);
754
755 req->type = REQ_QUIT;
756 req->pri = PRI_MAX + PRI_BIAS;
757
758 X_LOCK (reqlock);
759 reqq_push (&req_queue, req);
760 X_COND_SIGNAL (reqwait);
761 X_UNLOCK (reqlock);
762
763 X_LOCK (wrklock);
764 --started;
765 X_UNLOCK (wrklock);
766}
767
768static void set_max_idle (int nthreads)
769{
770 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
771 max_idle = nthreads <= 0 ? 1 : nthreads;
772 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
773}
774
775static void min_parallel (int nthreads)
776{
777 if (wanted < nthreads)
778 wanted = nthreads;
779}
780
781static void max_parallel (int nthreads)
782{
783 if (wanted > nthreads)
784 wanted = nthreads;
785
786 while (started > wanted)
787 end_thread ();
788}
789
790static void poll_wait (void) 402static void poll_wait (void)
791{ 403{
792 fd_set rfd; 404 fd_set rfd;
793 405
794 while (nreqs) 406 while (eio_nreqs ())
795 { 407 {
796 int size; 408 int size;
797 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 409
410 X_LOCK (reslock);
798 size = res_queue.size; 411 size = res_queue.size;
799 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 412 X_UNLOCK (reslock);
800 413
801 if (size) 414 if (size)
802 return; 415 return;
803 416
804 maybe_start_thread (); 417 etp_maybe_start_thread ();
805 418
806 FD_ZERO (&rfd); 419 FD_ZERO (&rfd);
807 FD_SET (respipe [0], &rfd); 420 FD_SET (respipe [0], &rfd);
808 421
809 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
810 } 423 }
811} 424}
812 425
813static int poll_cb (void) 426static int poll_cb (void)
814{ 427{
815 dSP;
816 int count = 0;
817 int maxreqs = max_poll_reqs;
818 int do_croak = 0;
819 struct timeval tv_start, tv_now;
820 aio_req req;
821
822 if (max_poll_time)
823 gettimeofday (&tv_start, 0);
824
825 block_sig ();
826
827 for (;;) 428 for (;;)
828 { 429 {
829 for (;;) 430 int res = eio_poll ();
830 {
831 maybe_start_thread ();
832 431
833 X_LOCK (reslock); 432 if (res > 0)
834 req = reqq_shift (&res_queue);
835
836 if (req)
837 {
838 --npending;
839
840 if (!res_queue.size)
841 {
842 /* read any signals sent by the worker threads */
843 char buf [4];
844 while (respipe_read (respipe [0], buf, 4) == 4)
845 ;
846 }
847 }
848
849 X_UNLOCK (reslock);
850
851 if (!req)
852 break;
853
854 --nreqs;
855
856 if (req->type == REQ_GROUP && req->size)
857 {
858 req->int1 = 1; /* mark request as delayed */
859 continue;
860 }
861 else
862 {
863 if (!req_invoke (req))
864 {
865 req_destroy (req);
866 unblock_sig ();
867 croak (0); 433 croak (0);
868 }
869 434
870 count++; 435 if (!max_outstanding || max_outstanding > eio_nreqs ())
871 } 436 return res;
872
873 req_destroy (req);
874
875 if (maxreqs && !--maxreqs)
876 break;
877
878 if (max_poll_time)
879 {
880 gettimeofday (&tv_now, 0);
881
882 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
883 break;
884 }
885 }
886
887 if (nreqs <= max_outstanding)
888 break;
889 437
890 poll_wait (); 438 poll_wait ();
891
892 ++maxreqs;
893 } 439 }
894
895 unblock_sig ();
896 return count;
897}
898
899/*****************************************************************************/
900/* work around various missing functions */
901
902#if !HAVE_PREADWRITE
903# define pread aio_pread
904# define pwrite aio_pwrite
905
906/*
907 * make our pread/pwrite safe against themselves, but not against
908 * normal read/write by using a mutex. slows down execution a lot,
909 * but that's your problem, not mine.
910 */
911static mutex_t preadwritelock = X_MUTEX_INIT;
912
913static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
914{
915 ssize_t res;
916 off_t ooffset;
917
918 X_LOCK (preadwritelock);
919 ooffset = lseek (fd, 0, SEEK_CUR);
920 lseek (fd, offset, SEEK_SET);
921 res = read (fd, buf, count);
922 lseek (fd, ooffset, SEEK_SET);
923 X_UNLOCK (preadwritelock);
924
925 return res;
926}
927
928static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
929{
930 ssize_t res;
931 off_t ooffset;
932
933 X_LOCK (preadwritelock);
934 ooffset = lseek (fd, 0, SEEK_CUR);
935 lseek (fd, offset, SEEK_SET);
936 res = write (fd, buf, count);
937 lseek (fd, offset, SEEK_SET);
938 X_UNLOCK (preadwritelock);
939
940 return res;
941}
942#endif
943
944#ifndef HAVE_FUTIMES
945
946# define utimes(path,times) aio_utimes (path, times)
947# define futimes(fd,times) aio_futimes (fd, times)
948
949int aio_utimes (const char *filename, const struct timeval times[2])
950{
951 if (times)
952 {
953 struct utimbuf buf;
954
955 buf.actime = times[0].tv_sec;
956 buf.modtime = times[1].tv_sec;
957
958 return utime (filename, &buf);
959 }
960 else
961 return utime (filename, 0);
962}
963
964int aio_futimes (int fd, const struct timeval tv[2])
965{
966 errno = ENOSYS;
967 return -1;
968}
969
970#endif
971
972#if !HAVE_FDATASYNC
973# define fdatasync fsync
974#endif
975
976#if !HAVE_READAHEAD
977# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
978
979static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
980{
981 size_t todo = count;
982 dBUF;
983
984 while (todo > 0)
985 {
986 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
987
988 pread (fd, aio_buf, len, offset);
989 offset += len;
990 todo -= len;
991 }
992
993 errno = 0;
994 return count;
995}
996
997#endif
998
999#if !HAVE_READDIR_R
1000# define readdir_r aio_readdir_r
1001
1002static mutex_t readdirlock = X_MUTEX_INIT;
1003
1004static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
1005{
1006 X_DIRENT *e;
1007 int errorno;
1008
1009 X_LOCK (readdirlock);
1010
1011 e = readdir (dirp);
1012 errorno = errno;
1013
1014 if (e)
1015 {
1016 *res = ent;
1017 strcpy (ent->d_name, e->d_name);
1018 }
1019 else
1020 *res = 0;
1021
1022 X_UNLOCK (readdirlock);
1023
1024 errno = errorno;
1025 return e ? 0 : -1;
1026}
1027#endif
1028
1029/* sendfile always needs emulation */
1030static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
1031{
1032 ssize_t res;
1033
1034 if (!count)
1035 return 0;
1036
1037#if HAVE_SENDFILE
1038# if __linux
1039 res = sendfile (ofd, ifd, &offset, count);
1040
1041# elif __freebsd
1042 /*
1043 * Of course, the freebsd sendfile is a dire hack with no thoughts
1044 * wasted on making it similar to other I/O functions.
1045 */
1046 {
1047 off_t sbytes;
1048 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
1049
1050 if (res < 0 && sbytes)
1051 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
1052 res = sbytes;
1053 }
1054
1055# elif __hpux
1056 res = sendfile (ofd, ifd, offset, count, 0, 0);
1057
1058# elif __solaris
1059 {
1060 struct sendfilevec vec;
1061 size_t sbytes;
1062
1063 vec.sfv_fd = ifd;
1064 vec.sfv_flag = 0;
1065 vec.sfv_off = offset;
1066 vec.sfv_len = count;
1067
1068 res = sendfilev (ofd, &vec, 1, &sbytes);
1069
1070 if (res < 0 && sbytes)
1071 res = sbytes;
1072 }
1073
1074# endif
1075#else
1076 res = -1;
1077 errno = ENOSYS;
1078#endif
1079
1080 if (res < 0
1081 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1082#if __solaris
1083 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1084#endif
1085 )
1086 )
1087 {
1088 /* emulate sendfile. this is a major pain in the ass */
1089 dBUF;
1090
1091 res = 0;
1092
1093 while (count)
1094 {
1095 ssize_t cnt;
1096
1097 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
1098
1099 if (cnt <= 0)
1100 {
1101 if (cnt && !res) res = -1;
1102 break;
1103 }
1104
1105 cnt = write (ofd, aio_buf, cnt);
1106
1107 if (cnt <= 0)
1108 {
1109 if (cnt && !res) res = -1;
1110 break;
1111 }
1112
1113 offset += cnt;
1114 res += cnt;
1115 count -= cnt;
1116 }
1117 }
1118
1119 return res;
1120}
1121
1122/* read a full directory */
1123static void scandir_ (aio_req req, worker *self)
1124{
1125 DIR *dirp;
1126 union
1127 {
1128 X_DIRENT d;
1129 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
1130 } *u;
1131 X_DIRENT *entp;
1132 char *name, *names;
1133 int memlen = 4096;
1134 int memofs = 0;
1135 int res = 0;
1136
1137 X_LOCK (wrklock);
1138 self->dirp = dirp = opendir (req->ptr1);
1139 self->dbuf = u = malloc (sizeof (*u));
1140 req->flags |= FLAG_PTR2_FREE;
1141 req->ptr2 = names = malloc (memlen);
1142 X_UNLOCK (wrklock);
1143
1144 if (dirp && u && names)
1145 for (;;)
1146 {
1147 errno = 0;
1148 readdir_r (dirp, &u->d, &entp);
1149
1150 if (!entp)
1151 break;
1152
1153 name = entp->d_name;
1154
1155 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1156 {
1157 int len = strlen (name) + 1;
1158
1159 res++;
1160
1161 while (memofs + len > memlen)
1162 {
1163 memlen *= 2;
1164 X_LOCK (wrklock);
1165 req->ptr2 = names = realloc (names, memlen);
1166 X_UNLOCK (wrklock);
1167
1168 if (!names)
1169 break;
1170 }
1171
1172 memcpy (names + memofs, name, len);
1173 memofs += len;
1174 }
1175 }
1176
1177 if (errno)
1178 res = -1;
1179
1180 req->result = res;
1181}
1182
1183/*****************************************************************************/
1184
1185X_THREAD_PROC (aio_proc)
1186{
1187 aio_req req;
1188 struct timespec ts;
1189 worker *self = (worker *)thr_arg;
1190
1191 /* try to distribute timeouts somewhat randomly */
1192 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1193
1194 for (;;)
1195 {
1196 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1197
1198 X_LOCK (reqlock);
1199
1200 for (;;)
1201 {
1202 self->req = req = reqq_shift (&req_queue);
1203
1204 if (req)
1205 break;
1206
1207 ++idle;
1208
1209 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1210 == ETIMEDOUT)
1211 {
1212 if (idle > max_idle)
1213 {
1214 --idle;
1215 X_UNLOCK (reqlock);
1216 X_LOCK (wrklock);
1217 --started;
1218 X_UNLOCK (wrklock);
1219 goto quit;
1220 }
1221
1222 /* we are allowed to idle, so do so without any timeout */
1223 X_COND_WAIT (reqwait, reqlock);
1224 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1225 }
1226
1227 --idle;
1228 }
1229
1230 --nready;
1231
1232 X_UNLOCK (reqlock);
1233
1234 errno = 0; /* strictly unnecessary */
1235
1236 if (!(req->flags & FLAG_CANCELLED))
1237 switch (req->type)
1238 {
1239 case REQ_READ: req->result = req->offs >= 0
1240 ? pread (req->int1, req->ptr1, req->size, req->offs)
1241 : read (req->int1, req->ptr1, req->size); break;
1242 case REQ_WRITE: req->result = req->offs >= 0
1243 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1244 : write (req->int1, req->ptr1, req->size); break;
1245
1246 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1247 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1248
1249 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1250 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1251 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1252
1253 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1254 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1255 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1256 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1257 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1258 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1259
1260 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1261 case REQ_CLOSE: req->result = close (req->int1); break;
1262 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1263 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1264 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1265 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1266 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1267 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1268 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1269 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1270
1271 case REQ_SYNC: req->result = 0; sync (); break;
1272 case REQ_FSYNC: req->result = fsync (req->int1); break;
1273 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1274
1275 case REQ_READDIR: scandir_ (req, self); break;
1276
1277 case REQ_BUSY:
1278#ifdef _WIN32
1279 Sleep (req->nv1 * 1000.);
1280#else
1281 {
1282 struct timeval tv;
1283
1284 tv.tv_sec = req->nv1;
1285 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1286
1287 req->result = select (0, 0, 0, 0, &tv);
1288 }
1289#endif
1290 break;
1291
1292 case REQ_UTIME:
1293 case REQ_FUTIME:
1294 {
1295 struct timeval tv[2];
1296 struct timeval *times;
1297
1298 if (req->nv1 != -1. || req->nv2 != -1.)
1299 {
1300 tv[0].tv_sec = req->nv1;
1301 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1302 tv[1].tv_sec = req->nv2;
1303 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1304
1305 times = tv;
1306 }
1307 else
1308 times = 0;
1309
1310
1311 req->result = req->type == REQ_FUTIME
1312 ? futimes (req->int1, times)
1313 : utimes (req->ptr1, times);
1314 }
1315
1316 case REQ_GROUP:
1317 case REQ_NOP:
1318 break;
1319
1320 case REQ_QUIT:
1321 goto quit;
1322
1323 default:
1324 req->result = -1;
1325 break;
1326 }
1327
1328 req->errorno = errno;
1329
1330 X_LOCK (reslock);
1331
1332 ++npending;
1333
1334 if (!reqq_push (&res_queue, req))
1335 {
1336 /* write a dummy byte to the pipe so fh becomes ready */
1337 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1338
1339 /* optionally signal the main thread asynchronously */
1340 if (main_sig)
1341 pthread_kill (main_tid, main_sig);
1342 }
1343
1344 self->req = 0;
1345 worker_clear (self);
1346
1347 X_UNLOCK (reslock);
1348 }
1349
1350quit:
1351 X_LOCK (wrklock);
1352 worker_free (self);
1353 X_UNLOCK (wrklock);
1354
1355 return 0;
1356}
1357
1358/*****************************************************************************/
1359
1360static void atfork_prepare (void)
1361{
1362 X_LOCK (wrklock);
1363 X_LOCK (reqlock);
1364 X_LOCK (reslock);
1365#if !HAVE_PREADWRITE
1366 X_LOCK (preadwritelock);
1367#endif
1368#if !HAVE_READDIR_R
1369 X_LOCK (readdirlock);
1370#endif
1371}
1372
1373static void atfork_parent (void)
1374{
1375#if !HAVE_READDIR_R
1376 X_UNLOCK (readdirlock);
1377#endif
1378#if !HAVE_PREADWRITE
1379 X_UNLOCK (preadwritelock);
1380#endif
1381 X_UNLOCK (reslock);
1382 X_UNLOCK (reqlock);
1383 X_UNLOCK (wrklock);
1384} 440}
1385 441
1386static void atfork_child (void) 442static void atfork_child (void)
1387{ 443{
1388 aio_req prv;
1389
1390 while (prv = reqq_shift (&req_queue))
1391 req_destroy (prv);
1392
1393 while (prv = reqq_shift (&res_queue))
1394 req_destroy (prv);
1395
1396 while (wrk_first.next != &wrk_first)
1397 {
1398 worker *wrk = wrk_first.next;
1399
1400 if (wrk->req)
1401 req_destroy (wrk->req);
1402
1403 worker_clear (wrk);
1404 worker_free (wrk);
1405 }
1406
1407 started = 0;
1408 idle = 0;
1409 nreqs = 0;
1410 nready = 0;
1411 npending = 0;
1412
1413 create_respipe (); 444 create_respipe ();
1414
1415 atfork_parent ();
1416} 445}
1417 446
1418#define dREQ \ 447#define dREQ \
1419 aio_req req; \ 448 aio_req req; \
1420 int req_pri = next_pri; \ 449 int req_pri = next_pri; \
1421 next_pri = DEFAULT_PRI + PRI_BIAS; \ 450 next_pri = EIO_PRI_DEFAULT; \
1422 \ 451 \
1423 if (SvOK (callback) && !SvROK (callback)) \ 452 if (SvOK (callback) && !SvROK (callback)) \
1424 croak ("callback must be undef or of reference type"); \ 453 croak ("callback must be undef or of reference type"); \
1425 \ 454 \
1426 Newz (0, req, 1, aio_cb); \ 455 Newz (0, req, 1, eio_req); \
1427 if (!req) \ 456 if (!req) \
1428 croak ("out of memory during aio_req allocation"); \ 457 croak ("out of memory during eio_req allocation"); \
1429 \ 458 \
1430 req->callback = newSVsv (callback); \ 459 req->callback = newSVsv (callback); \
1431 req->pri = req_pri 460 req->pri = req_pri
1432 461
1433#define REQ_SEND \ 462#define REQ_SEND \
1434 req_send (req); \ 463 req_submit (req); \
1435 \ 464 \
1436 if (GIMME_V != G_VOID) \ 465 if (GIMME_V != G_VOID) \
1437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 466 XPUSHs (req_sv (req, AIO_REQ_KLASS));
1438 467
1439MODULE = IO::AIO PACKAGE = IO::AIO 468MODULE = IO::AIO PACKAGE = IO::AIO
1447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1452#ifdef _WIN32 481#ifndef _WIN32
1453 X_MUTEX_CHECK (wrklock);
1454 X_MUTEX_CHECK (reslock);
1455 X_MUTEX_CHECK (reqlock);
1456 X_MUTEX_CHECK (reqwait);
1457 X_MUTEX_CHECK (preadwritelock);
1458 X_MUTEX_CHECK (readdirlock);
1459
1460 X_COND_CHECK (reqwait);
1461#else
1462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1463 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1464#endif 483#endif
1465 484
1466 create_respipe (); 485 create_respipe ();
1467 486
1468 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 487 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library");
489
490 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child);
1469} 492}
1470 493
1471void 494void
1472max_poll_reqs (int nreqs) 495max_poll_reqs (int nreqs)
1473 PROTOTYPE: $ 496 PROTOTYPE: $
1474 CODE: 497 CODE:
1475 max_poll_reqs = nreqs; 498 eio_set_max_poll_reqs (nreqs);
1476 499
1477void 500void
1478max_poll_time (double nseconds) 501max_poll_time (double nseconds)
1479 PROTOTYPE: $ 502 PROTOTYPE: $
1480 CODE: 503 CODE:
1481 max_poll_time = nseconds * AIO_TICKS; 504 eio_set_max_poll_time (nseconds);
1482 505
1483void 506void
1484min_parallel (int nthreads) 507min_parallel (int nthreads)
1485 PROTOTYPE: $ 508 PROTOTYPE: $
509 CODE:
510 eio_set_min_parallel (nthreads);
1486 511
1487void 512void
1488max_parallel (int nthreads) 513max_parallel (int nthreads)
1489 PROTOTYPE: $ 514 PROTOTYPE: $
515 CODE:
516 eio_set_max_parallel (nthreads);
1490 517
1491void 518void
1492max_idle (int nthreads) 519max_idle (int nthreads)
1493 PROTOTYPE: $ 520 PROTOTYPE: $
1494 CODE: 521 CODE:
1495 set_max_idle (nthreads); 522 eio_set_max_idle (nthreads);
1496 523
1497int 524void
1498max_outstanding (int maxreqs) 525max_outstanding (int maxreqs)
1499 PROTOTYPE: $ 526 PROTOTYPE: $
1500 CODE: 527 CODE:
1501 RETVAL = max_outstanding;
1502 max_outstanding = maxreqs; 528 max_outstanding = maxreqs;
1503 OUTPUT:
1504 RETVAL
1505 529
1506void 530void
1507aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 531aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1508 PROTOTYPE: $$$;$ 532 PROTOTYPE: $$$;$
1509 PPCODE: 533 PPCODE:
1510{ 534{
1511 dREQ; 535 dREQ;
1512 536
1513 req->type = REQ_OPEN; 537 req->type = EIO_OPEN;
1514 req->sv1 = newSVsv (pathname); 538 req->sv1 = newSVsv (pathname);
1515 req->ptr1 = SvPVbyte_nolen (req->sv1); 539 req->ptr1 = SvPVbyte_nolen (req->sv1);
1516 req->int1 = flags; 540 req->int1 = flags;
1517 req->mode = mode; 541 req->int2 = mode;
1518 542
1519 REQ_SEND; 543 REQ_SEND;
1520} 544}
1521 545
1522void 546void
1523aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 547aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1524 PROTOTYPE: $;$ 548 PROTOTYPE: $;$
1525 ALIAS: 549 ALIAS:
1526 aio_fsync = REQ_FSYNC 550 aio_fsync = EIO_FSYNC
1527 aio_fdatasync = REQ_FDATASYNC 551 aio_fdatasync = EIO_FDATASYNC
1528 PPCODE: 552 PPCODE:
1529{ 553{
1530 dREQ; 554 dREQ;
1531 555
1532 req->type = ix; 556 req->type = ix;
1534 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1535 559
1536 REQ_SEND (req); 560 REQ_SEND (req);
1537} 561}
1538 562
1539int
1540_dup (int fd)
1541 PROTOTYPE: $
1542 CODE:
1543 RETVAL = dup (fd);
1544 OUTPUT:
1545 RETVAL
1546
1547void 563void
1548_aio_close (int fd, SV *callback=&PL_sv_undef) 564aio_close (SV *fh, SV *callback=&PL_sv_undef)
1549 PROTOTYPE: $;$ 565 PROTOTYPE: $;$
1550 PPCODE: 566 PPCODE:
1551{ 567{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1552 dREQ; 569 dREQ;
1553 570
571 if (close_pipe < 0)
572 {
573 int pipefd [2];
574
575 if (pipe (pipefd) < 0
576 || close (pipefd [1]) < 0
577 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
578 abort (); /*D*/
579
580 close_pipe = pipefd [0];
581 }
582
1554 req->type = REQ_CLOSE; 583 req->type = EIO_DUP2;
1555 req->int1 = fd; 584 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1556 587
1557 REQ_SEND (req); 588 REQ_SEND (req);
1558} 589}
1559 590
1560void 591void
1561aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 592aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1562 ALIAS: 593 ALIAS:
1563 aio_read = REQ_READ 594 aio_read = EIO_READ
1564 aio_write = REQ_WRITE 595 aio_write = EIO_WRITE
1565 PROTOTYPE: $$$$$;$ 596 PROTOTYPE: $$$$$;$
1566 PPCODE: 597 PPCODE:
1567{ 598{
1568 STRLEN svlen; 599 STRLEN svlen;
1569 char *svptr = SvPVbyte (data, svlen); 600 char *svptr = SvPVbyte (data, svlen);
1576 dataoffset += svlen; 607 dataoffset += svlen;
1577 608
1578 if (dataoffset < 0 || dataoffset > svlen) 609 if (dataoffset < 0 || dataoffset > svlen)
1579 croak ("dataoffset outside of data scalar"); 610 croak ("dataoffset outside of data scalar");
1580 611
1581 if (ix == REQ_WRITE) 612 if (ix == EIO_WRITE)
1582 { 613 {
1583 /* write: check length and adjust. */ 614 /* write: check length and adjust. */
1584 if (!SvOK (length) || len + dataoffset > svlen) 615 if (!SvOK (length) || len + dataoffset > svlen)
1585 len = svlen - dataoffset; 616 len = svlen - dataoffset;
1586 } 617 }
1596 { 627 {
1597 dREQ; 628 dREQ;
1598 629
1599 req->type = ix; 630 req->type = ix;
1600 req->sv1 = newSVsv (fh); 631 req->sv1 = newSVsv (fh);
1601 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
1602 : IoOFP (sv_2io (fh))); 633 : IoOFP (sv_2io (fh)));
1603 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1604 req->size = len; 635 req->size = len;
1605 req->sv2 = SvREFCNT_inc (data); 636 req->sv2 = SvREFCNT_inc (data);
1606 req->ptr1 = (char *)svptr + dataoffset; 637 req->ptr2 = (char *)svptr + dataoffset;
1607 req->stroffset = dataoffset; 638 req->stroffset = dataoffset;
1608 639
1609 if (!SvREADONLY (data)) 640 if (!SvREADONLY (data))
1610 { 641 {
1611 SvREADONLY_on (data); 642 SvREADONLY_on (data);
1622 PPCODE: 653 PPCODE:
1623{ 654{
1624 SV *data; 655 SV *data;
1625 dREQ; 656 dREQ;
1626 657
1627 data = newSV (NAME_MAX);
1628 SvPOK_on (data);
1629
1630 req->type = REQ_READLINK; 658 req->type = EIO_READLINK;
1631 req->sv1 = newSVsv (path); 659 req->sv1 = newSVsv (path);
1632 req->ptr2 = SvPVbyte_nolen (req->sv1); 660 req->ptr1 = SvPVbyte_nolen (req->sv1);
1633 req->sv2 = data;
1634 req->ptr1 = SvPVbyte_nolen (data);
1635 661
1636 REQ_SEND; 662 REQ_SEND;
1637} 663}
1638 664
1639void 665void
1641 PROTOTYPE: $$$$;$ 667 PROTOTYPE: $$$$;$
1642 PPCODE: 668 PPCODE:
1643{ 669{
1644 dREQ; 670 dREQ;
1645 671
1646 req->type = REQ_SENDFILE; 672 req->type = EIO_SENDFILE;
1647 req->sv1 = newSVsv (out_fh); 673 req->sv1 = newSVsv (out_fh);
1648 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1649 req->sv2 = newSVsv (in_fh); 675 req->sv2 = newSVsv (in_fh);
1650 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1651 req->offs = SvVAL64 (in_offset); 677 req->offs = SvVAL64 (in_offset);
1659 PROTOTYPE: $$$;$ 685 PROTOTYPE: $$$;$
1660 PPCODE: 686 PPCODE:
1661{ 687{
1662 dREQ; 688 dREQ;
1663 689
1664 req->type = REQ_READAHEAD; 690 req->type = EIO_READAHEAD;
1665 req->sv1 = newSVsv (fh); 691 req->sv1 = newSVsv (fh);
1666 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1667 req->offs = SvVAL64 (offset); 693 req->offs = SvVAL64 (offset);
1668 req->size = length; 694 req->size = length;
1669 695
1671} 697}
1672 698
1673void 699void
1674aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 700aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1675 ALIAS: 701 ALIAS:
1676 aio_stat = REQ_STAT 702 aio_stat = EIO_STAT
1677 aio_lstat = REQ_LSTAT 703 aio_lstat = EIO_LSTAT
1678 PPCODE: 704 PPCODE:
1679{ 705{
1680 dREQ; 706 dREQ;
1681 707
1682 req->ptr2 = malloc (sizeof (Stat_t));
1683 if (!req->ptr2)
1684 {
1685 req_destroy (req);
1686 croak ("out of memory during aio_stat statdata allocation");
1687 }
1688
1689 req->flags |= FLAG_PTR2_FREE;
1690 req->sv1 = newSVsv (fh_or_path); 708 req->sv1 = newSVsv (fh_or_path);
1691 709
1692 if (SvPOK (fh_or_path)) 710 if (SvPOK (req->sv1))
1693 { 711 {
1694 req->type = ix; 712 req->type = ix;
1695 req->ptr1 = SvPVbyte_nolen (req->sv1); 713 req->ptr1 = SvPVbyte_nolen (req->sv1);
1696 } 714 }
1697 else 715 else
1698 { 716 {
1699 req->type = REQ_FSTAT; 717 req->type = EIO_FSTAT;
1700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 718 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1701 } 719 }
1702 720
1703 REQ_SEND; 721 REQ_SEND;
1704} 722}
1711 729
1712 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 730 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1713 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 731 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1714 req->sv1 = newSVsv (fh_or_path); 732 req->sv1 = newSVsv (fh_or_path);
1715 733
1716 if (SvPOK (fh_or_path)) 734 if (SvPOK (req->sv1))
1717 { 735 {
1718 req->type = REQ_UTIME; 736 req->type = EIO_UTIME;
1719 req->ptr1 = SvPVbyte_nolen (req->sv1); 737 req->ptr1 = SvPVbyte_nolen (req->sv1);
1720 } 738 }
1721 else 739 else
1722 { 740 {
1723 req->type = REQ_FUTIME; 741 req->type = EIO_FUTIME;
1724 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 742 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1725 } 743 }
1726 744
1727 REQ_SEND; 745 REQ_SEND;
1728} 746}
1734 dREQ; 752 dREQ;
1735 753
1736 req->sv1 = newSVsv (fh_or_path); 754 req->sv1 = newSVsv (fh_or_path);
1737 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 755 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1738 756
1739 if (SvPOK (fh_or_path)) 757 if (SvPOK (req->sv1))
1740 { 758 {
1741 req->type = REQ_TRUNCATE; 759 req->type = EIO_TRUNCATE;
1742 req->ptr1 = SvPVbyte_nolen (req->sv1); 760 req->ptr1 = SvPVbyte_nolen (req->sv1);
1743 } 761 }
1744 else 762 else
1745 { 763 {
1746 req->type = REQ_FTRUNCATE; 764 req->type = EIO_FTRUNCATE;
1747 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 765 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1748 } 766 }
1749 767
1750 REQ_SEND; 768 REQ_SEND;
1751} 769}
1752 770
1753void 771void
1754aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 772aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
773 ALIAS:
774 aio_chmod = EIO_CHMOD
775 aio_mkdir = EIO_MKDIR
1755 PPCODE: 776 PPCODE:
1756{ 777{
1757 dREQ; 778 dREQ;
1758 779
1759 req->mode = mode; 780 req->int2 = mode;
1760 req->sv1 = newSVsv (fh_or_path); 781 req->sv1 = newSVsv (fh_or_path);
1761 782
1762 if (SvPOK (fh_or_path)) 783 if (SvPOK (req->sv1))
1763 { 784 {
1764 req->type = REQ_CHMOD; 785 req->type = ix;
1765 req->ptr1 = SvPVbyte_nolen (req->sv1); 786 req->ptr1 = SvPVbyte_nolen (req->sv1);
1766 } 787 }
1767 else 788 else
1768 { 789 {
1769 req->type = REQ_FCHMOD; 790 req->type = EIO_FCHMOD;
1770 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 791 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1771 } 792 }
1772 793
1773 REQ_SEND; 794 REQ_SEND;
1774} 795}
1781 802
1782 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 803 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1783 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 804 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1784 req->sv1 = newSVsv (fh_or_path); 805 req->sv1 = newSVsv (fh_or_path);
1785 806
1786 if (SvPOK (fh_or_path)) 807 if (SvPOK (req->sv1))
1787 { 808 {
1788 req->type = REQ_CHOWN; 809 req->type = EIO_CHOWN;
1789 req->ptr1 = SvPVbyte_nolen (req->sv1); 810 req->ptr1 = SvPVbyte_nolen (req->sv1);
1790 } 811 }
1791 else 812 else
1792 { 813 {
1793 req->type = REQ_FCHOWN; 814 req->type = EIO_FCHOWN;
1794 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1795 } 816 }
1796 817
1797 REQ_SEND; 818 REQ_SEND;
1798} 819}
1799 820
1800void 821void
1801aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1802 ALIAS: 823 ALIAS:
1803 aio_unlink = REQ_UNLINK 824 aio_unlink = EIO_UNLINK
1804 aio_rmdir = REQ_RMDIR 825 aio_rmdir = EIO_RMDIR
1805 aio_readdir = REQ_READDIR 826 aio_readdir = EIO_READDIR
1806 PPCODE: 827 PPCODE:
1807{ 828{
1808 dREQ; 829 dREQ;
1809 830
1810 req->type = ix; 831 req->type = ix;
1813 834
1814 REQ_SEND; 835 REQ_SEND;
1815} 836}
1816 837
1817void 838void
1818aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) 839aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
840 ALIAS:
841 aio_link = EIO_LINK
842 aio_symlink = EIO_SYMLINK
843 aio_rename = EIO_RENAME
1819 PPCODE: 844 PPCODE:
1820{ 845{
1821 dREQ; 846 dREQ;
1822 847
848 req->type = ix;
849 req->sv1 = newSVsv (oldpath);
850 req->ptr1 = SvPVbyte_nolen (req->sv1);
851 req->sv2 = newSVsv (newpath);
852 req->ptr2 = SvPVbyte_nolen (req->sv2);
853
854 REQ_SEND;
855}
856
857void
858aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
859 PPCODE:
860{
861 dREQ;
862
1823 req->type = REQ_MKDIR; 863 req->type = EIO_MKNOD;
1824 req->sv1 = newSVsv (pathname); 864 req->sv1 = newSVsv (pathname);
1825 req->ptr1 = SvPVbyte_nolen (req->sv1); 865 req->ptr1 = SvPVbyte_nolen (req->sv1);
1826 req->mode = mode;
1827
1828 REQ_SEND;
1829}
1830
1831void
1832aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1833 ALIAS:
1834 aio_link = REQ_LINK
1835 aio_symlink = REQ_SYMLINK
1836 aio_rename = REQ_RENAME
1837 PPCODE:
1838{
1839 dREQ;
1840
1841 req->type = ix;
1842 req->sv2 = newSVsv (oldpath);
1843 req->ptr2 = SvPVbyte_nolen (req->sv2);
1844 req->sv1 = newSVsv (newpath);
1845 req->ptr1 = SvPVbyte_nolen (req->sv1);
1846
1847 REQ_SEND;
1848}
1849
1850void
1851aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1852 PPCODE:
1853{
1854 dREQ;
1855
1856 req->type = REQ_MKNOD;
1857 req->sv1 = newSVsv (pathname);
1858 req->ptr1 = SvPVbyte_nolen (req->sv1);
1859 req->mode = (mode_t)mode; 866 req->int2 = (mode_t)mode;
1860 req->offs = dev; 867 req->offs = dev;
1861 868
1862 REQ_SEND; 869 REQ_SEND;
1863} 870}
1864 871
1866aio_busy (double delay, SV *callback=&PL_sv_undef) 873aio_busy (double delay, SV *callback=&PL_sv_undef)
1867 PPCODE: 874 PPCODE:
1868{ 875{
1869 dREQ; 876 dREQ;
1870 877
1871 req->type = REQ_BUSY; 878 req->type = EIO_BUSY;
1872 req->nv1 = delay < 0. ? 0. : delay; 879 req->nv1 = delay < 0. ? 0. : delay;
1873 880
1874 REQ_SEND; 881 REQ_SEND;
1875} 882}
1876 883
1879 PROTOTYPE: ;$ 886 PROTOTYPE: ;$
1880 PPCODE: 887 PPCODE:
1881{ 888{
1882 dREQ; 889 dREQ;
1883 890
1884 req->type = REQ_GROUP; 891 req->type = EIO_GROUP;
1885 892
1886 req_send (req); 893 eio_submit (req);
1887 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 894 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1888} 895}
1889 896
1890void 897void
1891aio_nop (SV *callback=&PL_sv_undef) 898aio_nop (SV *callback=&PL_sv_undef)
1892 ALIAS: 899 ALIAS:
1893 aio_nop = REQ_NOP 900 aio_nop = EIO_NOP
1894 aio_sync = REQ_SYNC 901 aio_sync = EIO_SYNC
1895 PPCODE: 902 PPCODE:
1896{ 903{
1897 dREQ; 904 dREQ;
1898 905
1899 req->type = ix; 906 req->type = ix;
1903 910
1904int 911int
1905aioreq_pri (int pri = 0) 912aioreq_pri (int pri = 0)
1906 PROTOTYPE: ;$ 913 PROTOTYPE: ;$
1907 CODE: 914 CODE:
1908 RETVAL = next_pri - PRI_BIAS; 915 RETVAL = next_pri;
1909 if (items > 0) 916 if (items > 0)
1910 { 917 {
1911 if (pri < PRI_MIN) pri = PRI_MIN; 918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1912 if (pri > PRI_MAX) pri = PRI_MAX; 919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1913 next_pri = pri + PRI_BIAS; 920 next_pri = pri;
1914 } 921 }
1915 OUTPUT: 922 OUTPUT:
1916 RETVAL 923 RETVAL
1917 924
1918void 925void
1919aioreq_nice (int nice = 0) 926aioreq_nice (int nice = 0)
1920 CODE: 927 CODE:
1921 nice = next_pri - nice; 928 nice = next_pri - nice;
1922 if (nice < PRI_MIN) nice = PRI_MIN; 929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1923 if (nice > PRI_MAX) nice = PRI_MAX; 930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1924 next_pri = nice + PRI_BIAS; 931 next_pri = nice;
1925 932
1926void 933void
1927flush () 934flush ()
1928 PROTOTYPE: 935 PROTOTYPE:
1929 CODE: 936 CODE:
1930 while (nreqs) 937 while (eio_nreqs ())
1931 { 938 {
1932 poll_wait (); 939 poll_wait ();
1933 poll_cb (); 940 poll_cb ();
1934 } 941 }
1935 942
1962poll_wait() 969poll_wait()
1963 PROTOTYPE: 970 PROTOTYPE:
1964 CODE: 971 CODE:
1965 poll_wait (); 972 poll_wait ();
1966 973
1967void
1968setsig (int signum = SIGIO)
1969 PROTOTYPE: ;$
1970 CODE:
1971{
1972 if (block_sig_level)
1973 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1974
1975 X_LOCK (reslock);
1976 main_tid = pthread_self ();
1977 main_sig = signum;
1978 X_UNLOCK (reslock);
1979
1980 if (main_sig && npending)
1981 pthread_kill (main_tid, main_sig);
1982}
1983
1984void
1985aio_block (SV *cb)
1986 PROTOTYPE: &
1987 PPCODE:
1988{
1989 int count;
1990
1991 block_sig ();
1992 PUSHMARK (SP);
1993 PUTBACK;
1994 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1995 unblock_sig ();
1996
1997 if (SvTRUE (ERRSV))
1998 croak (0);
1999
2000 XSRETURN (count);
2001}
2002
2003int 974int
2004nreqs() 975nreqs()
2005 PROTOTYPE: 976 PROTOTYPE:
2006 CODE: 977 CODE:
2007 RETVAL = nreqs; 978 RETVAL = eio_nreqs ();
2008 OUTPUT: 979 OUTPUT:
2009 RETVAL 980 RETVAL
2010 981
2011int 982int
2012nready() 983nready()
2013 PROTOTYPE: 984 PROTOTYPE:
2014 CODE: 985 CODE:
2015 RETVAL = get_nready (); 986 RETVAL = eio_nready ();
2016 OUTPUT: 987 OUTPUT:
2017 RETVAL 988 RETVAL
2018 989
2019int 990int
2020npending() 991npending()
2021 PROTOTYPE: 992 PROTOTYPE:
2022 CODE: 993 CODE:
2023 RETVAL = get_npending (); 994 RETVAL = eio_npending ();
2024 OUTPUT: 995 OUTPUT:
2025 RETVAL 996 RETVAL
2026 997
2027int 998int
2028nthreads() 999nthreads()
2029 PROTOTYPE: 1000 PROTOTYPE:
2030 CODE: 1001 CODE:
2031 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1002 RETVAL = eio_nthreads ();
2032 RETVAL = started;
2033 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
2034 OUTPUT: 1003 OUTPUT:
2035 RETVAL 1004 RETVAL
2036 1005
1006void _on_next_submit (SV *cb)
1007 CODE:
1008 SvREFCNT_dec (on_next_submit);
1009 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1010
2037PROTOTYPES: DISABLE 1011PROTOTYPES: DISABLE
2038 1012
2039MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1013MODULE = IO::AIO PACKAGE = IO::AIO::REQ
2040 1014
2041void 1015void
2042cancel (aio_req_ornot req) 1016cancel (aio_req_ornot req)
2043 CODE: 1017 CODE:
2044 req_cancel (req); 1018 eio_cancel (req);
2045 1019
2046void 1020void
2047cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
2048 CODE: 1022 CODE:
2049 SvREFCNT_dec (req->callback); 1023 SvREFCNT_dec (req->callback);
2054void 1028void
2055add (aio_req grp, ...) 1029add (aio_req grp, ...)
2056 PPCODE: 1030 PPCODE:
2057{ 1031{
2058 int i; 1032 int i;
2059 aio_req req;
2060
2061 if (main_sig && !block_sig_level)
2062 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2063 1033
2064 if (grp->int1 == 2) 1034 if (grp->int1 == 2)
2065 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1035 croak ("cannot add requests to IO::AIO::GRP after the group finished");
2066 1036
2067 for (i = 1; i < items; ++i ) 1037 for (i = 1; i < items; ++i )
2068 { 1038 {
1039 aio_req req;
1040
2069 if (GIMME_V != G_VOID) 1041 if (GIMME_V != G_VOID)
2070 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1042 XPUSHs (sv_2mortal (newSVsv (ST (i))));
2071 1043
2072 req = SvAIO_REQ (ST (i)); 1044 req = SvAIO_REQ (ST (i));
2073 1045
2074 if (req) 1046 if (req)
2075 { 1047 eio_grp_add (grp, req);
2076 ++grp->size;
2077 req->grp = grp;
2078
2079 req->grp_prev = 0;
2080 req->grp_next = grp->grp_first;
2081
2082 if (grp->grp_first)
2083 grp->grp_first->grp_prev = req;
2084
2085 grp->grp_first = req;
2086 }
2087 } 1048 }
2088} 1049}
2089 1050
2090void 1051void
2091cancel_subs (aio_req_ornot req) 1052cancel_subs (aio_req_ornot req)
2116 grp->errorno = errorno; 1077 grp->errorno = errorno;
2117 1078
2118void 1079void
2119limit (aio_req grp, int limit) 1080limit (aio_req grp, int limit)
2120 CODE: 1081 CODE:
2121 grp->int2 = limit; 1082 eio_grp_limit (grp, limit);
2122 aio_grp_feed (grp);
2123 1083
2124void 1084void
2125feed (aio_req grp, SV *callback=&PL_sv_undef) 1085feed (aio_req grp, SV *callback=&PL_sv_undef)
2126 CODE: 1086 CODE:
2127{ 1087{
2129 grp->sv2 = newSVsv (callback); 1089 grp->sv2 = newSVsv (callback);
2130 1090
2131 if (grp->int2 <= 0) 1091 if (grp->int2 <= 0)
2132 grp->int2 = 2; 1092 grp->int2 = 2;
2133 1093
2134 aio_grp_feed (grp); 1094 eio_grp_limit (grp, grp->int2);
2135} 1095}
2136 1096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines