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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines