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.86 by root, Mon Oct 30 23:30:00 2006 UTC vs.
Revision 1.123 by root, Sat May 17 12:17:25 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines