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.113 by root, Wed Apr 16 16:45:18 2008 UTC vs.
Revision 1.116 by root, Sat May 10 19:25:33 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"
15#include <fcntl.h> 15#include <fcntl.h>
16#include <sched.h> 16#include <sched.h>
17 17
18#ifdef _WIN32 18#ifdef _WIN32
19 19
20# define SIGIO 0 20# define EIO_STRUCT_DIRENT Direntry_t
21 typedef Direntry_t X_DIRENT;
22#undef malloc 21# undef malloc
23#undef free 22# undef free
24 23
25// perl overrides all those nice win32 functions 24// perl overrides all those nice win32 functions
26# undef open 25# undef open
27# undef read 26# undef read
28# undef write 27# undef write
54# define closedir(fd) (errno = ENOSYS, -1) 53# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a) 54# define mkdir(a,b) mkdir (a)
56 55
57#else 56#else
58 57
59# include "autoconf/config.h"
60# include <sys/time.h> 58# include <sys/time.h>
61# include <sys/select.h> 59# include <sys/select.h>
62# include <unistd.h> 60# include <unistd.h>
63# include <utime.h> 61# include <utime.h>
64# include <signal.h> 62# include <signal.h>
65 typedef struct dirent X_DIRENT; 63# define EIO_STRUCT_DIRENT struct dirent
66 64
67#endif 65#endif
68 66
69#if HAVE_SENDFILE 67#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 68
95/* use NV for 32 bit perls as it allows larger offsets */ 69/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8 70#if IVSIZE >= 8
97# define SvVAL64 SvIV 71# define SvVAL64 SvIV
98#else 72#else
99# define SvVAL64 SvNV 73# define SvVAL64 SvNV
100#endif 74#endif
101 75
102static HV *stash; 76static 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 */ 77typedef 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 78
132#define AIO_REQ_KLASS "IO::AIO::REQ" 79#define AIO_REQ_KLASS "IO::AIO::REQ"
133#define AIO_GRP_KLASS "IO::AIO::GRP" 80#define AIO_GRP_KLASS "IO::AIO::GRP"
134 81
135typedef struct aio_cb 82#define EIO_COMMON \
136{
137 struct aio_cb *volatile next;
138
139 SV *callback; 83 SV *callback; \
140 SV *sv1, *sv2; 84 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; 85 STRLEN stroffset; \
148 int type; 86 SV *self
149 int int1, int2, int3;
150 int errorno;
151 mode_t mode; /* open */
152 87
153 unsigned char flags; 88#include "libeio/eio.h"
154 unsigned char pri;
155 89
156 SV *self; /* the perl counterpart of this request, if any */ 90static int req_invoke (eio_req *req);
157 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 91#define EIO_FINISH(req) req_invoke (req)
158} aio_cb; 92static void aio_grp_feed (eio_req *grp);
93#define EIO_FEED(req) aio_grp_feed (req)
94static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req)
159 96
160enum { 97enum {
161 FLAG_CANCELLED = 0x01, /* request was cancelled */
162 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
163 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
164}; 99};
165 100
101#include "libeio/eio.c"
102
166typedef aio_cb *aio_req; 103typedef eio_req *aio_req;
167typedef aio_cb *aio_req_ornot; 104typedef eio_req *aio_req_ornot;
168 105
169enum { 106static int max_outstanding = 0;
170 PRI_MIN = -4,
171 PRI_MAX = 4,
172 107
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; 108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;
225 109
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 }; 110static int respipe_osf [2], respipe [2] = { -1, -1 };
272 111
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); 112static void req_destroy (aio_req req);
377static void req_cancel (aio_req req); 113static void req_cancel (aio_req req);
114
115static void want_poll (void)
116{
117 /* write a dummy byte to the pipe so fh becomes ready */
118 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
119}
120
121static void done_poll (void)
122{
123 /* read any signals sent by the worker threads */
124 char buf [4];
125 while (respipe_read (respipe [0], buf, 4) == 4)
126 ;
127}
378 128
379/* must be called at most once */ 129/* must be called at most once */
380static SV *req_sv (aio_req req, const char *klass) 130static SV *req_sv (aio_req req, const char *klass)
381{ 131{
382 if (!req->self) 132 if (!req->self)
400 return mg ? (aio_req)mg->mg_ptr : 0; 150 return mg ? (aio_req)mg->mg_ptr : 0;
401} 151}
402 152
403static void aio_grp_feed (aio_req grp) 153static void aio_grp_feed (aio_req grp)
404{ 154{
405 block_sig (); 155 if (grp->sv2 && SvOK (grp->sv2))
406
407 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
408 { 156 {
409 int old_len = grp->size;
410
411 if (grp->sv2 && SvOK (grp->sv2))
412 {
413 dSP; 157 dSP;
414 158
415 ENTER; 159 ENTER;
416 SAVETMPS; 160 SAVETMPS;
417 PUSHMARK (SP); 161 PUSHMARK (SP);
418 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 162 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
419 PUTBACK; 163 PUTBACK;
420 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 164 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
421 SPAGAIN; 165 SPAGAIN;
422 FREETMPS; 166 FREETMPS;
423 LEAVE; 167 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 } 168 }
434
435 unblock_sig ();
436} 169}
437 170
438static void aio_grp_dec (aio_req grp)
439{
440 --grp->size;
441
442 /* call feeder, if applicable */
443 aio_grp_feed (grp);
444
445 /* finish, if done */
446 if (!grp->size && grp->int1)
447 {
448 block_sig ();
449
450 if (!req_invoke (grp))
451 {
452 req_destroy (grp);
453 unblock_sig ();
454 croak (0);
455 }
456
457 req_destroy (grp);
458 unblock_sig ();
459 }
460}
461
462static int req_invoke (aio_req req) 171static int req_invoke (eio_req *req)
463{ 172{
464 dSP; 173 dSP;
465 174
466 if (req->flags & FLAG_SV2_RO_OFF) 175 if (req->flags & FLAG_SV2_RO_OFF)
467 SvREADONLY_off (req->sv2); 176 SvREADONLY_off (req->sv2);
468 177
469 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 178 if (!EIO_CANCELLED (req) && SvOK (req->callback))
470 { 179 {
471 ENTER; 180 ENTER;
472 SAVETMPS; 181 SAVETMPS;
473 PUSHMARK (SP); 182 PUSHMARK (SP);
474 EXTEND (SP, 1); 183 EXTEND (SP, 1);
475 184
476 switch (req->type) 185 switch (req->type)
477 { 186 {
478 case REQ_READDIR: 187 case EIO_READDIR:
479 { 188 {
480 SV *rv = &PL_sv_undef; 189 SV *rv = &PL_sv_undef;
481 190
482 if (req->result >= 0) 191 if (req->result >= 0)
483 { 192 {
500 209
501 PUSHs (rv); 210 PUSHs (rv);
502 } 211 }
503 break; 212 break;
504 213
505 case REQ_OPEN: 214 case EIO_OPEN:
506 { 215 {
507 /* convert fd to fh */ 216 /* convert fd to fh */
508 SV *fh = &PL_sv_undef; 217 SV *fh = &PL_sv_undef;
509 218
510 if (req->result >= 0) 219 if (req->result >= 0)
531 240
532 PUSHs (fh); 241 PUSHs (fh);
533 } 242 }
534 break; 243 break;
535 244
536 case REQ_GROUP: 245 case EIO_GROUP:
537 req->int1 = 2; /* mark group as finished */ 246 req->int1 = 2; /* mark group as finished */
538 247
539 if (req->sv1) 248 if (req->sv1)
540 { 249 {
541 int i; 250 int i;
545 for (i = 0; i <= AvFILL (av); ++i) 254 for (i = 0; i <= AvFILL (av); ++i)
546 PUSHs (*av_fetch (av, i, 0)); 255 PUSHs (*av_fetch (av, i, 0));
547 } 256 }
548 break; 257 break;
549 258
550 case REQ_NOP: 259 case EIO_NOP:
551 case REQ_BUSY: 260 case EIO_BUSY:
552 break; 261 break;
553 262
554 case REQ_READLINK: 263 case EIO_READLINK:
555 if (req->result > 0) 264 if (req->result > 0)
556 { 265 {
557 SvCUR_set (req->sv2, req->result); 266 SvCUR_set (req->sv2, req->result);
558 *SvEND (req->sv2) = 0; 267 *SvEND (req->sv2) = 0;
559 PUSHs (req->sv2); 268 PUSHs (req->sv2);
560 } 269 }
561 break; 270 break;
562 271
563 case REQ_STAT: 272 case EIO_STAT:
564 case REQ_LSTAT: 273 case EIO_LSTAT:
565 case REQ_FSTAT: 274 case EIO_FSTAT:
566 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 275 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
567 PL_laststatval = req->result; 276 PL_laststatval = req->result;
568 PL_statcache = *(Stat_t *)(req->ptr2); 277 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
569 PUSHs (sv_2mortal (newSViv (req->result))); 278 PUSHs (sv_2mortal (newSViv (req->result)));
570 break; 279 break;
571 280
572 case REQ_READ: 281 case EIO_READ:
573 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 282 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
574 *SvEND (req->sv2) = 0; 283 *SvEND (req->sv2) = 0;
575 PUSHs (sv_2mortal (newSViv (req->result))); 284 PUSHs (sv_2mortal (newSViv (req->result)));
576 break; 285 break;
577 286
287 case EIO_DUP2:
288 if (req->result > 0)
289 req->result = 0;
290 /* FALLTHROUGH */
291
578 default: 292 default:
579 PUSHs (sv_2mortal (newSViv (req->result))); 293 PUSHs (sv_2mortal (newSViv (req->result)));
580 break; 294 break;
581 } 295 }
582 296
590 LEAVE; 304 LEAVE;
591 305
592 PUTBACK; 306 PUTBACK;
593 } 307 }
594 308
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); 309 return !!SvTRUE (ERRSV);
610} 310}
611 311
612static void req_destroy (aio_req req) 312static void req_destroy (aio_req req)
613{ 313{
614 if (req->self) 314 if (req->self)
619 319
620 SvREFCNT_dec (req->sv1); 320 SvREFCNT_dec (req->sv1);
621 SvREFCNT_dec (req->sv2); 321 SvREFCNT_dec (req->sv2);
622 SvREFCNT_dec (req->callback); 322 SvREFCNT_dec (req->callback);
623 323
624 if (req->flags & FLAG_PTR2_FREE)
625 free (req->ptr2);
626
627 Safefree (req); 324 Safefree (req);
628} 325}
629 326
630static void req_cancel_subs (aio_req grp) 327static void req_cancel_subs (aio_req grp)
631{ 328{
632 aio_req sub; 329 aio_req sub;
633 330
634 if (grp->type != REQ_GROUP) 331 if (grp->type != EIO_GROUP)
635 return; 332 return;
636 333
637 SvREFCNT_dec (grp->sv2); 334 SvREFCNT_dec (grp->sv2);
638 grp->sv2 = 0; 335 grp->sv2 = 0;
639 336
640 for (sub = grp->grp_first; sub; sub = sub->grp_next) 337 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} 338}
650 339
651#ifdef USE_SOCKETS_AS_HANDLES 340#ifdef USE_SOCKETS_AS_HANDLES
652# define TO_SOCKET(x) (win32_get_osfhandle (x)) 341# define TO_SOCKET(x) (win32_get_osfhandle (x))
653#else 342#else
690 379
691 respipe_osf [0] = TO_SOCKET (respipe [0]); 380 respipe_osf [0] = TO_SOCKET (respipe [0]);
692 respipe_osf [1] = TO_SOCKET (respipe [1]); 381 respipe_osf [1] = TO_SOCKET (respipe [1]);
693} 382}
694 383
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) 384static void poll_wait (void)
791{ 385{
792 fd_set rfd; 386 fd_set rfd;
793 387
794 while (nreqs) 388 while (eio_nreqs ())
795 { 389 {
796 int size; 390 int size;
797 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 391
392 X_LOCK (reslock);
798 size = res_queue.size; 393 size = res_queue.size;
799 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 394 X_UNLOCK (reslock);
800 395
801 if (size) 396 if (size)
802 return; 397 return;
803 398
804 maybe_start_thread (); 399 maybe_start_thread ();
810 } 405 }
811} 406}
812 407
813static int poll_cb (void) 408static int poll_cb (void)
814{ 409{
815 dSP; 410 int res;
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 411
822 if (max_poll_time) 412 do
823 gettimeofday (&tv_start, 0);
824
825 block_sig ();
826
827 for (;;)
828 { 413 {
829 for (;;) 414 res = eio_poll ();
830 {
831 maybe_start_thread ();
832 415
833 X_LOCK (reslock); 416 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); 417 croak (0);
868 }
869
870 count++;
871 }
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
890 poll_wait ();
891
892 ++maxreqs;
893 } 418 }
894 419 while (max_outstanding && max_outstanding <= eio_nreqs ());
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 420
925 return res; 421 return res;
926} 422}
927 423
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
1183static int
1184aio_close (int fd)
1185{
1186 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1187
1188 X_LOCK (wrklock);
1189
1190 if (close_pipe < 0)
1191 {
1192 int pipefd [2];
1193
1194 if (pipe (pipefd) < 0
1195 || close (pipefd [1]) < 0
1196 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
1197 {
1198 X_UNLOCK (wrklock);
1199 return -1;
1200 }
1201
1202 close_pipe = pipefd [0];
1203 }
1204
1205 X_UNLOCK (wrklock);
1206
1207 return dup2 (close_pipe, fd) < 0 ? -1 : 0;
1208}
1209
1210/*****************************************************************************/
1211
1212X_THREAD_PROC (aio_proc)
1213{
1214 aio_req req;
1215 struct timespec ts;
1216 worker *self = (worker *)thr_arg;
1217
1218 /* try to distribute timeouts somewhat randomly */
1219 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1220
1221 for (;;)
1222 {
1223 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1224
1225 X_LOCK (reqlock);
1226
1227 for (;;)
1228 {
1229 self->req = req = reqq_shift (&req_queue);
1230
1231 if (req)
1232 break;
1233
1234 ++idle;
1235
1236 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1237 == ETIMEDOUT)
1238 {
1239 if (idle > max_idle)
1240 {
1241 --idle;
1242 X_UNLOCK (reqlock);
1243 X_LOCK (wrklock);
1244 --started;
1245 X_UNLOCK (wrklock);
1246 goto quit;
1247 }
1248
1249 /* we are allowed to idle, so do so without any timeout */
1250 X_COND_WAIT (reqwait, reqlock);
1251 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1252 }
1253
1254 --idle;
1255 }
1256
1257 --nready;
1258
1259 X_UNLOCK (reqlock);
1260
1261 errno = 0; /* strictly unnecessary */
1262
1263 if (!(req->flags & FLAG_CANCELLED))
1264 switch (req->type)
1265 {
1266 case REQ_READ: req->result = req->offs >= 0
1267 ? pread (req->int1, req->ptr1, req->size, req->offs)
1268 : read (req->int1, req->ptr1, req->size); break;
1269 case REQ_WRITE: req->result = req->offs >= 0
1270 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1271 : write (req->int1, req->ptr1, req->size); break;
1272
1273 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1274 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1275
1276 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1277 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1278 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1279
1280 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1281 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1282 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1283 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1284 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1285 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1286
1287 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1288 case REQ_CLOSE: req->result = aio_close (req->int1); break;
1289 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1290 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1291 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1292 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1293 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1294 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1295 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1296 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1297
1298 case REQ_SYNC: req->result = 0; sync (); break;
1299 case REQ_FSYNC: req->result = fsync (req->int1); break;
1300 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1301
1302 case REQ_READDIR: scandir_ (req, self); break;
1303
1304 case REQ_BUSY:
1305#ifdef _WIN32
1306 Sleep (req->nv1 * 1000.);
1307#else
1308 {
1309 struct timeval tv;
1310
1311 tv.tv_sec = req->nv1;
1312 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1313
1314 req->result = select (0, 0, 0, 0, &tv);
1315 }
1316#endif
1317 break;
1318
1319 case REQ_UTIME:
1320 case REQ_FUTIME:
1321 {
1322 struct timeval tv[2];
1323 struct timeval *times;
1324
1325 if (req->nv1 != -1. || req->nv2 != -1.)
1326 {
1327 tv[0].tv_sec = req->nv1;
1328 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1329 tv[1].tv_sec = req->nv2;
1330 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1331
1332 times = tv;
1333 }
1334 else
1335 times = 0;
1336
1337
1338 req->result = req->type == REQ_FUTIME
1339 ? futimes (req->int1, times)
1340 : utimes (req->ptr1, times);
1341 }
1342
1343 case REQ_GROUP:
1344 case REQ_NOP:
1345 break;
1346
1347 case REQ_QUIT:
1348 goto quit;
1349
1350 default:
1351 req->result = -1;
1352 break;
1353 }
1354
1355 req->errorno = errno;
1356
1357 X_LOCK (reslock);
1358
1359 ++npending;
1360
1361 if (!reqq_push (&res_queue, req))
1362 {
1363 /* write a dummy byte to the pipe so fh becomes ready */
1364 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1365
1366 /* optionally signal the main thread asynchronously */
1367 if (main_sig)
1368 pthread_kill (main_tid, main_sig);
1369 }
1370
1371 self->req = 0;
1372 worker_clear (self);
1373
1374 X_UNLOCK (reslock);
1375 }
1376
1377quit:
1378 X_LOCK (wrklock);
1379 worker_free (self);
1380 X_UNLOCK (wrklock);
1381
1382 return 0;
1383}
1384
1385/*****************************************************************************/
1386
1387static void atfork_prepare (void)
1388{
1389 X_LOCK (wrklock);
1390 X_LOCK (reqlock);
1391 X_LOCK (reslock);
1392#if !HAVE_PREADWRITE
1393 X_LOCK (preadwritelock);
1394#endif
1395#if !HAVE_READDIR_R
1396 X_LOCK (readdirlock);
1397#endif
1398}
1399
1400static void atfork_parent (void)
1401{
1402#if !HAVE_READDIR_R
1403 X_UNLOCK (readdirlock);
1404#endif
1405#if !HAVE_PREADWRITE
1406 X_UNLOCK (preadwritelock);
1407#endif
1408 X_UNLOCK (reslock);
1409 X_UNLOCK (reqlock);
1410 X_UNLOCK (wrklock);
1411}
1412
1413static void atfork_child (void) 424static void atfork_child (void)
1414{ 425{
1415 aio_req prv;
1416
1417 while (prv = reqq_shift (&req_queue))
1418 req_destroy (prv);
1419
1420 while (prv = reqq_shift (&res_queue))
1421 req_destroy (prv);
1422
1423 while (wrk_first.next != &wrk_first)
1424 {
1425 worker *wrk = wrk_first.next;
1426
1427 if (wrk->req)
1428 req_destroy (wrk->req);
1429
1430 worker_clear (wrk);
1431 worker_free (wrk);
1432 }
1433
1434 started = 0;
1435 idle = 0;
1436 nreqs = 0;
1437 nready = 0;
1438 npending = 0;
1439
1440 create_respipe (); 426 create_respipe ();
1441
1442 atfork_parent ();
1443} 427}
1444 428
1445#define dREQ \ 429#define dREQ \
1446 aio_req req; \ 430 aio_req req; \
1447 int req_pri = next_pri; \ 431 int req_pri = next_pri; \
1448 next_pri = DEFAULT_PRI + PRI_BIAS; \ 432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \
1449 \ 433 \
1450 if (SvOK (callback) && !SvROK (callback)) \ 434 if (SvOK (callback) && !SvROK (callback)) \
1451 croak ("callback must be undef or of reference type"); \ 435 croak ("callback must be undef or of reference type"); \
1452 \ 436 \
1453 Newz (0, req, 1, aio_cb); \ 437 Newz (0, req, 1, eio_req); \
1454 if (!req) \ 438 if (!req) \
1455 croak ("out of memory during aio_req allocation"); \ 439 croak ("out of memory during eio_req allocation"); \
1456 \ 440 \
1457 req->callback = newSVsv (callback); \ 441 req->callback = newSVsv (callback); \
1458 req->pri = req_pri 442 req->pri = req_pri
1459 443
1460#define REQ_SEND \ 444#define REQ_SEND \
1461 req_send (req); \ 445 eio_submit (req); \
1462 \ 446 \
1463 if (GIMME_V != G_VOID) \ 447 if (GIMME_V != G_VOID) \
1464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 448 XPUSHs (req_sv (req, AIO_REQ_KLASS));
1465 449
1466MODULE = IO::AIO PACKAGE = IO::AIO 450MODULE = IO::AIO PACKAGE = IO::AIO
1485 X_MUTEX_CHECK (readdirlock); 469 X_MUTEX_CHECK (readdirlock);
1486 470
1487 X_COND_CHECK (reqwait); 471 X_COND_CHECK (reqwait);
1488#else 472#else
1489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1490 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1491#endif 474#endif
1492 475
1493 create_respipe (); 476 create_respipe ();
1494 477
1495 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 478 if (eio_init (want_poll, done_poll) < 0)
479 croak ("IO::AIO: unable to initialise eio library");
480
481 /* atfork child called in fifo order, so before eio's handler */
482 X_THREAD_ATFORK (0, 0, atfork_child);
1496} 483}
1497 484
1498void 485void
1499max_poll_reqs (int nreqs) 486max_poll_reqs (int nreqs)
1500 PROTOTYPE: $ 487 PROTOTYPE: $
1501 CODE: 488 CODE:
1502 max_poll_reqs = nreqs; 489 eio_set_max_poll_reqs (nreqs);
1503 490
1504void 491void
1505max_poll_time (double nseconds) 492max_poll_time (double nseconds)
1506 PROTOTYPE: $ 493 PROTOTYPE: $
1507 CODE: 494 CODE:
1508 max_poll_time = nseconds * AIO_TICKS; 495 eio_set_max_poll_time (nseconds);
1509 496
1510void 497void
1511min_parallel (int nthreads) 498min_parallel (int nthreads)
1512 PROTOTYPE: $ 499 PROTOTYPE: $
500 CODE:
501 eio_set_min_parallel (nthreads);
1513 502
1514void 503void
1515max_parallel (int nthreads) 504max_parallel (int nthreads)
1516 PROTOTYPE: $ 505 PROTOTYPE: $
506 CODE:
507 eio_set_max_parallel (nthreads);
1517 508
1518void 509void
1519max_idle (int nthreads) 510max_idle (int nthreads)
1520 PROTOTYPE: $ 511 PROTOTYPE: $
1521 CODE: 512 CODE:
1522 set_max_idle (nthreads); 513 eio_set_max_idle (nthreads);
1523 514
1524int 515void
1525max_outstanding (int maxreqs) 516max_outstanding (int maxreqs)
1526 PROTOTYPE: $ 517 PROTOTYPE: $
1527 CODE: 518 CODE:
1528 RETVAL = max_outstanding;
1529 max_outstanding = maxreqs; 519 max_outstanding = maxreqs;
1530 OUTPUT:
1531 RETVAL
1532 520
1533void 521void
1534aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 522aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1535 PROTOTYPE: $$$;$ 523 PROTOTYPE: $$$;$
1536 PPCODE: 524 PPCODE:
1537{ 525{
1538 dREQ; 526 dREQ;
1539 527
1540 req->type = REQ_OPEN; 528 req->type = EIO_OPEN;
1541 req->sv1 = newSVsv (pathname); 529 req->sv1 = newSVsv (pathname);
1542 req->ptr1 = SvPVbyte_nolen (req->sv1); 530 req->ptr1 = SvPVbyte_nolen (req->sv1);
1543 req->int1 = flags; 531 req->int1 = flags;
1544 req->mode = mode; 532 req->int2 = mode;
1545 533
1546 REQ_SEND; 534 REQ_SEND;
1547} 535}
1548 536
1549void 537void
1550aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 538aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1551 PROTOTYPE: $;$ 539 PROTOTYPE: $;$
1552 ALIAS: 540 ALIAS:
1553 aio_fsync = REQ_FSYNC 541 aio_fsync = EIO_FSYNC
1554 aio_fdatasync = REQ_FDATASYNC 542 aio_fdatasync = EIO_FDATASYNC
1555 PPCODE: 543 PPCODE:
1556{ 544{
1557 dREQ; 545 dREQ;
1558 546
1559 req->type = ix; 547 req->type = ix;
1566void 554void
1567aio_close (SV *fh, SV *callback=&PL_sv_undef) 555aio_close (SV *fh, SV *callback=&PL_sv_undef)
1568 PROTOTYPE: $;$ 556 PROTOTYPE: $;$
1569 PPCODE: 557 PPCODE:
1570{ 558{
559 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1571 dREQ; 560 dREQ;
1572 561
562 if (close_pipe < 0)
563 {
564 int pipefd [2];
565
566 if (pipe (pipefd) < 0
567 || close (pipefd [1]) < 0
568 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
569 abort (); /*D*/
570
571 close_pipe = pipefd [0];
572 }
573
1573 req->type = REQ_CLOSE; 574 req->type = EIO_DUP2;
575 req->int1 = close_pipe;
576 req->sv2 = newSVsv (fh);
1574 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 577 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1575 578
1576 REQ_SEND (req); 579 REQ_SEND (req);
1577} 580}
1578 581
1579void 582void
1580aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 583aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1581 ALIAS: 584 ALIAS:
1582 aio_read = REQ_READ 585 aio_read = EIO_READ
1583 aio_write = REQ_WRITE 586 aio_write = EIO_WRITE
1584 PROTOTYPE: $$$$$;$ 587 PROTOTYPE: $$$$$;$
1585 PPCODE: 588 PPCODE:
1586{ 589{
1587 STRLEN svlen; 590 STRLEN svlen;
1588 char *svptr = SvPVbyte (data, svlen); 591 char *svptr = SvPVbyte (data, svlen);
1595 dataoffset += svlen; 598 dataoffset += svlen;
1596 599
1597 if (dataoffset < 0 || dataoffset > svlen) 600 if (dataoffset < 0 || dataoffset > svlen)
1598 croak ("dataoffset outside of data scalar"); 601 croak ("dataoffset outside of data scalar");
1599 602
1600 if (ix == REQ_WRITE) 603 if (ix == EIO_WRITE)
1601 { 604 {
1602 /* write: check length and adjust. */ 605 /* write: check length and adjust. */
1603 if (!SvOK (length) || len + dataoffset > svlen) 606 if (!SvOK (length) || len + dataoffset > svlen)
1604 len = svlen - dataoffset; 607 len = svlen - dataoffset;
1605 } 608 }
1615 { 618 {
1616 dREQ; 619 dREQ;
1617 620
1618 req->type = ix; 621 req->type = ix;
1619 req->sv1 = newSVsv (fh); 622 req->sv1 = newSVsv (fh);
1620 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 623 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
1621 : IoOFP (sv_2io (fh))); 624 : IoOFP (sv_2io (fh)));
1622 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 625 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1623 req->size = len; 626 req->size = len;
1624 req->sv2 = SvREFCNT_inc (data); 627 req->sv2 = SvREFCNT_inc (data);
1625 req->ptr1 = (char *)svptr + dataoffset; 628 req->ptr2 = (char *)svptr + dataoffset;
1626 req->stroffset = dataoffset; 629 req->stroffset = dataoffset;
1627 630
1628 if (!SvREADONLY (data)) 631 if (!SvREADONLY (data))
1629 { 632 {
1630 SvREADONLY_on (data); 633 SvREADONLY_on (data);
1644 dREQ; 647 dREQ;
1645 648
1646 data = newSV (NAME_MAX); 649 data = newSV (NAME_MAX);
1647 SvPOK_on (data); 650 SvPOK_on (data);
1648 651
1649 req->type = REQ_READLINK; 652 req->type = EIO_READLINK;
1650 req->sv1 = newSVsv (path); 653 req->sv1 = newSVsv (path);
1651 req->ptr2 = SvPVbyte_nolen (req->sv1); 654 req->ptr1 = SvPVbyte_nolen (req->sv1);
1652 req->sv2 = data; 655 req->sv2 = data;
1653 req->ptr1 = SvPVbyte_nolen (data); 656 req->ptr2 = SvPVbyte_nolen (data);
1654 657
1655 REQ_SEND; 658 REQ_SEND;
1656} 659}
1657 660
1658void 661void
1660 PROTOTYPE: $$$$;$ 663 PROTOTYPE: $$$$;$
1661 PPCODE: 664 PPCODE:
1662{ 665{
1663 dREQ; 666 dREQ;
1664 667
1665 req->type = REQ_SENDFILE; 668 req->type = EIO_SENDFILE;
1666 req->sv1 = newSVsv (out_fh); 669 req->sv1 = newSVsv (out_fh);
1667 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 670 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1668 req->sv2 = newSVsv (in_fh); 671 req->sv2 = newSVsv (in_fh);
1669 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 672 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1670 req->offs = SvVAL64 (in_offset); 673 req->offs = SvVAL64 (in_offset);
1678 PROTOTYPE: $$$;$ 681 PROTOTYPE: $$$;$
1679 PPCODE: 682 PPCODE:
1680{ 683{
1681 dREQ; 684 dREQ;
1682 685
1683 req->type = REQ_READAHEAD; 686 req->type = EIO_READAHEAD;
1684 req->sv1 = newSVsv (fh); 687 req->sv1 = newSVsv (fh);
1685 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 688 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1686 req->offs = SvVAL64 (offset); 689 req->offs = SvVAL64 (offset);
1687 req->size = length; 690 req->size = length;
1688 691
1690} 693}
1691 694
1692void 695void
1693aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 696aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1694 ALIAS: 697 ALIAS:
1695 aio_stat = REQ_STAT 698 aio_stat = EIO_STAT
1696 aio_lstat = REQ_LSTAT 699 aio_lstat = EIO_LSTAT
1697 PPCODE: 700 PPCODE:
1698{ 701{
1699 dREQ; 702 dREQ;
1700 703
1701 req->ptr2 = malloc (sizeof (Stat_t)); 704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
1702 if (!req->ptr2) 705 if (!req->ptr2)
1703 { 706 {
1704 req_destroy (req); 707 req_destroy (req);
1705 croak ("out of memory during aio_stat statdata allocation"); 708 croak ("out of memory during aio_stat statdata allocation");
1706 } 709 }
1707 710
1708 req->flags |= FLAG_PTR2_FREE; 711 req->flags |= EIO_FLAG_PTR2_FREE;
1709 req->sv1 = newSVsv (fh_or_path); 712 req->sv1 = newSVsv (fh_or_path);
1710 713
1711 if (SvPOK (fh_or_path)) 714 if (SvPOK (fh_or_path))
1712 { 715 {
1713 req->type = ix; 716 req->type = ix;
1714 req->ptr1 = SvPVbyte_nolen (req->sv1); 717 req->ptr1 = SvPVbyte_nolen (req->sv1);
1715 } 718 }
1716 else 719 else
1717 { 720 {
1718 req->type = REQ_FSTAT; 721 req->type = EIO_FSTAT;
1719 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 722 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1720 } 723 }
1721 724
1722 REQ_SEND; 725 REQ_SEND;
1723} 726}
1732 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1733 req->sv1 = newSVsv (fh_or_path); 736 req->sv1 = newSVsv (fh_or_path);
1734 737
1735 if (SvPOK (fh_or_path)) 738 if (SvPOK (fh_or_path))
1736 { 739 {
1737 req->type = REQ_UTIME; 740 req->type = EIO_UTIME;
1738 req->ptr1 = SvPVbyte_nolen (req->sv1); 741 req->ptr1 = SvPVbyte_nolen (req->sv1);
1739 } 742 }
1740 else 743 else
1741 { 744 {
1742 req->type = REQ_FUTIME; 745 req->type = EIO_FUTIME;
1743 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 746 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1744 } 747 }
1745 748
1746 REQ_SEND; 749 REQ_SEND;
1747} 750}
1755 req->sv1 = newSVsv (fh_or_path); 758 req->sv1 = newSVsv (fh_or_path);
1756 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1757 760
1758 if (SvPOK (fh_or_path)) 761 if (SvPOK (fh_or_path))
1759 { 762 {
1760 req->type = REQ_TRUNCATE; 763 req->type = EIO_TRUNCATE;
1761 req->ptr1 = SvPVbyte_nolen (req->sv1); 764 req->ptr1 = SvPVbyte_nolen (req->sv1);
1762 } 765 }
1763 else 766 else
1764 { 767 {
1765 req->type = REQ_FTRUNCATE; 768 req->type = EIO_FTRUNCATE;
1766 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 769 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1767 } 770 }
1768 771
1769 REQ_SEND; 772 REQ_SEND;
1770} 773}
1771 774
1772void 775void
1773aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 776aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
777 ALIAS:
778 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR
1774 PPCODE: 781 PPCODE:
1775{ 782{
1776 dREQ; 783 dREQ;
1777 784
785 req->type = ix;
1778 req->mode = mode; 786 req->int2 = mode;
1779 req->sv1 = newSVsv (fh_or_path); 787 req->sv1 = newSVsv (fh_or_path);
1780 788
1781 if (SvPOK (fh_or_path)) 789 if (ix == EIO_FCHMOD)
1782 { 790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1783 req->type = REQ_CHMOD;
1784 req->ptr1 = SvPVbyte_nolen (req->sv1);
1785 }
1786 else 791 else
1787 { 792 req->ptr1 = SvPVbyte_nolen (req->sv1);
1788 req->type = REQ_FCHMOD;
1789 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1790 }
1791 793
1792 REQ_SEND; 794 REQ_SEND;
1793} 795}
1794 796
1795void 797void
1802 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 804 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1803 req->sv1 = newSVsv (fh_or_path); 805 req->sv1 = newSVsv (fh_or_path);
1804 806
1805 if (SvPOK (fh_or_path)) 807 if (SvPOK (fh_or_path))
1806 { 808 {
1807 req->type = REQ_CHOWN; 809 req->type = EIO_CHOWN;
1808 req->ptr1 = SvPVbyte_nolen (req->sv1); 810 req->ptr1 = SvPVbyte_nolen (req->sv1);
1809 } 811 }
1810 else 812 else
1811 { 813 {
1812 req->type = REQ_FCHOWN; 814 req->type = EIO_FCHOWN;
1813 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1814 } 816 }
1815 817
1816 REQ_SEND; 818 REQ_SEND;
1817} 819}
1818 820
1819void 821void
1820aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1821 ALIAS: 823 ALIAS:
1822 aio_unlink = REQ_UNLINK 824 aio_unlink = EIO_UNLINK
1823 aio_rmdir = REQ_RMDIR 825 aio_rmdir = EIO_RMDIR
1824 aio_readdir = REQ_READDIR 826 aio_readdir = EIO_READDIR
1825 PPCODE: 827 PPCODE:
1826{ 828{
1827 dREQ; 829 dREQ;
1828 830
1829 req->type = ix; 831 req->type = ix;
1832 834
1833 REQ_SEND; 835 REQ_SEND;
1834} 836}
1835 837
1836void 838void
1837aio_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
1838 PPCODE: 844 PPCODE:
1839{ 845{
1840 dREQ; 846 dREQ;
1841 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
1842 req->type = REQ_MKDIR; 863 req->type = EIO_MKNOD;
1843 req->sv1 = newSVsv (pathname); 864 req->sv1 = newSVsv (pathname);
1844 req->ptr1 = SvPVbyte_nolen (req->sv1); 865 req->ptr1 = SvPVbyte_nolen (req->sv1);
1845 req->mode = mode;
1846
1847 REQ_SEND;
1848}
1849
1850void
1851aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1852 ALIAS:
1853 aio_link = REQ_LINK
1854 aio_symlink = REQ_SYMLINK
1855 aio_rename = REQ_RENAME
1856 PPCODE:
1857{
1858 dREQ;
1859
1860 req->type = ix;
1861 req->sv2 = newSVsv (oldpath);
1862 req->ptr2 = SvPVbyte_nolen (req->sv2);
1863 req->sv1 = newSVsv (newpath);
1864 req->ptr1 = SvPVbyte_nolen (req->sv1);
1865
1866 REQ_SEND;
1867}
1868
1869void
1870aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1871 PPCODE:
1872{
1873 dREQ;
1874
1875 req->type = REQ_MKNOD;
1876 req->sv1 = newSVsv (pathname);
1877 req->ptr1 = SvPVbyte_nolen (req->sv1);
1878 req->mode = (mode_t)mode; 866 req->int2 = (mode_t)mode;
1879 req->offs = dev; 867 req->offs = dev;
1880 868
1881 REQ_SEND; 869 REQ_SEND;
1882} 870}
1883 871
1885aio_busy (double delay, SV *callback=&PL_sv_undef) 873aio_busy (double delay, SV *callback=&PL_sv_undef)
1886 PPCODE: 874 PPCODE:
1887{ 875{
1888 dREQ; 876 dREQ;
1889 877
1890 req->type = REQ_BUSY; 878 req->type = EIO_BUSY;
1891 req->nv1 = delay < 0. ? 0. : delay; 879 req->nv1 = delay < 0. ? 0. : delay;
1892 880
1893 REQ_SEND; 881 REQ_SEND;
1894} 882}
1895 883
1898 PROTOTYPE: ;$ 886 PROTOTYPE: ;$
1899 PPCODE: 887 PPCODE:
1900{ 888{
1901 dREQ; 889 dREQ;
1902 890
1903 req->type = REQ_GROUP; 891 req->type = EIO_GROUP;
1904 892
1905 req_send (req); 893 eio_submit (req);
1906 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 894 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1907} 895}
1908 896
1909void 897void
1910aio_nop (SV *callback=&PL_sv_undef) 898aio_nop (SV *callback=&PL_sv_undef)
1911 ALIAS: 899 ALIAS:
1912 aio_nop = REQ_NOP 900 aio_nop = EIO_NOP
1913 aio_sync = REQ_SYNC 901 aio_sync = EIO_SYNC
1914 PPCODE: 902 PPCODE:
1915{ 903{
1916 dREQ; 904 dREQ;
1917 905
1918 req->type = ix; 906 req->type = ix;
1922 910
1923int 911int
1924aioreq_pri (int pri = 0) 912aioreq_pri (int pri = 0)
1925 PROTOTYPE: ;$ 913 PROTOTYPE: ;$
1926 CODE: 914 CODE:
1927 RETVAL = next_pri - PRI_BIAS; 915 RETVAL = next_pri - EIO_PRI_BIAS;
1928 if (items > 0) 916 if (items > 0)
1929 { 917 {
1930 if (pri < PRI_MIN) pri = PRI_MIN; 918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1931 if (pri > PRI_MAX) pri = PRI_MAX; 919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1932 next_pri = pri + PRI_BIAS; 920 next_pri = pri + EIO_PRI_BIAS;
1933 } 921 }
1934 OUTPUT: 922 OUTPUT:
1935 RETVAL 923 RETVAL
1936 924
1937void 925void
1938aioreq_nice (int nice = 0) 926aioreq_nice (int nice = 0)
1939 CODE: 927 CODE:
1940 nice = next_pri - nice; 928 nice = next_pri - nice;
1941 if (nice < PRI_MIN) nice = PRI_MIN; 929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1942 if (nice > PRI_MAX) nice = PRI_MAX; 930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1943 next_pri = nice + PRI_BIAS; 931 next_pri = nice + EIO_PRI_BIAS;
1944 932
1945void 933void
1946flush () 934flush ()
1947 PROTOTYPE: 935 PROTOTYPE:
1948 CODE: 936 CODE:
1949 while (nreqs) 937 while (eio_nreqs ())
1950 { 938 {
1951 poll_wait (); 939 poll_wait ();
1952 poll_cb (); 940 poll_cb ();
1953 } 941 }
1954 942
1981poll_wait() 969poll_wait()
1982 PROTOTYPE: 970 PROTOTYPE:
1983 CODE: 971 CODE:
1984 poll_wait (); 972 poll_wait ();
1985 973
1986void
1987setsig (int signum = SIGIO)
1988 PROTOTYPE: ;$
1989 CODE:
1990{
1991 if (block_sig_level)
1992 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1993
1994 X_LOCK (reslock);
1995 main_tid = pthread_self ();
1996 main_sig = signum;
1997 X_UNLOCK (reslock);
1998
1999 if (main_sig && npending)
2000 pthread_kill (main_tid, main_sig);
2001}
2002
2003void
2004aio_block (SV *cb)
2005 PROTOTYPE: &
2006 PPCODE:
2007{
2008 int count;
2009
2010 block_sig ();
2011 PUSHMARK (SP);
2012 PUTBACK;
2013 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
2014 unblock_sig ();
2015
2016 if (SvTRUE (ERRSV))
2017 croak (0);
2018
2019 XSRETURN (count);
2020}
2021
2022int 974int
2023nreqs() 975nreqs()
2024 PROTOTYPE: 976 PROTOTYPE:
2025 CODE: 977 CODE:
2026 RETVAL = nreqs; 978 RETVAL = eio_nreqs ();
2027 OUTPUT: 979 OUTPUT:
2028 RETVAL 980 RETVAL
2029 981
2030int 982int
2031nready() 983nready()
2032 PROTOTYPE: 984 PROTOTYPE:
2033 CODE: 985 CODE:
2034 RETVAL = get_nready (); 986 RETVAL = eio_nready ();
2035 OUTPUT: 987 OUTPUT:
2036 RETVAL 988 RETVAL
2037 989
2038int 990int
2039npending() 991npending()
2040 PROTOTYPE: 992 PROTOTYPE:
2041 CODE: 993 CODE:
2042 RETVAL = get_npending (); 994 RETVAL = eio_npending ();
2043 OUTPUT: 995 OUTPUT:
2044 RETVAL 996 RETVAL
2045 997
2046int 998int
2047nthreads() 999nthreads()
2058MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ
2059 1011
2060void 1012void
2061cancel (aio_req_ornot req) 1013cancel (aio_req_ornot req)
2062 CODE: 1014 CODE:
2063 req_cancel (req); 1015 eio_cancel (req);
2064 1016
2065void 1017void
2066cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
2067 CODE: 1019 CODE:
2068 SvREFCNT_dec (req->callback); 1020 SvREFCNT_dec (req->callback);
2073void 1025void
2074add (aio_req grp, ...) 1026add (aio_req grp, ...)
2075 PPCODE: 1027 PPCODE:
2076{ 1028{
2077 int i; 1029 int i;
2078 aio_req req;
2079
2080 if (main_sig && !block_sig_level)
2081 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2082 1030
2083 if (grp->int1 == 2) 1031 if (grp->int1 == 2)
2084 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1032 croak ("cannot add requests to IO::AIO::GRP after the group finished");
2085 1033
2086 for (i = 1; i < items; ++i ) 1034 for (i = 1; i < items; ++i )
2087 { 1035 {
1036 aio_req req;
1037
2088 if (GIMME_V != G_VOID) 1038 if (GIMME_V != G_VOID)
2089 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1039 XPUSHs (sv_2mortal (newSVsv (ST (i))));
2090 1040
2091 req = SvAIO_REQ (ST (i)); 1041 req = SvAIO_REQ (ST (i));
2092 1042
2093 if (req) 1043 if (req)
2094 { 1044 eio_grp_add (grp, req);
2095 ++grp->size;
2096 req->grp = grp;
2097
2098 req->grp_prev = 0;
2099 req->grp_next = grp->grp_first;
2100
2101 if (grp->grp_first)
2102 grp->grp_first->grp_prev = req;
2103
2104 grp->grp_first = req;
2105 }
2106 } 1045 }
2107} 1046}
2108 1047
2109void 1048void
2110cancel_subs (aio_req_ornot req) 1049cancel_subs (aio_req_ornot req)
2135 grp->errorno = errorno; 1074 grp->errorno = errorno;
2136 1075
2137void 1076void
2138limit (aio_req grp, int limit) 1077limit (aio_req grp, int limit)
2139 CODE: 1078 CODE:
2140 grp->int2 = limit; 1079 eio_grp_limit (grp, limit);
2141 aio_grp_feed (grp);
2142 1080
2143void 1081void
2144feed (aio_req grp, SV *callback=&PL_sv_undef) 1082feed (aio_req grp, SV *callback=&PL_sv_undef)
2145 CODE: 1083 CODE:
2146{ 1084{
2148 grp->sv2 = newSVsv (callback); 1086 grp->sv2 = newSVsv (callback);
2149 1087
2150 if (grp->int2 <= 0) 1088 if (grp->int2 <= 0)
2151 grp->int2 = 2; 1089 grp->int2 = 2;
2152 1090
2153 aio_grp_feed (grp); 1091 eio_grp_limit (grp, grp->int2);
2154} 1092}
2155 1093

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines