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.109 by root, Sat Oct 6 14:05:19 2007 UTC vs.
Revision 1.120 by root, Sun May 11 19:17:09 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_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_COMMON \
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#include "libeio/eio.h"
154 unsigned char pri;
155 92
156 SV *self; /* the perl counterpart of this request, if any */ 93static int req_invoke (eio_req *req);
157 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 94#define EIO_FINISH(req) req_invoke (req)
158} aio_cb; 95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req)
159 99
160enum { 100enum {
161 FLAG_CANCELLED = 0x01, /* request was cancelled */
162 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
163 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
164}; 102};
165 103
104#include "libeio/eio.c"
105
166typedef aio_cb *aio_req; 106typedef eio_req *aio_req;
167typedef aio_cb *aio_req_ornot; 107typedef eio_req *aio_req_ornot;
168 108
169enum { 109static SV *on_next_submit;
170 PRI_MIN = -4,
171 PRI_MAX = 4,
172
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 ()
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 ()
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; 110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;
111static int max_outstanding;
225 112
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 }; 113static int respipe_osf [2], respipe [2] = { -1, -1 };
272 114
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 ()
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 ()
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 ()
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 ();
375static int req_invoke (aio_req req);
376static void req_destroy (aio_req req); 115static void req_destroy (aio_req req);
377static void req_cancel (aio_req req); 116static void req_cancel (aio_req req);
117
118static void want_poll (void)
119{
120 /* write a dummy byte to the pipe so fh becomes ready */
121 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
122}
123
124static void done_poll (void)
125{
126 /* read any signals sent by the worker threads */
127 char buf [4];
128 while (respipe_read (respipe [0], buf, 4) == 4)
129 ;
130}
378 131
379/* must be called at most once */ 132/* must be called at most once */
380static SV *req_sv (aio_req req, const char *klass) 133static SV *req_sv (aio_req req, const char *klass)
381{ 134{
382 if (!req->self) 135 if (!req->self)
… …
400 return mg ? (aio_req)mg->mg_ptr : 0; 153 return mg ? (aio_req)mg->mg_ptr : 0;
401} 154}
402 155
403static void aio_grp_feed (aio_req grp) 156static void aio_grp_feed (aio_req grp)
404{ 157{
405 block_sig (); 158 if (grp->sv2 && SvOK (grp->sv2))
406
407 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
408 { 159 {
409 int old_len = grp->size;
410
411 if (grp->sv2 && SvOK (grp->sv2))
412 {
413 dSP; 160 dSP;
414 161
415 ENTER; 162 ENTER;
416 SAVETMPS; 163 SAVETMPS;
417 PUSHMARK (SP); 164 PUSHMARK (SP);
418 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 165 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
419 PUTBACK; 166 PUTBACK;
420 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 167 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
421 SPAGAIN; 168 SPAGAIN;
422 FREETMPS; 169 FREETMPS;
423 LEAVE; 170 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 } 171 }
434
435 unblock_sig ();
436} 172}
437 173
438static void aio_grp_dec (aio_req grp) 174static void req_submit (eio_req *req)
439{ 175{
440 --grp->size; 176 eio_submit (req);
441 177
442 /* call feeder, if applicable */ 178 if (on_next_submit)
443 aio_grp_feed (grp);
444
445 /* finish, if done */
446 if (!grp->size && grp->int1)
447 { 179 {
448 block_sig (); 180 dSP;
181 SV *cb = sv_2mortal (on_next_submit);
449 182
450 if (!req_invoke (grp)) 183 on_next_submit = 0;
451 {
452 req_destroy (grp);
453 unblock_sig ();
454 croak (0);
455 }
456 184
457 req_destroy (grp); 185 PUSHMARK (SP);
458 unblock_sig (); 186 PUTBACK;
187 call_sv (cb, G_DISCARD | G_EVAL);
459 } 188 }
460} 189}
461 190
462static int req_invoke (aio_req req) 191static int req_invoke (eio_req *req)
463{ 192{
464 dSP; 193 dSP;
465 194
466 if (req->flags & FLAG_SV2_RO_OFF) 195 if (req->flags & FLAG_SV2_RO_OFF)
467 SvREADONLY_off (req->sv2); 196 SvREADONLY_off (req->sv2);
468 197
469 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 198 if (!EIO_CANCELLED (req) && SvOK (req->callback))
470 { 199 {
471 ENTER; 200 ENTER;
472 SAVETMPS; 201 SAVETMPS;
473 PUSHMARK (SP); 202 PUSHMARK (SP);
474 EXTEND (SP, 1); 203 EXTEND (SP, 1);
475 204
476 switch (req->type) 205 switch (req->type)
477 { 206 {
478 case REQ_READDIR: 207 case EIO_READDIR:
479 { 208 {
480 SV *rv = &PL_sv_undef; 209 SV *rv = &PL_sv_undef;
481 210
482 if (req->result >= 0) 211 if (req->result >= 0)
483 { 212 {
… …
500 229
501 PUSHs (rv); 230 PUSHs (rv);
502 } 231 }
503 break; 232 break;
504 233
505 case REQ_OPEN: 234 case EIO_OPEN:
506 { 235 {
507 /* convert fd to fh */ 236 /* convert fd to fh */
508 SV *fh = &PL_sv_undef; 237 SV *fh = &PL_sv_undef;
509 238
510 if (req->result >= 0) 239 if (req->result >= 0)
… …
531 260
532 PUSHs (fh); 261 PUSHs (fh);
533 } 262 }
534 break; 263 break;
535 264
536 case REQ_GROUP: 265 case EIO_GROUP:
537 req->int1 = 2; /* mark group as finished */ 266 req->int1 = 2; /* mark group as finished */
538 267
539 if (req->sv1) 268 if (req->sv1)
540 { 269 {
541 int i; 270 int i;
… …
545 for (i = 0; i <= AvFILL (av); ++i) 274 for (i = 0; i <= AvFILL (av); ++i)
546 PUSHs (*av_fetch (av, i, 0)); 275 PUSHs (*av_fetch (av, i, 0));
547 } 276 }
548 break; 277 break;
549 278
550 case REQ_NOP: 279 case EIO_NOP:
551 case REQ_BUSY: 280 case EIO_BUSY:
552 break; 281 break;
553 282
554 case REQ_READLINK: 283 case EIO_READLINK:
555 if (req->result > 0) 284 if (req->result > 0)
556 { 285 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; 286 break;
562 287
563 case REQ_STAT: 288 case EIO_STAT:
564 case REQ_LSTAT: 289 case EIO_LSTAT:
565 case REQ_FSTAT: 290 case EIO_FSTAT:
566 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 291 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
567 PL_laststatval = req->result; 292 PL_laststatval = req->result;
568 PL_statcache = *(Stat_t *)(req->ptr2); 293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
569 PUSHs (sv_2mortal (newSViv (req->result))); 294 PUSHs (sv_2mortal (newSViv (req->result)));
570 break; 295 break;
571 296
572 case REQ_READ: 297 case EIO_READ:
573 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 298 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
574 *SvEND (req->sv2) = 0; 299 *SvEND (req->sv2) = 0;
575 PUSHs (sv_2mortal (newSViv (req->result))); 300 PUSHs (sv_2mortal (newSViv (req->result)));
576 break; 301 break;
577 302
303 case EIO_DUP2:
304 if (req->result > 0)
305 req->result = 0;
306 /* FALLTHROUGH */
307
578 default: 308 default:
579 PUSHs (sv_2mortal (newSViv (req->result))); 309 PUSHs (sv_2mortal (newSViv (req->result)));
580 break; 310 break;
581 } 311 }
582 312
… …
590 LEAVE; 320 LEAVE;
591 321
592 PUTBACK; 322 PUTBACK;
593 } 323 }
594 324
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); 325 return !!SvTRUE (ERRSV);
610} 326}
611 327
612static void req_destroy (aio_req req) 328static void req_destroy (aio_req req)
613{ 329{
614 if (req->self) 330 if (req->self)
… …
619 335
620 SvREFCNT_dec (req->sv1); 336 SvREFCNT_dec (req->sv1);
621 SvREFCNT_dec (req->sv2); 337 SvREFCNT_dec (req->sv2);
622 SvREFCNT_dec (req->callback); 338 SvREFCNT_dec (req->callback);
623 339
624 if (req->flags & FLAG_PTR2_FREE)
625 free (req->ptr2);
626
627 Safefree (req); 340 Safefree (req);
628} 341}
629 342
630static void req_cancel_subs (aio_req grp) 343static void req_cancel_subs (aio_req grp)
631{ 344{
632 aio_req sub; 345 aio_req sub;
633 346
634 if (grp->type != REQ_GROUP) 347 if (grp->type != EIO_GROUP)
635 return; 348 return;
636 349
637 SvREFCNT_dec (grp->sv2); 350 SvREFCNT_dec (grp->sv2);
638 grp->sv2 = 0; 351 grp->sv2 = 0;
639 352
640 for (sub = grp->grp_first; sub; sub = sub->grp_next) 353 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} 354}
650 355
651#ifdef USE_SOCKETS_AS_HANDLES 356#ifdef USE_SOCKETS_AS_HANDLES
652# define TO_SOCKET(x) (win32_get_osfhandle (x)) 357# define TO_SOCKET(x) (win32_get_osfhandle (x))
653#else 358#else
654# define TO_SOCKET(x) (x) 359# define TO_SOCKET(x) (x)
655#endif 360#endif
656 361
657static void 362static void
658create_respipe () 363create_respipe (void)
659{ 364{
660 int old_readfd = respipe [0]; 365 int old_readfd = respipe [0];
661 366
662 if (respipe [1] >= 0) 367 if (respipe [1] >= 0)
663 respipe_close (TO_SOCKET (respipe [1])); 368 respipe_close (TO_SOCKET (respipe [1]));
… …
690 395
691 respipe_osf [0] = TO_SOCKET (respipe [0]); 396 respipe_osf [0] = TO_SOCKET (respipe [0]);
692 respipe_osf [1] = TO_SOCKET (respipe [1]); 397 respipe_osf [1] = TO_SOCKET (respipe [1]);
693} 398}
694 399
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 ()
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 () 400static void poll_wait (void)
791{ 401{
792 fd_set rfd; 402 fd_set rfd;
793 403
794 while (nreqs) 404 while (eio_nreqs ())
795 { 405 {
796 int size; 406 int size;
797 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 407
408 X_LOCK (reslock);
798 size = res_queue.size; 409 size = res_queue.size;
799 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 410 X_UNLOCK (reslock);
800 411
801 if (size) 412 if (size)
802 return; 413 return;
803 414
804 maybe_start_thread (); 415 maybe_start_thread ();
… …
808 419
809 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
810 } 421 }
811} 422}
812 423
813static int poll_cb () 424static int poll_cb (void)
814{ 425{
815 dSP; 426 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 427
822 if (max_poll_time) 428 do
823 gettimeofday (&tv_start, 0);
824
825 block_sig ();
826
827 for (;;)
828 { 429 {
829 for (;;) 430 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
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 } 434 }
894 435 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 436
925 return res; 437 return res;
926} 438}
927 439
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 {//D
1188 aio_req req;
1189 struct timespec ts;
1190 worker *self = (worker *)thr_arg;
1191
1192 /* try to distribute timeouts somewhat randomly */
1193 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1194
1195 for (;;)
1196 {
1197 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1198
1199 X_LOCK (reqlock);
1200
1201 for (;;)
1202 {
1203 self->req = req = reqq_shift (&req_queue);
1204
1205 if (req)
1206 break;
1207
1208 ++idle;
1209
1210 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1211 == ETIMEDOUT)
1212 {
1213 if (idle > max_idle)
1214 {
1215 --idle;
1216 X_UNLOCK (reqlock);
1217 X_LOCK (wrklock);
1218 --started;
1219 X_UNLOCK (wrklock);
1220 goto quit;
1221 }
1222
1223 /* we are allowed to idle, so do so without any timeout */
1224 X_COND_WAIT (reqwait, reqlock);
1225 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1226 }
1227
1228 --idle;
1229 }
1230
1231 --nready;
1232
1233 X_UNLOCK (reqlock);
1234
1235 errno = 0; /* strictly unnecessary */
1236
1237 if (!(req->flags & FLAG_CANCELLED))
1238 switch (req->type)
1239 {
1240 case REQ_READ: req->result = req->offs >= 0
1241 ? pread (req->int1, req->ptr1, req->size, req->offs)
1242 : read (req->int1, req->ptr1, req->size); break;
1243 case REQ_WRITE: req->result = req->offs >= 0
1244 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1245 : write (req->int1, req->ptr1, req->size); break;
1246
1247 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1248 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1249
1250 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1251 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1252 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1253
1254 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1255 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1256 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1257 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1258 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1259 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1260
1261 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1262 case REQ_CLOSE: req->result = close (req->int1); break;
1263 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1264 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1265 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1266 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1267 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1268 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1269 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1270 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1271
1272 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1273 case REQ_FSYNC: req->result = fsync (req->int1); break;
1274 case REQ_READDIR: scandir_ (req, self); break;
1275
1276 case REQ_BUSY:
1277#ifdef _WIN32
1278 Sleep (req->nv1 * 1000.);
1279#else
1280 {
1281 struct timeval tv;
1282
1283 tv.tv_sec = req->nv1;
1284 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1285
1286 req->result = select (0, 0, 0, 0, &tv);
1287 }
1288#endif
1289 break;
1290
1291 case REQ_UTIME:
1292 case REQ_FUTIME:
1293 {
1294 struct timeval tv[2];
1295 struct timeval *times;
1296
1297 if (req->nv1 != -1. || req->nv2 != -1.)
1298 {
1299 tv[0].tv_sec = req->nv1;
1300 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1301 tv[1].tv_sec = req->nv2;
1302 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1303
1304 times = tv;
1305 }
1306 else
1307 times = 0;
1308
1309
1310 req->result = req->type == REQ_FUTIME
1311 ? futimes (req->int1, times)
1312 : utimes (req->ptr1, times);
1313 }
1314
1315 case REQ_GROUP:
1316 case REQ_NOP:
1317 break;
1318
1319 case REQ_QUIT:
1320 goto quit;
1321
1322 default:
1323 req->result = -1;
1324 break;
1325 }
1326
1327 req->errorno = errno;
1328
1329 X_LOCK (reslock);
1330
1331 ++npending;
1332
1333 if (!reqq_push (&res_queue, req))
1334 {
1335 /* write a dummy byte to the pipe so fh becomes ready */
1336 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1337
1338 /* optionally signal the main thread asynchronously */
1339 if (main_sig)
1340 pthread_kill (main_tid, main_sig);
1341 }
1342
1343 self->req = 0;
1344 worker_clear (self);
1345
1346 X_UNLOCK (reslock);
1347 }
1348
1349quit:
1350 X_LOCK (wrklock);
1351 worker_free (self);
1352 X_UNLOCK (wrklock);
1353
1354 return 0;
1355 }//D
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}
1385
1386static void atfork_child (void) 440static void atfork_child (void)
1387{ 441{
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 (); 442 create_respipe ();
1414
1415 atfork_parent ();
1416} 443}
1417 444
1418#define dREQ \ 445#define dREQ \
1419 aio_req req; \ 446 aio_req req; \
1420 int req_pri = next_pri; \ 447 int req_pri = next_pri; \
1421 next_pri = DEFAULT_PRI + PRI_BIAS; \ 448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \
1422 \ 449 \
1423 if (SvOK (callback) && !SvROK (callback)) \ 450 if (SvOK (callback) && !SvROK (callback)) \
1424 croak ("callback must be undef or of reference type"); \ 451 croak ("callback must be undef or of reference type"); \
1425 \ 452 \
1426 Newz (0, req, 1, aio_cb); \ 453 Newz (0, req, 1, eio_req); \
1427 if (!req) \ 454 if (!req) \
1428 croak ("out of memory during aio_req allocation"); \ 455 croak ("out of memory during eio_req allocation"); \
1429 \ 456 \
1430 req->callback = newSVsv (callback); \ 457 req->callback = newSVsv (callback); \
1431 req->pri = req_pri 458 req->pri = req_pri
1432 459
1433#define REQ_SEND \ 460#define REQ_SEND \
1434 req_send (req); \ 461 req_submit (req); \
1435 \ 462 \
1436 if (GIMME_V != G_VOID) \ 463 if (GIMME_V != G_VOID) \
1437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 464 XPUSHs (req_sv (req, AIO_REQ_KLASS));
1438 465
1439MODULE = IO::AIO PACKAGE = IO::AIO 466MODULE = IO::AIO PACKAGE = IO::AIO
… …
1458 X_MUTEX_CHECK (readdirlock); 485 X_MUTEX_CHECK (readdirlock);
1459 486
1460 X_COND_CHECK (reqwait); 487 X_COND_CHECK (reqwait);
1461#else 488#else
1462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1463 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1464#endif 490#endif
1465 491
1466 create_respipe (); 492 create_respipe ();
1467 493
1468 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 494 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library");
496
497 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child);
1469} 499}
1470 500
1471void 501void
1472max_poll_reqs (int nreqs) 502max_poll_reqs (int nreqs)
1473 PROTOTYPE: $ 503 PROTOTYPE: $
1474 CODE: 504 CODE:
1475 max_poll_reqs = nreqs; 505 eio_set_max_poll_reqs (nreqs);
1476 506
1477void 507void
1478max_poll_time (double nseconds) 508max_poll_time (double nseconds)
1479 PROTOTYPE: $ 509 PROTOTYPE: $
1480 CODE: 510 CODE:
1481 max_poll_time = nseconds * AIO_TICKS; 511 eio_set_max_poll_time (nseconds);
1482 512
1483void 513void
1484min_parallel (int nthreads) 514min_parallel (int nthreads)
1485 PROTOTYPE: $ 515 PROTOTYPE: $
516 CODE:
517 eio_set_min_parallel (nthreads);
1486 518
1487void 519void
1488max_parallel (int nthreads) 520max_parallel (int nthreads)
1489 PROTOTYPE: $ 521 PROTOTYPE: $
522 CODE:
523 eio_set_max_parallel (nthreads);
1490 524
1491void 525void
1492max_idle (int nthreads) 526max_idle (int nthreads)
1493 PROTOTYPE: $ 527 PROTOTYPE: $
1494 CODE: 528 CODE:
1495 set_max_idle (nthreads); 529 eio_set_max_idle (nthreads);
1496 530
1497int 531void
1498max_outstanding (int maxreqs) 532max_outstanding (int maxreqs)
1499 PROTOTYPE: $ 533 PROTOTYPE: $
1500 CODE: 534 CODE:
1501 RETVAL = max_outstanding;
1502 max_outstanding = maxreqs; 535 max_outstanding = maxreqs;
1503 OUTPUT:
1504 RETVAL
1505 536
1506void 537void
1507aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 538aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1508 PROTOTYPE: $$$;$ 539 PROTOTYPE: $$$;$
1509 PPCODE: 540 PPCODE:
1510{ 541{
1511 dREQ; 542 dREQ;
1512 543
1513 req->type = REQ_OPEN; 544 req->type = EIO_OPEN;
1514 req->sv1 = newSVsv (pathname); 545 req->sv1 = newSVsv (pathname);
1515 req->ptr1 = SvPVbyte_nolen (req->sv1); 546 req->ptr1 = SvPVbyte_nolen (req->sv1);
1516 req->int1 = flags; 547 req->int1 = flags;
1517 req->mode = mode; 548 req->int2 = mode;
1518 549
1519 REQ_SEND; 550 REQ_SEND;
1520} 551}
1521 552
1522void 553void
1523aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 554aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1524 PROTOTYPE: $;$ 555 PROTOTYPE: $;$
1525 ALIAS: 556 ALIAS:
1526 aio_fsync = REQ_FSYNC 557 aio_fsync = EIO_FSYNC
1527 aio_fdatasync = REQ_FDATASYNC 558 aio_fdatasync = EIO_FDATASYNC
1528 PPCODE: 559 PPCODE:
1529{ 560{
1530 dREQ; 561 dREQ;
1531 562
1532 req->type = ix; 563 req->type = ix;
… …
1534 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1535 566
1536 REQ_SEND (req); 567 REQ_SEND (req);
1537} 568}
1538 569
1539int
1540_dup (int fd)
1541 PROTOTYPE: $
1542 CODE:
1543 RETVAL = dup (fd);
1544 OUTPUT:
1545 RETVAL
1546
1547void 570void
1548_aio_close (int fd, SV *callback=&PL_sv_undef) 571aio_close (SV *fh, SV *callback=&PL_sv_undef)
1549 PROTOTYPE: $;$ 572 PROTOTYPE: $;$
1550 PPCODE: 573 PPCODE:
1551{ 574{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1552 dREQ; 576 dREQ;
1553 577
578 if (close_pipe < 0)
579 {
580 int pipefd [2];
581
582 if (pipe (pipefd) < 0
583 || close (pipefd [1]) < 0
584 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
585 abort (); /*D*/
586
587 close_pipe = pipefd [0];
588 }
589
1554 req->type = REQ_CLOSE; 590 req->type = EIO_DUP2;
1555 req->int1 = fd; 591 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1556 594
1557 REQ_SEND (req); 595 REQ_SEND (req);
1558} 596}
1559 597
1560void 598void
1561aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 599aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1562 ALIAS: 600 ALIAS:
1563 aio_read = REQ_READ 601 aio_read = EIO_READ
1564 aio_write = REQ_WRITE 602 aio_write = EIO_WRITE
1565 PROTOTYPE: $$$$$;$ 603 PROTOTYPE: $$$$$;$
1566 PPCODE: 604 PPCODE:
1567{ 605{
1568 STRLEN svlen; 606 STRLEN svlen;
1569 char *svptr = SvPVbyte (data, svlen); 607 char *svptr = SvPVbyte (data, svlen);
… …
1576 dataoffset += svlen; 614 dataoffset += svlen;
1577 615
1578 if (dataoffset < 0 || dataoffset > svlen) 616 if (dataoffset < 0 || dataoffset > svlen)
1579 croak ("dataoffset outside of data scalar"); 617 croak ("dataoffset outside of data scalar");
1580 618
1581 if (ix == REQ_WRITE) 619 if (ix == EIO_WRITE)
1582 { 620 {
1583 /* write: check length and adjust. */ 621 /* write: check length and adjust. */
1584 if (!SvOK (length) || len + dataoffset > svlen) 622 if (!SvOK (length) || len + dataoffset > svlen)
1585 len = svlen - dataoffset; 623 len = svlen - dataoffset;
1586 } 624 }
… …
1596 { 634 {
1597 dREQ; 635 dREQ;
1598 636
1599 req->type = ix; 637 req->type = ix;
1600 req->sv1 = newSVsv (fh); 638 req->sv1 = newSVsv (fh);
1601 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
1602 : IoOFP (sv_2io (fh))); 640 : IoOFP (sv_2io (fh)));
1603 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1604 req->size = len; 642 req->size = len;
1605 req->sv2 = SvREFCNT_inc (data); 643 req->sv2 = SvREFCNT_inc (data);
1606 req->ptr1 = (char *)svptr + dataoffset; 644 req->ptr2 = (char *)svptr + dataoffset;
1607 req->stroffset = dataoffset; 645 req->stroffset = dataoffset;
1608 646
1609 if (!SvREADONLY (data)) 647 if (!SvREADONLY (data))
1610 { 648 {
1611 SvREADONLY_on (data); 649 SvREADONLY_on (data);
… …
1622 PPCODE: 660 PPCODE:
1623{ 661{
1624 SV *data; 662 SV *data;
1625 dREQ; 663 dREQ;
1626 664
1627 data = newSV (NAME_MAX);
1628 SvPOK_on (data);
1629
1630 req->type = REQ_READLINK; 665 req->type = EIO_READLINK;
1631 req->sv1 = newSVsv (path); 666 req->sv1 = newSVsv (path);
1632 req->ptr2 = SvPVbyte_nolen (req->sv1); 667 req->ptr1 = SvPVbyte_nolen (req->sv1);
1633 req->sv2 = data;
1634 req->ptr1 = SvPVbyte_nolen (data);
1635 668
1636 REQ_SEND; 669 REQ_SEND;
1637} 670}
1638 671
1639void 672void
… …
1641 PROTOTYPE: $$$$;$ 674 PROTOTYPE: $$$$;$
1642 PPCODE: 675 PPCODE:
1643{ 676{
1644 dREQ; 677 dREQ;
1645 678
1646 req->type = REQ_SENDFILE; 679 req->type = EIO_SENDFILE;
1647 req->sv1 = newSVsv (out_fh); 680 req->sv1 = newSVsv (out_fh);
1648 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1649 req->sv2 = newSVsv (in_fh); 682 req->sv2 = newSVsv (in_fh);
1650 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1651 req->offs = SvVAL64 (in_offset); 684 req->offs = SvVAL64 (in_offset);
… …
1659 PROTOTYPE: $$$;$ 692 PROTOTYPE: $$$;$
1660 PPCODE: 693 PPCODE:
1661{ 694{
1662 dREQ; 695 dREQ;
1663 696
1664 req->type = REQ_READAHEAD; 697 req->type = EIO_READAHEAD;
1665 req->sv1 = newSVsv (fh); 698 req->sv1 = newSVsv (fh);
1666 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1667 req->offs = SvVAL64 (offset); 700 req->offs = SvVAL64 (offset);
1668 req->size = length; 701 req->size = length;
1669 702
… …
1671} 704}
1672 705
1673void 706void
1674aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 707aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1675 ALIAS: 708 ALIAS:
1676 aio_stat = REQ_STAT 709 aio_stat = EIO_STAT
1677 aio_lstat = REQ_LSTAT 710 aio_lstat = EIO_LSTAT
1678 PPCODE: 711 PPCODE:
1679{ 712{
1680 dREQ; 713 dREQ;
1681 714
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); 715 req->sv1 = newSVsv (fh_or_path);
1691 716
1692 if (SvPOK (fh_or_path)) 717 if (SvPOK (req->sv1))
1693 { 718 {
1694 req->type = ix; 719 req->type = ix;
1695 req->ptr1 = SvPVbyte_nolen (req->sv1); 720 req->ptr1 = SvPVbyte_nolen (req->sv1);
1696 } 721 }
1697 else 722 else
1698 { 723 {
1699 req->type = REQ_FSTAT; 724 req->type = EIO_FSTAT;
1700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 725 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1701 } 726 }
1702 727
1703 REQ_SEND; 728 REQ_SEND;
1704} 729}
… …
1711 736
1712 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 737 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1713 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 738 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1714 req->sv1 = newSVsv (fh_or_path); 739 req->sv1 = newSVsv (fh_or_path);
1715 740
1716 if (SvPOK (fh_or_path)) 741 if (SvPOK (req->sv1))
1717 { 742 {
1718 req->type = REQ_UTIME; 743 req->type = EIO_UTIME;
1719 req->ptr1 = SvPVbyte_nolen (req->sv1); 744 req->ptr1 = SvPVbyte_nolen (req->sv1);
1720 } 745 }
1721 else 746 else
1722 { 747 {
1723 req->type = REQ_FUTIME; 748 req->type = EIO_FUTIME;
1724 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 749 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1725 } 750 }
1726 751
1727 REQ_SEND; 752 REQ_SEND;
1728} 753}
… …
1734 dREQ; 759 dREQ;
1735 760
1736 req->sv1 = newSVsv (fh_or_path); 761 req->sv1 = newSVsv (fh_or_path);
1737 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 762 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1738 763
1739 if (SvPOK (fh_or_path)) 764 if (SvPOK (req->sv1))
1740 { 765 {
1741 req->type = REQ_TRUNCATE; 766 req->type = EIO_TRUNCATE;
1742 req->ptr1 = SvPVbyte_nolen (req->sv1); 767 req->ptr1 = SvPVbyte_nolen (req->sv1);
1743 } 768 }
1744 else 769 else
1745 { 770 {
1746 req->type = REQ_FTRUNCATE; 771 req->type = EIO_FTRUNCATE;
1747 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 772 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1748 } 773 }
1749 774
1750 REQ_SEND; 775 REQ_SEND;
1751} 776}
1752 777
1753void 778void
1754aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 779aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
780 ALIAS:
781 aio_chmod = EIO_CHMOD
782 aio_mkdir = EIO_MKDIR
1755 PPCODE: 783 PPCODE:
1756{ 784{
1757 dREQ; 785 dREQ;
1758 786
1759 req->mode = mode; 787 req->int2 = mode;
1760 req->sv1 = newSVsv (fh_or_path); 788 req->sv1 = newSVsv (fh_or_path);
1761 789
1762 if (SvPOK (fh_or_path)) 790 if (SvPOK (req->sv1))
1763 { 791 {
1764 req->type = REQ_CHMOD; 792 req->type = ix;
1765 req->ptr1 = SvPVbyte_nolen (req->sv1); 793 req->ptr1 = SvPVbyte_nolen (req->sv1);
1766 } 794 }
1767 else 795 else
1768 { 796 {
1769 req->type = REQ_FCHMOD; 797 req->type = EIO_FCHMOD;
1770 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 798 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1771 } 799 }
1772 800
1773 REQ_SEND; 801 REQ_SEND;
1774} 802}
… …
1781 809
1782 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 810 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1783 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 811 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1784 req->sv1 = newSVsv (fh_or_path); 812 req->sv1 = newSVsv (fh_or_path);
1785 813
1786 if (SvPOK (fh_or_path)) 814 if (SvPOK (req->sv1))
1787 { 815 {
1788 req->type = REQ_CHOWN; 816 req->type = EIO_CHOWN;
1789 req->ptr1 = SvPVbyte_nolen (req->sv1); 817 req->ptr1 = SvPVbyte_nolen (req->sv1);
1790 } 818 }
1791 else 819 else
1792 { 820 {
1793 req->type = REQ_FCHOWN; 821 req->type = EIO_FCHOWN;
1794 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 822 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1795 } 823 }
1796 824
1797 REQ_SEND; 825 REQ_SEND;
1798} 826}
1799 827
1800void 828void
1801aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1802 ALIAS: 830 ALIAS:
1803 aio_unlink = REQ_UNLINK 831 aio_unlink = EIO_UNLINK
1804 aio_rmdir = REQ_RMDIR 832 aio_rmdir = EIO_RMDIR
1805 aio_readdir = REQ_READDIR 833 aio_readdir = EIO_READDIR
1806 PPCODE: 834 PPCODE:
1807{ 835{
1808 dREQ; 836 dREQ;
1809 837
1810 req->type = ix; 838 req->type = ix;
… …
1813 841
1814 REQ_SEND; 842 REQ_SEND;
1815} 843}
1816 844
1817void 845void
1818aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) 846aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
847 ALIAS:
848 aio_link = EIO_LINK
849 aio_symlink = EIO_SYMLINK
850 aio_rename = EIO_RENAME
1819 PPCODE: 851 PPCODE:
1820{ 852{
1821 dREQ; 853 dREQ;
1822 854
855 req->type = ix;
856 req->sv1 = newSVsv (oldpath);
857 req->ptr1 = SvPVbyte_nolen (req->sv1);
858 req->sv2 = newSVsv (newpath);
859 req->ptr2 = SvPVbyte_nolen (req->sv2);
860
861 REQ_SEND;
862}
863
864void
865aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
866 PPCODE:
867{
868 dREQ;
869
1823 req->type = REQ_MKDIR; 870 req->type = EIO_MKNOD;
1824 req->sv1 = newSVsv (pathname); 871 req->sv1 = newSVsv (pathname);
1825 req->ptr1 = SvPVbyte_nolen (req->sv1); 872 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; 873 req->int2 = (mode_t)mode;
1860 req->offs = dev; 874 req->offs = dev;
1861 875
1862 REQ_SEND; 876 REQ_SEND;
1863} 877}
1864 878
… …
1866aio_busy (double delay, SV *callback=&PL_sv_undef) 880aio_busy (double delay, SV *callback=&PL_sv_undef)
1867 PPCODE: 881 PPCODE:
1868{ 882{
1869 dREQ; 883 dREQ;
1870 884
1871 req->type = REQ_BUSY; 885 req->type = EIO_BUSY;
1872 req->nv1 = delay < 0. ? 0. : delay; 886 req->nv1 = delay < 0. ? 0. : delay;
1873 887
1874 REQ_SEND; 888 REQ_SEND;
1875} 889}
1876 890
… …
1879 PROTOTYPE: ;$ 893 PROTOTYPE: ;$
1880 PPCODE: 894 PPCODE:
1881{ 895{
1882 dREQ; 896 dREQ;
1883 897
1884 req->type = REQ_GROUP; 898 req->type = EIO_GROUP;
1885 899
1886 req_send (req); 900 eio_submit (req);
1887 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 901 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1888} 902}
1889 903
1890void 904void
1891aio_nop (SV *callback=&PL_sv_undef) 905aio_nop (SV *callback=&PL_sv_undef)
906 ALIAS:
907 aio_nop = EIO_NOP
908 aio_sync = EIO_SYNC
1892 PPCODE: 909 PPCODE:
1893{ 910{
1894 dREQ; 911 dREQ;
1895 912
1896 req->type = REQ_NOP; 913 req->type = ix;
1897 914
1898 REQ_SEND; 915 REQ_SEND;
1899} 916}
1900 917
1901int 918int
1902aioreq_pri (int pri = 0) 919aioreq_pri (int pri = 0)
1903 PROTOTYPE: ;$ 920 PROTOTYPE: ;$
1904 CODE: 921 CODE:
1905 RETVAL = next_pri - PRI_BIAS; 922 RETVAL = next_pri - EIO_PRI_BIAS;
1906 if (items > 0) 923 if (items > 0)
1907 { 924 {
1908 if (pri < PRI_MIN) pri = PRI_MIN; 925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1909 if (pri > PRI_MAX) pri = PRI_MAX; 926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1910 next_pri = pri + PRI_BIAS; 927 next_pri = pri + EIO_PRI_BIAS;
1911 } 928 }
1912 OUTPUT: 929 OUTPUT:
1913 RETVAL 930 RETVAL
1914 931
1915void 932void
1916aioreq_nice (int nice = 0) 933aioreq_nice (int nice = 0)
1917 CODE: 934 CODE:
1918 nice = next_pri - nice; 935 nice = next_pri - nice;
1919 if (nice < PRI_MIN) nice = PRI_MIN; 936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1920 if (nice > PRI_MAX) nice = PRI_MAX; 937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1921 next_pri = nice + PRI_BIAS; 938 next_pri = nice + EIO_PRI_BIAS;
1922 939
1923void 940void
1924flush () 941flush ()
1925 PROTOTYPE: 942 PROTOTYPE:
1926 CODE: 943 CODE:
1927 while (nreqs) 944 while (eio_nreqs ())
1928 { 945 {
1929 poll_wait (); 946 poll_wait ();
1930 poll_cb (); 947 poll_cb ();
1931 } 948 }
1932 949
… …
1959poll_wait() 976poll_wait()
1960 PROTOTYPE: 977 PROTOTYPE:
1961 CODE: 978 CODE:
1962 poll_wait (); 979 poll_wait ();
1963 980
1964void
1965setsig (int signum = SIGIO)
1966 PROTOTYPE: ;$
1967 CODE:
1968{
1969 if (block_sig_level)
1970 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1971
1972 X_LOCK (reslock);
1973 main_tid = pthread_self ();
1974 main_sig = signum;
1975 X_UNLOCK (reslock);
1976
1977 if (main_sig && npending)
1978 pthread_kill (main_tid, main_sig);
1979}
1980
1981void
1982aio_block (SV *cb)
1983 PROTOTYPE: &
1984 PPCODE:
1985{
1986 int count;
1987
1988 block_sig ();
1989 PUSHMARK (SP);
1990 PUTBACK;
1991 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1992 SPAGAIN;
1993 unblock_sig ();
1994
1995 if (SvTRUE (ERRSV))
1996 croak (0);
1997
1998 XSRETURN (count);
1999}
2000
2001int 981int
2002nreqs() 982nreqs()
2003 PROTOTYPE: 983 PROTOTYPE:
2004 CODE: 984 CODE:
2005 RETVAL = nreqs; 985 RETVAL = eio_nreqs ();
2006 OUTPUT: 986 OUTPUT:
2007 RETVAL 987 RETVAL
2008 988
2009int 989int
2010nready() 990nready()
2011 PROTOTYPE: 991 PROTOTYPE:
2012 CODE: 992 CODE:
2013 RETVAL = get_nready (); 993 RETVAL = eio_nready ();
2014 OUTPUT: 994 OUTPUT:
2015 RETVAL 995 RETVAL
2016 996
2017int 997int
2018npending() 998npending()
2019 PROTOTYPE: 999 PROTOTYPE:
2020 CODE: 1000 CODE:
2021 RETVAL = get_npending (); 1001 RETVAL = eio_npending ();
2022 OUTPUT: 1002 OUTPUT:
2023 RETVAL 1003 RETVAL
2024 1004
2025int 1005int
2026nthreads() 1006nthreads()
… …
2030 RETVAL = started; 1010 RETVAL = started;
2031 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock); 1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
2032 OUTPUT: 1012 OUTPUT:
2033 RETVAL 1013 RETVAL
2034 1014
1015void _on_next_submit (SV *cb)
1016 CODE:
1017 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019
2035PROTOTYPES: DISABLE 1020PROTOTYPES: DISABLE
2036 1021
2037MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1022MODULE = IO::AIO PACKAGE = IO::AIO::REQ
2038 1023
2039void 1024void
2040cancel (aio_req_ornot req) 1025cancel (aio_req_ornot req)
2041 CODE: 1026 CODE:
2042 req_cancel (req); 1027 eio_cancel (req);
2043 1028
2044void 1029void
2045cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
2046 CODE: 1031 CODE:
2047 SvREFCNT_dec (req->callback); 1032 SvREFCNT_dec (req->callback);
… …
2052void 1037void
2053add (aio_req grp, ...) 1038add (aio_req grp, ...)
2054 PPCODE: 1039 PPCODE:
2055{ 1040{
2056 int i; 1041 int i;
2057 aio_req req;
2058
2059 if (main_sig && !block_sig_level)
2060 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2061 1042
2062 if (grp->int1 == 2) 1043 if (grp->int1 == 2)
2063 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1044 croak ("cannot add requests to IO::AIO::GRP after the group finished");
2064 1045
2065 for (i = 1; i < items; ++i ) 1046 for (i = 1; i < items; ++i )
2066 { 1047 {
1048 aio_req req;
1049
2067 if (GIMME_V != G_VOID) 1050 if (GIMME_V != G_VOID)
2068 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1051 XPUSHs (sv_2mortal (newSVsv (ST (i))));
2069 1052
2070 req = SvAIO_REQ (ST (i)); 1053 req = SvAIO_REQ (ST (i));
2071 1054
2072 if (req) 1055 if (req)
2073 { 1056 eio_grp_add (grp, req);
2074 ++grp->size;
2075 req->grp = grp;
2076
2077 req->grp_prev = 0;
2078 req->grp_next = grp->grp_first;
2079
2080 if (grp->grp_first)
2081 grp->grp_first->grp_prev = req;
2082
2083 grp->grp_first = req;
2084 }
2085 } 1057 }
2086} 1058}
2087 1059
2088void 1060void
2089cancel_subs (aio_req_ornot req) 1061cancel_subs (aio_req_ornot req)
… …
2114 grp->errorno = errorno; 1086 grp->errorno = errorno;
2115 1087
2116void 1088void
2117limit (aio_req grp, int limit) 1089limit (aio_req grp, int limit)
2118 CODE: 1090 CODE:
2119 grp->int2 = limit; 1091 eio_grp_limit (grp, limit);
2120 aio_grp_feed (grp);
2121 1092
2122void 1093void
2123feed (aio_req grp, SV *callback=&PL_sv_undef) 1094feed (aio_req grp, SV *callback=&PL_sv_undef)
2124 CODE: 1095 CODE:
2125{ 1096{
… …
2127 grp->sv2 = newSVsv (callback); 1098 grp->sv2 = newSVsv (callback);
2128 1099
2129 if (grp->int2 <= 0) 1100 if (grp->int2 <= 0)
2130 grp->int2 = 2; 1101 grp->int2 = 2;
2131 1102
2132 aio_grp_feed (grp); 1103 eio_grp_limit (grp, grp->int2);
2133} 1104}
2134 1105

Diff Legend

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