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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines