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.103 by root, Sun Jul 8 09:09:34 2007 UTC vs.
Revision 1.162 by root, Sun Jan 10 23:05:12 2010 UTC

1#include "xthread.h" 1#include "libeio/xthread.h"
2 2
3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
13#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/statvfs.h>
14#include <limits.h> 17#include <limits.h>
15#include <fcntl.h> 18#include <fcntl.h>
16#include <sched.h> 19#include <sched.h>
17 20
21#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES
22# include <sys/mman.h>
23#endif
24
25#if !_POSIX_MAPPED_FILES
26# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
27# define munmap(addr,length) (errno = ENOSYS, -1)
28#endif
29
30/* perl namespace pollution */
31#undef VERSION
32
18#ifdef _WIN32 33#ifdef _WIN32
19 34
20# define SIGIO 0 35# define EIO_STRUCT_DIRENT Direntry_t
21 typedef Direntry_t X_DIRENT;
22#undef malloc 36# undef malloc
23#undef free 37# undef free
24 38
25// perl overrides all those nice win32 functions 39// perl overrides all those nice win32 functions
26# undef open 40# undef open
27# undef read 41# undef read
28# undef write 42# undef write
43# undef send
44# undef recv
29# undef stat 45# undef stat
30# undef fstat 46# undef fstat
31# define lstat stat 47# define lstat stat
32# undef truncate 48# undef truncate
33# undef ftruncate 49# undef ftruncate
52# define closedir(fd) (errno = ENOSYS, -1) 68# define closedir(fd) (errno = ENOSYS, -1)
53# define mkdir(a,b) mkdir (a) 69# define mkdir(a,b) mkdir (a)
54 70
55#else 71#else
56 72
57# include "autoconf/config.h"
58# include <sys/time.h> 73# include <sys/time.h>
59# include <sys/select.h> 74# include <sys/select.h>
60# include <unistd.h> 75# include <unistd.h>
61# include <utime.h> 76# include <utime.h>
62# include <signal.h> 77# include <signal.h>
63 typedef struct dirent X_DIRENT; 78# define EIO_STRUCT_DIRENT struct dirent
64 79
65#endif
66
67#if HAVE_SENDFILE
68# if __linux
69# include <sys/sendfile.h>
70# elif __freebsd
71# include <sys/socket.h>
72# include <sys/uio.h>
73# elif __hpux
74# include <sys/socket.h>
75# elif __solaris /* not yet */
76# include <sys/sendfile.h>
77# else
78# error sendfile support requested but not available
79# endif 80#endif
80#endif
81 81
82/* number of seconds after which idle threads exit */ 82/* perl stupidly overrides readdir and maybe others */
83#define IDLE_TIMEOUT 10 83/* with thread-unsafe versions, imagine that :( */
84#undef readdir
85#undef opendir
86#undef closedir
84 87
85/* used for struct dirent, AIX doesn't provide it */ 88#define EIO_STRUCT_STAT Stat_t
86#ifndef NAME_MAX
87# define NAME_MAX 4096
88#endif
89
90/* buffer size for various temporary buffers */
91#define AIO_BUFSIZE 65536
92 89
93/* use NV for 32 bit perls as it allows larger offsets */ 90/* use NV for 32 bit perls as it allows larger offsets */
94#if IVSIZE >= 8 91#if IVSIZE >= 8
92# define VAL64 IV
95# define SvVAL64 SvIV 93# define SvVAL64 SvIV
94# define newSVval64 newSViv
96#else 95#else
96# define VAL64 NV
97# define SvVAL64 SvNV 97# define SvVAL64 SvNV
98# define newSVval64 newSVnv
98#endif 99#endif
99 100
100#define dBUF \ 101/*****************************************************************************/
101 char *aio_buf; \ 102
102 X_LOCK (wrklock); \ 103#if __GNUC__ >= 3
103 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 104# define expect(expr,value) __builtin_expect ((expr),(value))
104 X_UNLOCK (wrklock); \ 105#else
105 if (!aio_buf) \ 106# define expect(expr,value) (expr)
106 return -1; 107#endif
108
109#define expect_false(expr) expect ((expr) != 0, 0)
110#define expect_true(expr) expect ((expr) != 0, 1)
111
112/*****************************************************************************/
107 113
108typedef SV SV8; /* byte-sv, used for argument-checking */ 114typedef SV SV8; /* byte-sv, used for argument-checking */
115typedef int aio_rfd; /* read file desriptor */
116typedef int aio_wfd; /* write file descriptor */
117
118static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
119
120#define EIO_REQ_MEMBERS \
121 SV *callback; \
122 SV *sv1, *sv2; \
123 STRLEN stroffset; \
124 SV *self;
125
126#define EIO_NO_WRAPPERS 1
127
128#include "libeio/eio.h"
129
130#ifndef POSIX_FADV_NORMAL
131# define POSIX_FADV_NORMAL 0
132# define NO_FADVISE 1
133#endif
134#ifndef POSIX_FADV_SEQUENTIAL
135# define POSIX_FADV_SEQUENTIAL 0
136#endif
137#ifndef POSIX_FADV_RANDOM
138# define POSIX_FADV_RANDOM 0
139#endif
140#ifndef POSIX_FADV_NOREUSE
141# define POSIX_FADV_NOREUSE 0
142#endif
143#ifndef POSIX_FADV_WILLNEED
144# define POSIX_FADV_WILLNEED 0
145#endif
146#ifndef POSIX_FADV_DONTNEED
147# define POSIX_FADV_DONTNEED 0
148#endif
149
150#ifndef ST_NODEV
151# define ST_NODEV 0
152#endif
153#ifndef ST_NOEXEC
154# define ST_NOEXEC 0
155#endif
156#ifndef ST_SYNCHRONOUS
157# define ST_SYNCHRONOUS 0
158#endif
159#ifndef ST_MANDLOCK
160# define ST_MANDLOCK 0
161#endif
162#ifndef ST_WRITE
163# define ST_WRITE 0
164#endif
165#ifndef ST_APPEND
166# define ST_APPEND 0
167#endif
168#ifndef ST_IMMUTABLE
169# define ST_IMMUTABLE 0
170#endif
171#ifndef ST_NOATIME
172# define ST_NOATIME 0
173#endif
174#ifndef ST_NODIRATIME
175# define ST_NODIRATIME 0
176#endif
177#ifndef ST_RELATIME
178# define ST_RELATIME 0
179#endif
180
181#ifndef MCL_CURRENT
182# define MCL_CURRENT 0
183#endif
184#ifndef MCL_FUTURE
185# define MCL_FUTURE 0
186#endif
187
188#ifndef MAP_ANONYMOUS
189# ifdef MAP_ANON
190# define MAP_ANONYMOUS MAP_ANON
191# else
192# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
193# endif
194#endif
195#ifndef MAP_HUGETLB
196# define MAP_HUGETLB 0
197#endif
198#ifndef MAP_LOCKED
199# define MAP_LOCKED 0
200#endif
201#ifndef MAP_NORESERVE
202# define MAP_NORESERVE 0
203#endif
204#ifndef MAP_POPULATE
205# define MAP_POPULATE 0
206#endif
207#ifndef MAP_NONBLOCK
208# define MAP_NONBLOCK 0
209#endif
210
211#ifndef PAGESIZE
212# define PAGESIZE sysconf (_SC_PAGESIZE)
213#endif
214
215static int req_invoke (eio_req *req);
216#define EIO_FINISH(req) req_invoke (req)
217static void req_destroy (eio_req *grp);
218#define EIO_DESTROY(req) req_destroy (req)
109 219
110enum { 220enum {
111 REQ_QUIT, 221 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
112 REQ_OPEN, REQ_CLOSE,
113 REQ_READ, REQ_WRITE,
114 REQ_READAHEAD, REQ_SENDFILE,
115 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
116 REQ_TRUNCATE, REQ_FTRUNCATE,
117 REQ_UTIME, REQ_FUTIME,
118 REQ_CHMOD, REQ_FCHMOD,
119 REQ_CHOWN, REQ_FCHOWN,
120 REQ_FSYNC, REQ_FDATASYNC,
121 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
122 REQ_MKNOD, REQ_READDIR,
123 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
124 REQ_GROUP, REQ_NOP,
125 REQ_BUSY,
126}; 222};
127 223
128#define AIO_REQ_KLASS "IO::AIO::REQ" 224#include "libeio/eio.c"
129#define AIO_GRP_KLASS "IO::AIO::GRP"
130 225
131typedef struct aio_cb
132{
133 struct aio_cb *volatile next;
134
135 SV *callback;
136 SV *sv1, *sv2;
137 void *ptr1, *ptr2;
138 off_t offs;
139 size_t size;
140 ssize_t result;
141 double nv1, nv2;
142
143 STRLEN stroffset;
144 int type;
145 int int1, int2, int3;
146 int errorno;
147 mode_t mode; /* open */
148
149 unsigned char flags;
150 unsigned char pri;
151
152 SV *self; /* the perl counterpart of this request, if any */
153 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
154} aio_cb;
155
156enum {
157 FLAG_CANCELLED = 0x01, /* request was cancelled */
158 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
159 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
160};
161
162typedef aio_cb *aio_req; 226typedef eio_req *aio_req;
163typedef aio_cb *aio_req_ornot; 227typedef eio_req *aio_req_ornot;
164 228
165enum { 229static SV *on_next_submit;
166 PRI_MIN = -4, 230static int next_pri = EIO_PRI_DEFAULT;
167 PRI_MAX = 4, 231static int max_outstanding;
168 232
169 DEFAULT_PRI = 0, 233static s_epipe respipe;
170 PRI_BIAS = -PRI_MIN,
171 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
172};
173 234
174#define AIO_TICKS ((1000000 + 1023) >> 10)
175
176static unsigned int max_poll_time = 0;
177static unsigned int max_poll_reqs = 0;
178
179/* calculcate time difference in ~1/AIO_TICKS of a second */
180static int tvdiff (struct timeval *tv1, struct timeval *tv2)
181{
182 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
183 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
184}
185
186static thread_t main_tid;
187static int main_sig;
188static int block_sig_level;
189
190void block_sig ()
191{
192 sigset_t ss;
193
194 if (block_sig_level++)
195 return;
196
197 if (!main_sig)
198 return;
199
200 sigemptyset (&ss);
201 sigaddset (&ss, main_sig);
202 pthread_sigmask (SIG_BLOCK, &ss, 0);
203}
204
205void unblock_sig ()
206{
207 sigset_t ss;
208
209 if (--block_sig_level)
210 return;
211
212 if (!main_sig)
213 return;
214
215 sigemptyset (&ss);
216 sigaddset (&ss, main_sig);
217 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
218}
219
220static int next_pri = DEFAULT_PRI + PRI_BIAS;
221
222static unsigned int started, idle, wanted;
223
224/* worker threads management */
225static mutex_t wrklock = X_MUTEX_INIT;
226
227typedef struct worker {
228 /* locked by wrklock */
229 struct worker *prev, *next;
230
231 thread_t tid;
232
233 /* locked by reslock, reqlock or wrklock */
234 aio_req req; /* currently processed request */
235 void *dbuf;
236 DIR *dirp;
237} worker;
238
239static worker wrk_first = { &wrk_first, &wrk_first, 0 };
240
241static void worker_clear (worker *wrk)
242{
243 if (wrk->dirp)
244 {
245 closedir (wrk->dirp);
246 wrk->dirp = 0;
247 }
248
249 if (wrk->dbuf)
250 {
251 free (wrk->dbuf);
252 wrk->dbuf = 0;
253 }
254}
255
256static void worker_free (worker *wrk)
257{
258 wrk->next->prev = wrk->prev;
259 wrk->prev->next = wrk->next;
260
261 free (wrk);
262}
263
264static volatile unsigned int nreqs, nready, npending;
265static volatile unsigned int max_idle = 4;
266static volatile unsigned int max_outstanding = 0xffffffff;
267static int respipe [2];
268
269static mutex_t reslock = X_MUTEX_INIT;
270static mutex_t reqlock = X_MUTEX_INIT;
271static cond_t reqwait = X_COND_INIT;
272
273#if WORDACCESS_UNSAFE
274
275static unsigned int get_nready ()
276{
277 unsigned int retval;
278
279 X_LOCK (reqlock);
280 retval = nready;
281 X_UNLOCK (reqlock);
282
283 return retval;
284}
285
286static unsigned int get_npending ()
287{
288 unsigned int retval;
289
290 X_LOCK (reslock);
291 retval = npending;
292 X_UNLOCK (reslock);
293
294 return retval;
295}
296
297static unsigned int get_nthreads ()
298{
299 unsigned int retval;
300
301 X_LOCK (wrklock);
302 retval = started;
303 X_UNLOCK (wrklock);
304
305 return retval;
306}
307
308#else
309
310# define get_nready() nready
311# define get_npending() npending
312# define get_nthreads() started
313
314#endif
315
316/*
317 * a somewhat faster data structure might be nice, but
318 * with 8 priorities this actually needs <20 insns
319 * per shift, the most expensive operation.
320 */
321typedef struct {
322 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
323 int size;
324} reqq;
325
326static reqq req_queue;
327static reqq res_queue;
328
329int reqq_push (reqq *q, aio_req req)
330{
331 int pri = req->pri;
332 req->next = 0;
333
334 if (q->qe[pri])
335 {
336 q->qe[pri]->next = req;
337 q->qe[pri] = req;
338 }
339 else
340 q->qe[pri] = q->qs[pri] = req;
341
342 return q->size++;
343}
344
345aio_req reqq_shift (reqq *q)
346{
347 int pri;
348
349 if (!q->size)
350 return 0;
351
352 --q->size;
353
354 for (pri = NUM_PRI; pri--; )
355 {
356 aio_req req = q->qs[pri];
357
358 if (req)
359 {
360 if (!(q->qs[pri] = req->next))
361 q->qe[pri] = 0;
362
363 return req;
364 }
365 }
366
367 abort ();
368}
369
370static int poll_cb ();
371static int req_invoke (aio_req req);
372static void req_destroy (aio_req req); 235static void req_destroy (aio_req req);
373static void req_cancel (aio_req req); 236static void req_cancel (aio_req req);
374 237
238static void want_poll (void)
239{
240 /* write a dummy byte to the pipe so fh becomes ready */
241 s_epipe_signal (&respipe);
242}
243
244static void done_poll (void)
245{
246 /* read any signals sent by the worker threads */
247 s_epipe_drain (&respipe);
248}
249
375/* must be called at most once */ 250/* must be called at most once */
376static SV *req_sv (aio_req req, const char *klass) 251static SV *req_sv (aio_req req, HV *stash)
377{ 252{
378 if (!req->self) 253 if (!req->self)
379 { 254 {
380 req->self = (SV *)newHV (); 255 req->self = (SV *)newHV ();
381 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 256 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
382 } 257 }
383 258
384 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 259 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
385} 260}
386 261
387static aio_req SvAIO_REQ (SV *sv) 262static aio_req SvAIO_REQ (SV *sv)
388{ 263{
389 MAGIC *mg; 264 MAGIC *mg;
390 265
391 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 266 if (!SvROK (sv)
267 || (SvSTASH (SvRV (sv)) != aio_grp_stash
268 && SvSTASH (SvRV (sv)) != aio_req_stash
269 && !sv_derived_from (sv, "IO::AIO::REQ")))
392 croak ("object of class " AIO_REQ_KLASS " expected"); 270 croak ("object of class IO::AIO::REQ expected");
393 271
394 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 272 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
395 273
396 return mg ? (aio_req)mg->mg_ptr : 0; 274 return mg ? (aio_req)mg->mg_ptr : 0;
397} 275}
398 276
399static void aio_grp_feed (aio_req grp) 277static void aio_grp_feed (aio_req grp)
400{ 278{
401 block_sig (); 279 if (grp->sv2 && SvOK (grp->sv2))
402
403 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
404 { 280 {
405 int old_len = grp->size;
406
407 if (grp->sv2 && SvOK (grp->sv2))
408 {
409 dSP; 281 dSP;
410 282
411 ENTER; 283 ENTER;
412 SAVETMPS; 284 SAVETMPS;
413 PUSHMARK (SP); 285 PUSHMARK (SP);
414 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 286 XPUSHs (req_sv (grp, aio_grp_stash));
415 PUTBACK; 287 PUTBACK;
416 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 288 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
417 SPAGAIN; 289 SPAGAIN;
418 FREETMPS; 290 FREETMPS;
419 LEAVE; 291 LEAVE;
420 }
421
422 /* stop if no progress has been made */
423 if (old_len == grp->size)
424 {
425 SvREFCNT_dec (grp->sv2);
426 grp->sv2 = 0;
427 break;
428 }
429 } 292 }
430
431 unblock_sig ();
432} 293}
433 294
434static void aio_grp_dec (aio_req grp) 295static void req_submit (eio_req *req)
435{ 296{
436 --grp->size; 297 eio_submit (req);
437 298
438 /* call feeder, if applicable */ 299 if (expect_false (on_next_submit))
439 aio_grp_feed (grp);
440
441 /* finish, if done */
442 if (!grp->size && grp->int1)
443 { 300 {
444 block_sig (); 301 dSP;
302 SV *cb = sv_2mortal (on_next_submit);
445 303
446 if (!req_invoke (grp)) 304 on_next_submit = 0;
447 {
448 req_destroy (grp);
449 unblock_sig ();
450 croak (0);
451 }
452 305
453 req_destroy (grp); 306 PUSHMARK (SP);
454 unblock_sig (); 307 PUTBACK;
308 call_sv (cb, G_DISCARD | G_EVAL);
455 } 309 }
456} 310}
457 311
458static int req_invoke (aio_req req) 312static int req_invoke (eio_req *req)
459{ 313{
460 dSP; 314 dSP;
461 315
462 if (req->flags & FLAG_SV2_RO_OFF) 316 if (req->flags & FLAG_SV2_RO_OFF)
463 SvREADONLY_off (req->sv2); 317 SvREADONLY_off (req->sv2);
464 318
465 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 319 if (!EIO_CANCELLED (req) && req->callback)
466 { 320 {
467 ENTER; 321 ENTER;
468 SAVETMPS; 322 SAVETMPS;
469 PUSHMARK (SP); 323 PUSHMARK (SP);
470 EXTEND (SP, 1); 324 EXTEND (SP, 1);
471 325
472 switch (req->type) 326 switch (req->type)
473 { 327 {
474 case REQ_READDIR: 328 case EIO_READDIR:
475 { 329 {
476 SV *rv = &PL_sv_undef; 330 SV *rv = &PL_sv_undef;
477 331
478 if (req->result >= 0) 332 if (req->result >= 0)
479 { 333 {
480 int i; 334 int i;
481 char *buf = req->ptr2; 335 char *names = (char *)req->ptr2;
336 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
482 AV *av = newAV (); 337 AV *av = newAV ();
483 338
484 av_extend (av, req->result - 1); 339 av_extend (av, req->result - 1);
485 340
486 for (i = 0; i < req->result; ++i) 341 for (i = 0; i < req->result; ++i)
487 { 342 {
488 SV *sv = newSVpv (buf, 0); 343 if (req->int1 & EIO_READDIR_DENTS)
344 {
345 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
489 346
347 if (req->int1 & EIO_READDIR_CUSTOM2)
348 {
349 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
350 AV *avent = newAV ();
351
352 av_extend (avent, 2);
353
354 if (!sv_type [ent->type])
355 {
356 sv_type [ent->type] = newSViv (ent->type);
357 SvREADONLY_on (sv_type [ent->type]);
358 }
359
360 av_store (avent, 0, namesv);
361 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
362 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
363
364 av_store (av, i, newRV_noinc ((SV *)avent));
365 }
366 else
490 av_store (av, i, sv); 367 av_store (av, i, namesv);
368
369 ++ent;
370 }
371 else
372 {
373 SV *name = newSVpv (names, 0);
374 av_store (av, i, name);
491 buf += SvCUR (sv) + 1; 375 names += SvCUR (name) + 1;
376 }
492 } 377 }
493 378
494 rv = sv_2mortal (newRV_noinc ((SV *)av)); 379 rv = sv_2mortal (newRV_noinc ((SV *)av));
495 } 380 }
496 381
497 PUSHs (rv); 382 PUSHs (rv);
383
384 if (req->int1 & EIO_READDIR_CUSTOM1)
385 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
498 } 386 }
499 break; 387 break;
500 388
501 case REQ_OPEN: 389 case EIO_OPEN:
502 { 390 {
503 /* convert fd to fh */ 391 /* convert fd to fh */
504 SV *fh; 392 SV *fh = &PL_sv_undef;
505 393
506 PUSHs (sv_2mortal (newSViv (req->result))); 394 if (req->result >= 0)
507 PUTBACK; 395 {
508 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 396 GV *gv = (GV *)sv_newmortal ();
509 SPAGAIN; 397 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
398 char sym [64];
399 int symlen;
400
401 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
402 gv_init (gv, aio_stash, sym, symlen, 0);
510 403
511 fh = POPs; 404 symlen = snprintf (
512 PUSHMARK (SP); 405 sym,
406 sizeof (sym),
407 "%s&=%d",
408 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
409 (int)req->result
410 );
411
412 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
413 fh = (SV *)gv;
414 }
415
513 XPUSHs (fh); 416 PUSHs (fh);
514 } 417 }
515 break; 418 break;
516 419
420 case EIO_STATVFS:
421 case EIO_FSTATVFS:
422 {
423 SV *rv = &PL_sv_undef;
424
425 if (req->result >= 0)
426 {
427 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
428 HV *hv = newHV ();
429
430 rv = sv_2mortal (newRV_noinc ((SV *)hv));
431
432 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
433 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
434 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
435 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
436 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
437 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
438 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
439 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
440 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
441 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
442 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
443 }
444
445 PUSHs (rv);
446 }
447
448 break;
449
517 case REQ_GROUP: 450 case EIO_GROUP:
518 req->int1 = 2; /* mark group as finished */ 451 req->int1 = 2; /* mark group as finished */
519 452
520 if (req->sv1) 453 if (req->sv1)
521 { 454 {
522 int i; 455 int i;
526 for (i = 0; i <= AvFILL (av); ++i) 459 for (i = 0; i <= AvFILL (av); ++i)
527 PUSHs (*av_fetch (av, i, 0)); 460 PUSHs (*av_fetch (av, i, 0));
528 } 461 }
529 break; 462 break;
530 463
531 case REQ_NOP: 464 case EIO_NOP:
532 case REQ_BUSY: 465 case EIO_BUSY:
533 break; 466 break;
534 467
535 case REQ_READLINK: 468 case EIO_READLINK:
536 if (req->result > 0) 469 if (req->result > 0)
537 { 470 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
538 SvCUR_set (req->sv2, req->result);
539 *SvEND (req->sv2) = 0;
540 PUSHs (req->sv2);
541 }
542 break; 471 break;
543 472
544 case REQ_STAT: 473 case EIO_STAT:
545 case REQ_LSTAT: 474 case EIO_LSTAT:
546 case REQ_FSTAT: 475 case EIO_FSTAT:
547 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 476 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
548 PL_laststatval = req->result; 477 PL_laststatval = req->result;
549 PL_statcache = *(Stat_t *)(req->ptr2); 478 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
550 PUSHs (sv_2mortal (newSViv (req->result))); 479 PUSHs (sv_2mortal (newSViv (req->result)));
551 break; 480 break;
552 481
553 case REQ_READ: 482 case EIO_READ:
483 {
554 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 484 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
555 *SvEND (req->sv2) = 0; 485 *SvEND (req->sv2) = 0;
486 SvPOK_only (req->sv2);
487 SvSETMAGIC (req->sv2);
556 PUSHs (sv_2mortal (newSViv (req->result))); 488 PUSHs (sv_2mortal (newSViv (req->result)));
489 }
557 break; 490 break;
491
492 case EIO_DUP2:
493 if (req->result > 0)
494 req->result = 0;
495 /* FALLTHROUGH */
558 496
559 default: 497 default:
560 PUSHs (sv_2mortal (newSViv (req->result))); 498 PUSHs (sv_2mortal (newSViv (req->result)));
561 break; 499 break;
562 } 500 }
563 501
564 errno = req->errorno; 502 errno = req->errorno;
565 503
566 PUTBACK; 504 PUTBACK;
567 call_sv (req->callback, G_VOID | G_EVAL); 505 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
568 SPAGAIN; 506 SPAGAIN;
569 507
570 FREETMPS; 508 FREETMPS;
571 LEAVE; 509 LEAVE;
510
511 PUTBACK;
572 } 512 }
573 513
574 if (req->grp)
575 {
576 aio_req grp = req->grp;
577
578 /* unlink request */
579 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
580 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
581
582 if (grp->grp_first == req)
583 grp->grp_first = req->grp_next;
584
585 aio_grp_dec (grp);
586 }
587
588 return !SvTRUE (ERRSV); 514 return !!SvTRUE (ERRSV);
589} 515}
590 516
591static void req_destroy (aio_req req) 517static void req_destroy (aio_req req)
592{ 518{
593 if (req->self) 519 if (req->self)
598 524
599 SvREFCNT_dec (req->sv1); 525 SvREFCNT_dec (req->sv1);
600 SvREFCNT_dec (req->sv2); 526 SvREFCNT_dec (req->sv2);
601 SvREFCNT_dec (req->callback); 527 SvREFCNT_dec (req->callback);
602 528
603 if (req->flags & FLAG_PTR2_FREE)
604 free (req->ptr2);
605
606 Safefree (req); 529 Safefree (req);
607} 530}
608 531
609static void req_cancel_subs (aio_req grp) 532static void req_cancel_subs (aio_req grp)
610{ 533{
611 aio_req sub; 534 aio_req sub;
612 535
613 if (grp->type != REQ_GROUP) 536 if (grp->type != EIO_GROUP)
614 return; 537 return;
615 538
616 SvREFCNT_dec (grp->sv2); 539 SvREFCNT_dec (grp->sv2);
617 grp->sv2 = 0; 540 grp->sv2 = 0;
618 541
619 for (sub = grp->grp_first; sub; sub = sub->grp_next) 542 eio_grp_cancel (grp);
620 req_cancel (sub);
621} 543}
622 544
623static void req_cancel (aio_req req) 545static void
546create_respipe (void)
624{ 547{
625 req->flags |= FLAG_CANCELLED; 548 if (s_epipe_renew (&respipe))
626 549 croak ("IO::AIO: unable to initialize result pipe");
627 req_cancel_subs (req);
628} 550}
629 551
630X_THREAD_PROC (aio_proc);
631
632static void start_thread (void)
633{
634 worker *wrk = calloc (1, sizeof (worker));
635
636 if (!wrk)
637 croak ("unable to allocate worker thread data");
638
639 X_LOCK (wrklock);
640
641 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
642 {
643 wrk->prev = &wrk_first;
644 wrk->next = wrk_first.next;
645 wrk_first.next->prev = wrk;
646 wrk_first.next = wrk;
647 ++started;
648 }
649 else
650 free (wrk);
651
652 X_UNLOCK (wrklock);
653}
654
655static void maybe_start_thread ()
656{
657 if (get_nthreads () >= wanted)
658 return;
659
660 /* todo: maybe use idle here, but might be less exact */
661 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
662 return;
663
664 start_thread ();
665}
666
667static void req_send (aio_req req)
668{
669 block_sig ();
670
671 ++nreqs;
672
673 X_LOCK (reqlock);
674 ++nready;
675 reqq_push (&req_queue, req);
676 X_COND_SIGNAL (reqwait);
677 X_UNLOCK (reqlock);
678
679 unblock_sig ();
680
681 maybe_start_thread ();
682}
683
684static void end_thread (void)
685{
686 aio_req req;
687
688 Newz (0, req, 1, aio_cb);
689
690 req->type = REQ_QUIT;
691 req->pri = PRI_MAX + PRI_BIAS;
692
693 X_LOCK (reqlock);
694 reqq_push (&req_queue, req);
695 X_COND_SIGNAL (reqwait);
696 X_UNLOCK (reqlock);
697
698 X_LOCK (wrklock);
699 --started;
700 X_UNLOCK (wrklock);
701}
702
703static void set_max_idle (int nthreads)
704{
705 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
706 max_idle = nthreads <= 0 ? 1 : nthreads;
707 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
708}
709
710static void min_parallel (int nthreads)
711{
712 if (wanted < nthreads)
713 wanted = nthreads;
714}
715
716static void max_parallel (int nthreads)
717{
718 if (wanted > nthreads)
719 wanted = nthreads;
720
721 while (started > wanted)
722 end_thread ();
723}
724
725static void poll_wait () 552static void poll_wait (void)
726{ 553{
727 fd_set rfd;
728
729 while (nreqs) 554 while (eio_nreqs ())
730 { 555 {
731 int size; 556 int size;
732 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 557
558 X_LOCK (reslock);
733 size = res_queue.size; 559 size = res_queue.size;
734 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 560 X_UNLOCK (reslock);
735 561
736 if (size) 562 if (size)
737 return; 563 return;
738 564
739 maybe_start_thread (); 565 etp_maybe_start_thread ();
740 566
741 FD_ZERO(&rfd); 567 s_epipe_wait (&respipe);
742 FD_SET(respipe [0], &rfd);
743
744 select (respipe [0] + 1, &rfd, 0, 0, 0);
745 } 568 }
746} 569}
747 570
748static int poll_cb () 571static int poll_cb (void)
749{ 572{
750 dSP;
751 int count = 0;
752 int maxreqs = max_poll_reqs;
753 int do_croak = 0;
754 struct timeval tv_start, tv_now;
755 aio_req req;
756
757 if (max_poll_time)
758 gettimeofday (&tv_start, 0);
759
760 block_sig ();
761
762 for (;;) 573 for (;;)
763 { 574 {
764 for (;;) 575 int res = eio_poll ();
765 {
766 maybe_start_thread ();
767 576
768 X_LOCK (reslock); 577 if (res > 0)
769 req = reqq_shift (&res_queue);
770
771 if (req)
772 {
773 --npending;
774
775 if (!res_queue.size)
776 {
777 /* read any signals sent by the worker threads */
778 char buf [4];
779 while (read (respipe [0], buf, 4) == 4)
780 ;
781 }
782 }
783
784 X_UNLOCK (reslock);
785
786 if (!req)
787 break;
788
789 --nreqs;
790
791 if (req->type == REQ_GROUP && req->size)
792 {
793 req->int1 = 1; /* mark request as delayed */
794 continue;
795 }
796 else
797 {
798 if (!req_invoke (req))
799 {
800 req_destroy (req);
801 unblock_sig ();
802 croak (0); 578 croak (0);
803 }
804 579
805 count++; 580 if (!max_outstanding || max_outstanding > eio_nreqs ())
806 } 581 return res;
807
808 req_destroy (req);
809
810 if (maxreqs && !--maxreqs)
811 break;
812
813 if (max_poll_time)
814 {
815 gettimeofday (&tv_now, 0);
816
817 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
818 break;
819 }
820 }
821
822 if (nreqs <= max_outstanding)
823 break;
824 582
825 poll_wait (); 583 poll_wait ();
826
827 ++maxreqs;
828 } 584 }
585}
829 586
830 unblock_sig (); 587static void atfork_child (void)
831 return count; 588{
589 create_respipe ();
832} 590}
833 591
834/*****************************************************************************/ 592/*****************************************************************************/
835/* work around various missing functions */
836 593
837#if !HAVE_PREADWRITE 594#define MMAP_MAGIC PERL_MAGIC_ext
838# define pread aio_pread
839# define pwrite aio_pwrite
840 595
841/* 596static int
842 * make our pread/pwrite safe against themselves, but not against 597mmap_free (pTHX_ SV *sv, MAGIC *mg)
843 * normal read/write by using a mutex. slows down execution a lot,
844 * but that's your problem, not mine.
845 */
846static mutex_t preadwritelock = X_MUTEX_INIT;
847
848static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
849{ 598{
850 ssize_t res; 599 int old_errno = errno;
851 off_t ooffset; 600 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
852
853 X_LOCK (preadwritelock);
854 ooffset = lseek (fd, 0, SEEK_CUR);
855 lseek (fd, offset, SEEK_SET);
856 res = read (fd, buf, count);
857 lseek (fd, ooffset, SEEK_SET);
858 X_UNLOCK (preadwritelock);
859
860 return res;
861}
862
863static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
864{
865 ssize_t res;
866 off_t ooffset;
867
868 X_LOCK (preadwritelock);
869 ooffset = lseek (fd, 0, SEEK_CUR);
870 lseek (fd, offset, SEEK_SET);
871 res = write (fd, buf, count);
872 lseek (fd, offset, SEEK_SET);
873 X_UNLOCK (preadwritelock);
874
875 return res;
876}
877#endif
878
879#ifndef HAVE_FUTIMES
880
881# define utimes(path,times) aio_utimes (path, times)
882# define futimes(fd,times) aio_futimes (fd, times)
883
884int aio_utimes (const char *filename, const struct timeval times[2])
885{
886 if (times)
887 {
888 struct utimbuf buf;
889
890 buf.actime = times[0].tv_sec;
891 buf.modtime = times[1].tv_sec;
892
893 return utime (filename, &buf);
894 }
895 else
896 return utime (filename, 0);
897}
898
899int aio_futimes (int fd, const struct timeval tv[2])
900{
901 errno = ENOSYS;
902 return -1;
903}
904
905#endif
906
907#if !HAVE_FDATASYNC
908# define fdatasync fsync
909#endif
910
911#if !HAVE_READAHEAD
912# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
913
914static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
915{
916 size_t todo = count;
917 dBUF;
918
919 while (todo > 0)
920 {
921 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
922
923 pread (fd, aio_buf, len, offset);
924 offset += len;
925 todo -= len;
926 }
927
928 errno = 0;
929 return count;
930}
931
932#endif
933
934#if !HAVE_READDIR_R
935# define readdir_r aio_readdir_r
936
937static mutex_t readdirlock = X_MUTEX_INIT;
938
939static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
940{
941 X_DIRENT *e;
942 int errorno;
943
944 X_LOCK (readdirlock);
945
946 e = readdir (dirp);
947 errorno = errno; 601 errno = old_errno;
948 602
949 if (e) 603 mg->mg_obj = 0; /* just in case */
950 {
951 *res = ent;
952 strcpy (ent->d_name, e->d_name);
953 }
954 else
955 *res = 0;
956 604
957 X_UNLOCK (readdirlock); 605 SvREADONLY_off (sv);
606 SvCUR_set (sv, 0);
607 SvLEN_set (sv, 0);
608 SvPVX (sv) = 0;
609 SvOK_off (sv);
958 610
959 errno = errorno;
960 return e ? 0 : -1;
961}
962#endif
963
964/* sendfile always needs emulation */
965static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
966{
967 ssize_t res;
968
969 if (!count)
970 return 0; 611 return 0;
971
972#if HAVE_SENDFILE
973# if __linux
974 res = sendfile (ofd, ifd, &offset, count);
975
976# elif __freebsd
977 /*
978 * Of course, the freebsd sendfile is a dire hack with no thoughts
979 * wasted on making it similar to other I/O functions.
980 */
981 {
982 off_t sbytes;
983 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
984
985 if (res < 0 && sbytes)
986 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
987 res = sbytes;
988 }
989
990# elif __hpux
991 res = sendfile (ofd, ifd, offset, count, 0, 0);
992
993# elif __solaris
994 {
995 struct sendfilevec vec;
996 size_t sbytes;
997
998 vec.sfv_fd = ifd;
999 vec.sfv_flag = 0;
1000 vec.sfv_off = offset;
1001 vec.sfv_len = count;
1002
1003 res = sendfilev (ofd, &vec, 1, &sbytes);
1004
1005 if (res < 0 && sbytes)
1006 res = sbytes;
1007 }
1008
1009# endif
1010#else
1011 res = -1;
1012 errno = ENOSYS;
1013#endif
1014
1015 if (res < 0
1016 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1017#if __solaris
1018 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1019#endif
1020 )
1021 )
1022 {
1023 /* emulate sendfile. this is a major pain in the ass */
1024 dBUF;
1025
1026 res = 0;
1027
1028 while (count)
1029 {
1030 ssize_t cnt;
1031
1032 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
1033
1034 if (cnt <= 0)
1035 {
1036 if (cnt && !res) res = -1;
1037 break;
1038 }
1039
1040 cnt = write (ofd, aio_buf, cnt);
1041
1042 if (cnt <= 0)
1043 {
1044 if (cnt && !res) res = -1;
1045 break;
1046 }
1047
1048 offset += cnt;
1049 res += cnt;
1050 count -= cnt;
1051 }
1052 }
1053
1054 return res;
1055} 612}
1056 613
1057/* read a full directory */ 614static MGVTBL mmap_vtbl = {
1058static void scandir_ (aio_req req, worker *self) 615 0, 0, 0, 0, mmap_free
1059{ 616};
1060 DIR *dirp;
1061 union
1062 {
1063 X_DIRENT d;
1064 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
1065 } *u;
1066 X_DIRENT *entp;
1067 char *name, *names;
1068 int memlen = 4096;
1069 int memofs = 0;
1070 int res = 0;
1071
1072 X_LOCK (wrklock);
1073 self->dirp = dirp = opendir (req->ptr1);
1074 self->dbuf = u = malloc (sizeof (*u));
1075 req->flags |= FLAG_PTR2_FREE;
1076 req->ptr2 = names = malloc (memlen);
1077 X_UNLOCK (wrklock);
1078
1079 if (dirp && u && names)
1080 for (;;)
1081 {
1082 errno = 0;
1083 readdir_r (dirp, &u->d, &entp);
1084
1085 if (!entp)
1086 break;
1087
1088 name = entp->d_name;
1089
1090 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1091 {
1092 int len = strlen (name) + 1;
1093
1094 res++;
1095
1096 while (memofs + len > memlen)
1097 {
1098 memlen *= 2;
1099 X_LOCK (wrklock);
1100 req->ptr2 = names = realloc (names, memlen);
1101 X_UNLOCK (wrklock);
1102
1103 if (!names)
1104 break;
1105 }
1106
1107 memcpy (names + memofs, name, len);
1108 memofs += len;
1109 }
1110 }
1111
1112 if (errno)
1113 res = -1;
1114
1115 req->result = res;
1116}
1117 617
1118/*****************************************************************************/ 618/*****************************************************************************/
1119 619
1120X_THREAD_PROC (aio_proc) 620static SV *
621get_cb (SV *cb_sv)
1121{ 622{
1122 {//D 623 SvGETMAGIC (cb_sv);
1123 aio_req req; 624 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
1124 struct timespec ts;
1125 worker *self = (worker *)thr_arg;
1126
1127 /* try to distribute timeouts somewhat randomly */
1128 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1129
1130 for (;;)
1131 {
1132 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1133
1134 X_LOCK (reqlock);
1135
1136 for (;;)
1137 {
1138 self->req = req = reqq_shift (&req_queue);
1139
1140 if (req)
1141 break;
1142
1143 ++idle;
1144
1145 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1146 == ETIMEDOUT)
1147 {
1148 if (idle > max_idle)
1149 {
1150 --idle;
1151 X_UNLOCK (reqlock);
1152 X_LOCK (wrklock);
1153 --started;
1154 X_UNLOCK (wrklock);
1155 goto quit;
1156 }
1157
1158 /* we are allowed to idle, so do so without any timeout */
1159 X_COND_WAIT (reqwait, reqlock);
1160 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1161 }
1162
1163 --idle;
1164 }
1165
1166 --nready;
1167
1168 X_UNLOCK (reqlock);
1169
1170 errno = 0; /* strictly unnecessary */
1171
1172 if (!(req->flags & FLAG_CANCELLED))
1173 switch (req->type)
1174 {
1175 case REQ_READ: req->result = req->offs >= 0
1176 ? pread (req->int1, req->ptr1, req->size, req->offs)
1177 : read (req->int1, req->ptr1, req->size); break;
1178 case REQ_WRITE: req->result = req->offs >= 0
1179 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1180 : write (req->int1, req->ptr1, req->size); break;
1181
1182 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1183 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1184
1185 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1186 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1187 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1188
1189 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1190 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1191 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1192 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1193 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1194 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1195
1196 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1197 case REQ_CLOSE: req->result = close (req->int1); break;
1198 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1199 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1200 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1201 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1202 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1203 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1204 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1205 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1206
1207 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1208 case REQ_FSYNC: req->result = fsync (req->int1); break;
1209 case REQ_READDIR: scandir_ (req, self); break;
1210
1211 case REQ_BUSY:
1212#ifdef _WIN32
1213 Sleep (req->nv1 * 1000.);
1214#else
1215 {
1216 struct timeval tv;
1217
1218 tv.tv_sec = req->nv1;
1219 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1220
1221 req->result = select (0, 0, 0, 0, &tv);
1222 }
1223#endif
1224 break;
1225
1226 case REQ_UTIME:
1227 case REQ_FUTIME:
1228 {
1229 struct timeval tv[2];
1230 struct timeval *times;
1231
1232 if (req->nv1 != -1. || req->nv2 != -1.)
1233 {
1234 tv[0].tv_sec = req->nv1;
1235 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1236 tv[1].tv_sec = req->nv2;
1237 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1238
1239 times = tv;
1240 }
1241 else
1242 times = 0;
1243
1244
1245 req->result = req->type == REQ_FUTIME
1246 ? futimes (req->int1, times)
1247 : utimes (req->ptr1, times);
1248 }
1249
1250 case REQ_GROUP:
1251 case REQ_NOP:
1252 break;
1253
1254 case REQ_QUIT:
1255 goto quit;
1256
1257 default:
1258 req->result = -1;
1259 break;
1260 }
1261
1262 req->errorno = errno;
1263
1264 X_LOCK (reslock);
1265
1266 ++npending;
1267
1268 if (!reqq_push (&res_queue, req))
1269 {
1270 /* write a dummy byte to the pipe so fh becomes ready */
1271 write (respipe [1], &respipe, 1);
1272
1273 /* optionally signal the main thread asynchronously */
1274 if (main_sig)
1275 pthread_kill (main_tid, main_sig);
1276 }
1277
1278 self->req = 0;
1279 worker_clear (self);
1280
1281 X_UNLOCK (reslock);
1282 }
1283
1284quit:
1285 X_LOCK (wrklock);
1286 worker_free (self);
1287 X_UNLOCK (wrklock);
1288
1289 return 0;
1290 }//D
1291}
1292
1293/*****************************************************************************/
1294
1295static void atfork_prepare (void)
1296{
1297 X_LOCK (wrklock);
1298 X_LOCK (reqlock);
1299 X_LOCK (reslock);
1300#if !HAVE_PREADWRITE
1301 X_LOCK (preadwritelock);
1302#endif
1303#if !HAVE_READDIR_R
1304 X_LOCK (readdirlock);
1305#endif
1306}
1307
1308static void atfork_parent (void)
1309{
1310#if !HAVE_READDIR_R
1311 X_UNLOCK (readdirlock);
1312#endif
1313#if !HAVE_PREADWRITE
1314 X_UNLOCK (preadwritelock);
1315#endif
1316 X_UNLOCK (reslock);
1317 X_UNLOCK (reqlock);
1318 X_UNLOCK (wrklock);
1319}
1320
1321static void atfork_child (void)
1322{
1323 aio_req prv;
1324
1325 while (prv = reqq_shift (&req_queue))
1326 req_destroy (prv);
1327
1328 while (prv = reqq_shift (&res_queue))
1329 req_destroy (prv);
1330
1331 while (wrk_first.next != &wrk_first)
1332 {
1333 worker *wrk = wrk_first.next;
1334
1335 if (wrk->req)
1336 req_destroy (wrk->req);
1337
1338 worker_clear (wrk);
1339 worker_free (wrk);
1340 }
1341
1342 started = 0;
1343 idle = 0;
1344 nreqs = 0;
1345 nready = 0;
1346 npending = 0;
1347
1348 close (respipe [0]);
1349 close (respipe [1]);
1350
1351 if (!create_pipe (respipe))
1352 croak ("cannot set result pipe to nonblocking mode");
1353
1354 atfork_parent ();
1355} 625}
1356 626
1357#define dREQ \ 627#define dREQ \
628 SV *cb_cv; \
1358 aio_req req; \ 629 aio_req req; \
1359 int req_pri = next_pri; \ 630 int req_pri = next_pri; \
1360 next_pri = DEFAULT_PRI + PRI_BIAS; \ 631 next_pri = EIO_PRI_DEFAULT; \
1361 \ 632 \
1362 if (SvOK (callback) && !SvROK (callback)) \ 633 cb_cv = get_cb (callback); \
1363 croak ("callback must be undef or of reference type"); \
1364 \ 634 \
1365 Newz (0, req, 1, aio_cb); \ 635 Newz (0, req, 1, eio_req); \
1366 if (!req) \ 636 if (!req) \
1367 croak ("out of memory during aio_req allocation"); \ 637 croak ("out of memory during eio_req allocation"); \
1368 \ 638 \
1369 req->callback = newSVsv (callback); \ 639 req->callback = SvREFCNT_inc (cb_cv); \
1370 req->pri = req_pri 640 req->pri = req_pri
1371 641
1372#define REQ_SEND \ 642#define REQ_SEND \
643 PUTBACK; \
1373 req_send (req); \ 644 req_submit (req); \
645 SPAGAIN; \
1374 \ 646 \
1375 if (GIMME_V != G_VOID) \ 647 if (GIMME_V != G_VOID) \
1376 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 648 XPUSHs (req_sv (req, aio_req_stash));
1377 649
1378MODULE = IO::AIO PACKAGE = IO::AIO 650MODULE = IO::AIO PACKAGE = IO::AIO
1379 651
1380PROTOTYPES: ENABLE 652PROTOTYPES: ENABLE
1381 653
1382BOOT: 654BOOT:
1383{ 655{
1384 HV *stash = gv_stashpv ("IO::AIO", 1); 656 static const struct {
1385 657 const char *name;
1386 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 658 IV iv;
1387 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 659 } *civ, const_iv[] = {
1388 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 660# define const_niv(name, value) { # name, (IV) value },
1389 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 661# define const_iv(name) { # name, (IV) name },
1390 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 662# define const_eio(name) { # name, (IV) EIO_ ## name },
663 const_iv (EXDEV)
664 const_iv (ENOSYS)
665 const_iv (O_RDONLY)
666 const_iv (O_WRONLY)
667 const_iv (O_CREAT)
668 const_iv (O_TRUNC)
1391#ifdef _WIN32 669#ifndef _WIN32
1392 X_MUTEX_CHECK (wrklock); 670 const_iv (S_IFIFO)
1393 X_MUTEX_CHECK (reslock);
1394 X_MUTEX_CHECK (reqlock);
1395 X_MUTEX_CHECK (reqwait);
1396 X_MUTEX_CHECK (preadwritelock);
1397 X_MUTEX_CHECK (readdirlock);
1398#else
1399 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1400 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1401#endif 671#endif
672 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
673 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
674 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
675 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
676 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
677 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
1402 678
1403 if (!create_pipe (respipe)) 679 const_iv (ST_RDONLY)
1404 croak ("cannot set result pipe to nonblocking mode"); 680 const_iv (ST_NOSUID)
681 const_iv (ST_NODEV)
682 const_iv (ST_NOEXEC)
683 const_iv (ST_SYNCHRONOUS)
684 const_iv (ST_MANDLOCK)
685 const_iv (ST_WRITE)
686 const_iv (ST_APPEND)
687 const_iv (ST_IMMUTABLE)
688 const_iv (ST_NOATIME)
689 const_iv (ST_NODIRATIME)
690 const_iv (ST_RELATIME)
1405 691
1406 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 692 const_iv (PROT_EXEC)
693 const_iv (PROT_NONE)
694 const_iv (PROT_READ)
695 const_iv (PROT_WRITE)
696
697 /*const_iv (MAP_FIXED)*/
698 const_iv (MAP_PRIVATE)
699 const_iv (MAP_SHARED)
700 const_iv (MAP_ANONYMOUS)
701
702 /* linuxish */
703 const_iv (MAP_HUGETLB)
704 const_iv (MAP_LOCKED)
705 const_iv (MAP_NORESERVE)
706 const_iv (MAP_POPULATE)
707 const_iv (MAP_NONBLOCK)
708
709 const_iv (MCL_FUTURE)
710 const_iv (MCL_CURRENT)
711
712 const_eio (MS_ASYNC)
713 const_eio (MS_INVALIDATE)
714 const_eio (MS_SYNC)
715
716 const_eio (MT_MODIFY)
717
718 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
719 const_eio (SYNC_FILE_RANGE_WRITE)
720 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
721
722 const_eio (READDIR_DENTS)
723 const_eio (READDIR_DIRS_FIRST)
724 const_eio (READDIR_STAT_ORDER)
725 const_eio (READDIR_FOUND_UNKNOWN)
726
727 const_eio (DT_UNKNOWN)
728 const_eio (DT_FIFO)
729 const_eio (DT_CHR)
730 const_eio (DT_DIR)
731 const_eio (DT_BLK)
732 const_eio (DT_REG)
733 const_eio (DT_LNK)
734 const_eio (DT_SOCK)
735 const_eio (DT_WHT)
736 };
737
738 aio_stash = gv_stashpv ("IO::AIO" , 1);
739 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
740 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
741
742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
743 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
744
745 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
746
747 create_respipe ();
748
749 if (eio_init (want_poll, done_poll) < 0)
750 croak ("IO::AIO: unable to initialise eio library");
751
752 /* atfork child called in fifo order, so before eio's handler */
753 X_THREAD_ATFORK (0, 0, atfork_child);
1407} 754}
1408 755
1409void 756void
1410max_poll_reqs (int nreqs) 757max_poll_reqs (int nreqs)
1411 PROTOTYPE: $ 758 PROTOTYPE: $
1412 CODE: 759 CODE:
1413 max_poll_reqs = nreqs; 760 eio_set_max_poll_reqs (nreqs);
1414 761
1415void 762void
1416max_poll_time (double nseconds) 763max_poll_time (double nseconds)
1417 PROTOTYPE: $ 764 PROTOTYPE: $
1418 CODE: 765 CODE:
1419 max_poll_time = nseconds * AIO_TICKS; 766 eio_set_max_poll_time (nseconds);
1420 767
1421void 768void
1422min_parallel (int nthreads) 769min_parallel (int nthreads)
1423 PROTOTYPE: $ 770 PROTOTYPE: $
771 CODE:
772 eio_set_min_parallel (nthreads);
1424 773
1425void 774void
1426max_parallel (int nthreads) 775max_parallel (int nthreads)
1427 PROTOTYPE: $ 776 PROTOTYPE: $
777 CODE:
778 eio_set_max_parallel (nthreads);
1428 779
1429void 780void
1430max_idle (int nthreads) 781max_idle (int nthreads)
1431 PROTOTYPE: $ 782 PROTOTYPE: $
1432 CODE: 783 CODE:
1433 set_max_idle (nthreads); 784 eio_set_max_idle (nthreads);
1434 785
1435int 786void
1436max_outstanding (int maxreqs) 787max_outstanding (int maxreqs)
1437 PROTOTYPE: $ 788 PROTOTYPE: $
1438 CODE: 789 CODE:
1439 RETVAL = max_outstanding;
1440 max_outstanding = maxreqs; 790 max_outstanding = maxreqs;
1441 OUTPUT:
1442 RETVAL
1443 791
1444void 792void
1445aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 793aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1446 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
1447 PPCODE: 795 PPCODE:
1448{ 796{
1449 dREQ; 797 dREQ;
1450 798
1451 req->type = REQ_OPEN; 799 req->type = EIO_OPEN;
1452 req->sv1 = newSVsv (pathname); 800 req->sv1 = newSVsv (pathname);
1453 req->ptr1 = SvPVbyte_nolen (req->sv1); 801 req->ptr1 = SvPVbyte_nolen (req->sv1);
1454 req->int1 = flags; 802 req->int1 = flags;
1455 req->mode = mode; 803 req->int2 = mode;
1456 804
1457 REQ_SEND; 805 REQ_SEND;
806}
807
808void
809aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
810 PROTOTYPE: $;$
811 ALIAS:
812 aio_fsync = EIO_FSYNC
813 aio_fdatasync = EIO_FDATASYNC
814 PPCODE:
815{
816 int fd = s_fileno_croak (fh, 0);
817 dREQ;
818
819 req->type = ix;
820 req->sv1 = newSVsv (fh);
821 req->int1 = fd;
822
823 REQ_SEND (req);
824}
825
826void
827aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
828 PROTOTYPE: $$$$;$
829 PPCODE:
830{
831 int fd = s_fileno_croak (fh, 0);
832 dREQ;
833
834 req->type = EIO_SYNC_FILE_RANGE;
835 req->sv1 = newSVsv (fh);
836 req->int1 = fd;
837 req->offs = offset;
838 req->size = nbytes;
839 req->int2 = flags;
840
841 REQ_SEND (req);
1458} 842}
1459 843
1460void 844void
1461aio_close (SV *fh, SV *callback=&PL_sv_undef) 845aio_close (SV *fh, SV *callback=&PL_sv_undef)
1462 PROTOTYPE: $;$ 846 PROTOTYPE: $;$
1463 ALIAS:
1464 aio_close = REQ_CLOSE
1465 aio_fsync = REQ_FSYNC
1466 aio_fdatasync = REQ_FDATASYNC
1467 PPCODE: 847 PPCODE:
1468{ 848{
849 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
850 int fd = s_fileno_croak (fh, 0);
1469 dREQ; 851 dREQ;
1470 852
853 if (close_pipe < 0)
854 {
855 int pipefd [2];
856
857 if (pipe (pipefd) < 0
858 || close (pipefd [1]) < 0
859 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
860 abort (); /*D*/
861
862 close_pipe = pipefd [0];
863 }
864
1471 req->type = ix; 865 req->type = EIO_DUP2;
866 req->int1 = close_pipe;
1472 req->sv1 = newSVsv (fh); 867 req->sv2 = newSVsv (fh);
1473 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 868 req->int2 = fd;
1474 869
1475 REQ_SEND (req); 870 REQ_SEND (req);
1476} 871}
1477 872
1478void 873void
1479aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 874aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1480 ALIAS: 875 ALIAS:
1481 aio_read = REQ_READ 876 aio_read = EIO_READ
1482 aio_write = REQ_WRITE 877 aio_write = EIO_WRITE
1483 PROTOTYPE: $$$$$;$ 878 PROTOTYPE: $$$$$;$
1484 PPCODE: 879 PPCODE:
1485{ 880{
1486 STRLEN svlen; 881 STRLEN svlen;
882 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
1487 char *svptr = SvPVbyte (data, svlen); 883 char *svptr = SvPVbyte (data, svlen);
1488 UV len = SvUV (length); 884 UV len = SvUV (length);
1489 885
1490 SvUPGRADE (data, SVt_PV);
1491 SvPOK_on (data);
1492
1493 if (dataoffset < 0) 886 if (dataoffset < 0)
1494 dataoffset += svlen; 887 dataoffset += svlen;
1495 888
1496 if (dataoffset < 0 || dataoffset > svlen) 889 if (dataoffset < 0 || dataoffset > svlen)
1497 croak ("dataoffset outside of data scalar"); 890 croak ("dataoffset outside of data scalar");
1498 891
1499 if (ix == REQ_WRITE) 892 if (ix == EIO_WRITE)
1500 { 893 {
1501 /* write: check length and adjust. */ 894 /* write: check length and adjust. */
1502 if (!SvOK (length) || len + dataoffset > svlen) 895 if (!SvOK (length) || len + dataoffset > svlen)
1503 len = svlen - dataoffset; 896 len = svlen - dataoffset;
1504 } 897 }
1505 else 898 else
1506 { 899 {
1507 /* read: grow scalar as necessary */ 900 /* read: check type and grow scalar as necessary */
901 SvUPGRADE (data, SVt_PV);
1508 svptr = SvGROW (data, len + dataoffset + 1); 902 svptr = SvGROW (data, len + dataoffset + 1);
1509 } 903 }
1510 904
1511 if (len < 0)
1512 croak ("length must not be negative");
1513
1514 { 905 {
1515 dREQ; 906 dREQ;
1516 907
1517 req->type = ix; 908 req->type = ix;
1518 req->sv1 = newSVsv (fh); 909 req->sv1 = newSVsv (fh);
1519 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 910 req->int1 = fd;
1520 : IoOFP (sv_2io (fh)));
1521 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 911 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1522 req->size = len; 912 req->size = len;
1523 req->sv2 = SvREFCNT_inc (data); 913 req->sv2 = SvREFCNT_inc (data);
1524 req->ptr1 = (char *)svptr + dataoffset; 914 req->ptr2 = (char *)svptr + dataoffset;
1525 req->stroffset = dataoffset; 915 req->stroffset = dataoffset;
1526 916
1527 if (!SvREADONLY (data)) 917 if (!SvREADONLY (data))
1528 { 918 {
1529 SvREADONLY_on (data); 919 SvREADONLY_on (data);
1540 PPCODE: 930 PPCODE:
1541{ 931{
1542 SV *data; 932 SV *data;
1543 dREQ; 933 dREQ;
1544 934
1545 data = newSV (NAME_MAX);
1546 SvPOK_on (data);
1547
1548 req->type = REQ_READLINK; 935 req->type = EIO_READLINK;
1549 req->sv1 = newSVsv (path); 936 req->sv1 = newSVsv (path);
1550 req->ptr2 = SvPVbyte_nolen (req->sv1); 937 req->ptr1 = SvPVbyte_nolen (req->sv1);
1551 req->sv2 = data;
1552 req->ptr1 = SvPVbyte_nolen (data);
1553 938
1554 REQ_SEND; 939 REQ_SEND;
1555} 940}
1556 941
1557void 942void
1558aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 943aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1559 PROTOTYPE: $$$$;$ 944 PROTOTYPE: $$$$;$
1560 PPCODE: 945 PPCODE:
1561{ 946{
947 int ifd = s_fileno_croak (in_fh , 0);
948 int ofd = s_fileno_croak (out_fh, 1);
1562 dREQ; 949 dREQ;
1563 950
1564 req->type = REQ_SENDFILE; 951 req->type = EIO_SENDFILE;
1565 req->sv1 = newSVsv (out_fh); 952 req->sv1 = newSVsv (out_fh);
1566 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 953 req->int1 = ofd;
1567 req->sv2 = newSVsv (in_fh); 954 req->sv2 = newSVsv (in_fh);
1568 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 955 req->int2 = ifd;
1569 req->offs = SvVAL64 (in_offset); 956 req->offs = in_offset;
1570 req->size = length; 957 req->size = length;
1571 958
1572 REQ_SEND; 959 REQ_SEND;
1573} 960}
1574 961
1575void 962void
1576aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 963aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1577 PROTOTYPE: $$$;$ 964 PROTOTYPE: $$$;$
1578 PPCODE: 965 PPCODE:
1579{ 966{
967 int fd = s_fileno_croak (fh, 0);
1580 dREQ; 968 dREQ;
1581 969
1582 req->type = REQ_READAHEAD; 970 req->type = EIO_READAHEAD;
1583 req->sv1 = newSVsv (fh); 971 req->sv1 = newSVsv (fh);
1584 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 972 req->int1 = fd;
1585 req->offs = SvVAL64 (offset); 973 req->offs = offset;
1586 req->size = length; 974 req->size = length;
1587 975
1588 REQ_SEND; 976 REQ_SEND;
1589} 977}
1590 978
1591void 979void
1592aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 980aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1593 ALIAS: 981 ALIAS:
1594 aio_stat = REQ_STAT 982 aio_stat = EIO_STAT
1595 aio_lstat = REQ_LSTAT 983 aio_lstat = EIO_LSTAT
984 aio_statvfs = EIO_STATVFS
1596 PPCODE: 985 PPCODE:
1597{ 986{
1598 dREQ; 987 dREQ;
1599 988
1600 req->ptr2 = malloc (sizeof (Stat_t));
1601 if (!req->ptr2)
1602 {
1603 req_destroy (req);
1604 croak ("out of memory during aio_stat statdata allocation");
1605 }
1606
1607 req->flags |= FLAG_PTR2_FREE;
1608 req->sv1 = newSVsv (fh_or_path); 989 req->sv1 = newSVsv (fh_or_path);
1609 990
1610 if (SvPOK (fh_or_path)) 991 if (SvPOK (req->sv1))
1611 { 992 {
1612 req->type = ix; 993 req->type = ix;
1613 req->ptr1 = SvPVbyte_nolen (req->sv1); 994 req->ptr1 = SvPVbyte_nolen (req->sv1);
1614 } 995 }
1615 else 996 else
1616 { 997 {
1617 req->type = REQ_FSTAT; 998 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1618 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 999 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1619 } 1000 }
1620 1001
1621 REQ_SEND; 1002 REQ_SEND;
1622} 1003}
1629 1010
1630 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1011 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1631 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1012 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1632 req->sv1 = newSVsv (fh_or_path); 1013 req->sv1 = newSVsv (fh_or_path);
1633 1014
1634 if (SvPOK (fh_or_path)) 1015 if (SvPOK (req->sv1))
1635 { 1016 {
1636 req->type = REQ_UTIME; 1017 req->type = EIO_UTIME;
1637 req->ptr1 = SvPVbyte_nolen (req->sv1); 1018 req->ptr1 = SvPVbyte_nolen (req->sv1);
1638 } 1019 }
1639 else 1020 else
1640 { 1021 {
1641 req->type = REQ_FUTIME; 1022 req->type = EIO_FUTIME;
1642 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1023 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1643 } 1024 }
1644 1025
1645 REQ_SEND; 1026 REQ_SEND;
1646} 1027}
1652 dREQ; 1033 dREQ;
1653 1034
1654 req->sv1 = newSVsv (fh_or_path); 1035 req->sv1 = newSVsv (fh_or_path);
1655 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1036 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1656 1037
1657 if (SvPOK (fh_or_path)) 1038 if (SvPOK (req->sv1))
1658 { 1039 {
1659 req->type = REQ_TRUNCATE; 1040 req->type = EIO_TRUNCATE;
1660 req->ptr1 = SvPVbyte_nolen (req->sv1); 1041 req->ptr1 = SvPVbyte_nolen (req->sv1);
1661 } 1042 }
1662 else 1043 else
1663 { 1044 {
1664 req->type = REQ_FTRUNCATE; 1045 req->type = EIO_FTRUNCATE;
1665 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1046 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1666 } 1047 }
1667 1048
1668 REQ_SEND; 1049 REQ_SEND;
1669} 1050}
1670 1051
1671void 1052void
1672aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1053aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1054 ALIAS:
1055 aio_chmod = EIO_CHMOD
1056 aio_mkdir = EIO_MKDIR
1673 PPCODE: 1057 PPCODE:
1674{ 1058{
1675 dREQ; 1059 dREQ;
1676 1060
1677 req->mode = mode; 1061 req->int2 = mode;
1678 req->sv1 = newSVsv (fh_or_path); 1062 req->sv1 = newSVsv (fh_or_path);
1679 1063
1680 if (SvPOK (fh_or_path)) 1064 if (SvPOK (req->sv1))
1681 { 1065 {
1682 req->type = REQ_CHMOD; 1066 req->type = ix;
1683 req->ptr1 = SvPVbyte_nolen (req->sv1); 1067 req->ptr1 = SvPVbyte_nolen (req->sv1);
1684 } 1068 }
1685 else 1069 else
1686 { 1070 {
1687 req->type = REQ_FCHMOD; 1071 req->type = EIO_FCHMOD;
1688 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1072 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1689 } 1073 }
1690 1074
1691 REQ_SEND; 1075 REQ_SEND;
1692} 1076}
1699 1083
1700 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1084 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1701 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1085 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1702 req->sv1 = newSVsv (fh_or_path); 1086 req->sv1 = newSVsv (fh_or_path);
1703 1087
1704 if (SvPOK (fh_or_path)) 1088 if (SvPOK (req->sv1))
1705 { 1089 {
1706 req->type = REQ_CHOWN; 1090 req->type = EIO_CHOWN;
1707 req->ptr1 = SvPVbyte_nolen (req->sv1); 1091 req->ptr1 = SvPVbyte_nolen (req->sv1);
1708 } 1092 }
1709 else 1093 else
1710 { 1094 {
1711 req->type = REQ_FCHOWN; 1095 req->type = EIO_FCHOWN;
1712 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1096 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1713 } 1097 }
1714 1098
1715 REQ_SEND; 1099 REQ_SEND;
1716} 1100}
1717 1101
1718void 1102void
1103aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1104 PPCODE:
1105{
1106 dREQ;
1107
1108 req->type = EIO_READDIR;
1109 req->sv1 = newSVsv (pathname);
1110 req->ptr1 = SvPVbyte_nolen (req->sv1);
1111 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1112
1113 if (flags & EIO_READDIR_DENTS)
1114 req->int1 |= EIO_READDIR_CUSTOM2;
1115
1116 REQ_SEND;
1117}
1118
1119void
1719aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1120aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1720 ALIAS: 1121 ALIAS:
1721 aio_unlink = REQ_UNLINK 1122 aio_unlink = EIO_UNLINK
1722 aio_rmdir = REQ_RMDIR 1123 aio_rmdir = EIO_RMDIR
1723 aio_readdir = REQ_READDIR 1124 aio_readdir = EIO_READDIR
1724 PPCODE: 1125 PPCODE:
1725{ 1126{
1726 dREQ; 1127 dREQ;
1727 1128
1728 req->type = ix; 1129 req->type = ix;
1731 1132
1732 REQ_SEND; 1133 REQ_SEND;
1733} 1134}
1734 1135
1735void 1136void
1736aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1737 PPCODE:
1738{
1739 dREQ;
1740
1741 req->type = REQ_MKDIR;
1742 req->sv1 = newSVsv (pathname);
1743 req->ptr1 = SvPVbyte_nolen (req->sv1);
1744 req->mode = mode;
1745
1746 REQ_SEND;
1747}
1748
1749void
1750aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) 1137aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1751 ALIAS: 1138 ALIAS:
1752 aio_link = REQ_LINK 1139 aio_link = EIO_LINK
1753 aio_symlink = REQ_SYMLINK 1140 aio_symlink = EIO_SYMLINK
1754 aio_rename = REQ_RENAME 1141 aio_rename = EIO_RENAME
1755 PPCODE: 1142 PPCODE:
1756{ 1143{
1757 dREQ; 1144 dREQ;
1758 1145
1759 req->type = ix; 1146 req->type = ix;
1760 req->sv2 = newSVsv (oldpath); 1147 req->sv1 = newSVsv (oldpath);
1148 req->ptr1 = SvPVbyte_nolen (req->sv1);
1149 req->sv2 = newSVsv (newpath);
1761 req->ptr2 = SvPVbyte_nolen (req->sv2); 1150 req->ptr2 = SvPVbyte_nolen (req->sv2);
1762 req->sv1 = newSVsv (newpath);
1763 req->ptr1 = SvPVbyte_nolen (req->sv1);
1764 1151
1765 REQ_SEND; 1152 REQ_SEND;
1766} 1153}
1767 1154
1768void 1155void
1769aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef) 1156aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1770 PPCODE: 1157 PPCODE:
1771{ 1158{
1772 dREQ; 1159 dREQ;
1773 1160
1774 req->type = REQ_MKNOD; 1161 req->type = EIO_MKNOD;
1775 req->sv1 = newSVsv (pathname); 1162 req->sv1 = newSVsv (pathname);
1776 req->ptr1 = SvPVbyte_nolen (req->sv1); 1163 req->ptr1 = SvPVbyte_nolen (req->sv1);
1777 req->mode = (mode_t)mode; 1164 req->int2 = (mode_t)mode;
1778 req->offs = dev; 1165 req->offs = dev;
1779 1166
1780 REQ_SEND; 1167 REQ_SEND;
1781} 1168}
1782 1169
1783void 1170void
1171aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1172 ALIAS:
1173 aio_mtouch = EIO_MTOUCH
1174 aio_msync = EIO_MSYNC
1175 PROTOTYPE: $$$$;$
1176 PPCODE:
1177{
1178 STRLEN svlen;
1179 UV len = SvUV (length);
1180 char *svptr = SvPVbyte (data, svlen);
1181
1182 if (offset < 0)
1183 offset += svlen;
1184
1185 if (offset < 0 || offset > svlen)
1186 croak ("offset outside of scalar");
1187
1188 if (!SvOK (length) || len + offset > svlen)
1189 len = svlen - offset;
1190
1191 {
1192 dREQ;
1193
1194 req->type = ix;
1195 req->size = len;
1196 req->sv2 = SvREFCNT_inc (data);
1197 req->ptr2 = (char *)svptr + offset;
1198 req->int1 = flags;
1199
1200 REQ_SEND;
1201 }
1202}
1203
1204void
1784aio_busy (double delay, SV *callback=&PL_sv_undef) 1205aio_busy (double delay, SV *callback=&PL_sv_undef)
1785 PPCODE: 1206 PPCODE:
1786{ 1207{
1787 dREQ; 1208 dREQ;
1788 1209
1789 req->type = REQ_BUSY; 1210 req->type = EIO_BUSY;
1790 req->nv1 = delay < 0. ? 0. : delay; 1211 req->nv1 = delay < 0. ? 0. : delay;
1791 1212
1792 REQ_SEND; 1213 REQ_SEND;
1793} 1214}
1794 1215
1797 PROTOTYPE: ;$ 1218 PROTOTYPE: ;$
1798 PPCODE: 1219 PPCODE:
1799{ 1220{
1800 dREQ; 1221 dREQ;
1801 1222
1802 req->type = REQ_GROUP; 1223 req->type = EIO_GROUP;
1803 1224
1804 req_send (req); 1225 req_submit (req);
1805 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1226 XPUSHs (req_sv (req, aio_grp_stash));
1806} 1227}
1807 1228
1808void 1229void
1809aio_nop (SV *callback=&PL_sv_undef) 1230aio_nop (SV *callback=&PL_sv_undef)
1231 ALIAS:
1232 aio_nop = EIO_NOP
1233 aio_sync = EIO_SYNC
1810 PPCODE: 1234 PPCODE:
1811{ 1235{
1812 dREQ; 1236 dREQ;
1813 1237
1814 req->type = REQ_NOP; 1238 req->type = ix;
1815 1239
1816 REQ_SEND; 1240 REQ_SEND;
1817} 1241}
1818 1242
1819int 1243int
1820aioreq_pri (int pri = 0) 1244aioreq_pri (int pri = 0)
1821 PROTOTYPE: ;$ 1245 PROTOTYPE: ;$
1822 CODE: 1246 CODE:
1823 RETVAL = next_pri - PRI_BIAS; 1247 RETVAL = next_pri;
1824 if (items > 0) 1248 if (items > 0)
1825 { 1249 {
1826 if (pri < PRI_MIN) pri = PRI_MIN; 1250 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1827 if (pri > PRI_MAX) pri = PRI_MAX; 1251 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1828 next_pri = pri + PRI_BIAS; 1252 next_pri = pri;
1829 } 1253 }
1830 OUTPUT: 1254 OUTPUT:
1831 RETVAL 1255 RETVAL
1832 1256
1833void 1257void
1834aioreq_nice (int nice = 0) 1258aioreq_nice (int nice = 0)
1835 CODE: 1259 CODE:
1836 nice = next_pri - nice; 1260 nice = next_pri - nice;
1837 if (nice < PRI_MIN) nice = PRI_MIN; 1261 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1838 if (nice > PRI_MAX) nice = PRI_MAX; 1262 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1839 next_pri = nice + PRI_BIAS; 1263 next_pri = nice;
1840 1264
1841void 1265void
1842flush () 1266flush ()
1843 PROTOTYPE: 1267 PROTOTYPE:
1844 CODE: 1268 CODE:
1845 while (nreqs) 1269 while (eio_nreqs ())
1846 { 1270 {
1847 poll_wait (); 1271 poll_wait ();
1848 poll_cb (); 1272 poll_cb ();
1849 } 1273 }
1850 1274
1859 1283
1860int 1284int
1861poll_fileno() 1285poll_fileno()
1862 PROTOTYPE: 1286 PROTOTYPE:
1863 CODE: 1287 CODE:
1864 RETVAL = respipe [0]; 1288 RETVAL = s_epipe_fd (&respipe);
1865 OUTPUT: 1289 OUTPUT:
1866 RETVAL 1290 RETVAL
1867 1291
1868int 1292int
1869poll_cb(...) 1293poll_cb(...)
1877poll_wait() 1301poll_wait()
1878 PROTOTYPE: 1302 PROTOTYPE:
1879 CODE: 1303 CODE:
1880 poll_wait (); 1304 poll_wait ();
1881 1305
1882void
1883setsig (int signum = SIGIO)
1884 PROTOTYPE: ;$
1885 CODE:
1886{
1887 if (block_sig_level)
1888 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1889
1890 X_LOCK (reslock);
1891 main_tid = pthread_self ();
1892 main_sig = signum;
1893 X_UNLOCK (reslock);
1894
1895 if (main_sig && npending)
1896 pthread_kill (main_tid, main_sig);
1897}
1898
1899void
1900aio_block (SV *cb)
1901 PROTOTYPE: &
1902 PPCODE:
1903{
1904 int count;
1905
1906 block_sig ();
1907 PUSHMARK (SP);
1908 PUTBACK;
1909 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1910 SPAGAIN;
1911 unblock_sig ();
1912
1913 if (SvTRUE (ERRSV))
1914 croak (0);
1915
1916 XSRETURN (count);
1917}
1918
1919int 1306int
1920nreqs() 1307nreqs()
1921 PROTOTYPE: 1308 PROTOTYPE:
1922 CODE: 1309 CODE:
1923 RETVAL = nreqs; 1310 RETVAL = eio_nreqs ();
1924 OUTPUT: 1311 OUTPUT:
1925 RETVAL 1312 RETVAL
1926 1313
1927int 1314int
1928nready() 1315nready()
1929 PROTOTYPE: 1316 PROTOTYPE:
1930 CODE: 1317 CODE:
1931 RETVAL = get_nready (); 1318 RETVAL = eio_nready ();
1932 OUTPUT: 1319 OUTPUT:
1933 RETVAL 1320 RETVAL
1934 1321
1935int 1322int
1936npending() 1323npending()
1937 PROTOTYPE: 1324 PROTOTYPE:
1938 CODE: 1325 CODE:
1939 RETVAL = get_npending (); 1326 RETVAL = eio_npending ();
1940 OUTPUT: 1327 OUTPUT:
1941 RETVAL 1328 RETVAL
1942 1329
1943int 1330int
1944nthreads() 1331nthreads()
1945 PROTOTYPE: 1332 PROTOTYPE:
1946 CODE: 1333 CODE:
1947 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1334 RETVAL = eio_nthreads ();
1948 RETVAL = started;
1949 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1950 OUTPUT: 1335 OUTPUT:
1951 RETVAL 1336 RETVAL
1952 1337
1338int
1339fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1340 PROTOTYPE: $$$$
1341 CODE:
1342#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1343 RETVAL = posix_fadvise (fh, offset, length, advice);
1344#else
1345 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1346#endif
1347 OUTPUT:
1348 RETVAL
1349
1350ssize_t
1351sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1352 PROTOTYPE: $$$$
1353 CODE:
1354 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1355 OUTPUT:
1356 RETVAL
1357
1358void
1359mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1360 PROTOTYPE: $$$$$;$
1361 PPCODE:
1362 sv_unmagic (scalar, MMAP_MAGIC);
1363{
1364 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1365 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1366 if (addr == (void *)-1)
1367 XSRETURN_NO;
1368
1369 /* we store the length in mg_obj, as namlen is I32 :/ */
1370 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1371 ->mg_obj = (SV *)length;
1372
1373 SvUPGRADE (scalar, SVt_PV); /* nop... */
1374 if (!(prot & PROT_WRITE))
1375 SvREADONLY_on (scalar);
1376
1377 SvPVX (scalar) = (char *)addr;
1378 SvCUR_set (scalar, length);
1379 SvLEN_set (scalar, 0);
1380 SvPOK_only (scalar);
1381
1382 XSRETURN_YES;
1383}
1384
1385void
1386munmap (SV *scalar)
1387 PROTOTYPE: $
1388 CODE:
1389 sv_unmagic (scalar, MMAP_MAGIC);
1390
1391int
1392mlockall (int flags)
1393 PROTOTYPE: $
1394 CODE:
1395#if _POSIX_MEMLOCK
1396#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1397 extern int mallopt (int, int);
1398 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1399#endif
1400 mlockall (flags);
1401#else
1402 RETVAL = -1;
1403 errno = ENOSYS;
1404#endif
1405 OUTPUT:
1406 RETVAL
1407
1408int
1409munlockall ()
1410 PROTOTYPE:
1411 CODE:
1412#if _POSIX_MEMLOCK
1413 munlockall ();
1414#else
1415 RETVAL = -1;
1416 errno = ENOSYS;
1417#endif
1418 OUTPUT:
1419 RETVAL
1420
1421void _on_next_submit (SV *cb)
1422 CODE:
1423 SvREFCNT_dec (on_next_submit);
1424 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1425
1953PROTOTYPES: DISABLE 1426PROTOTYPES: DISABLE
1954 1427
1955MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1428MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1956 1429
1957void 1430void
1958cancel (aio_req_ornot req) 1431cancel (aio_req_ornot req)
1959 CODE: 1432 CODE:
1960 req_cancel (req); 1433 eio_cancel (req);
1961 1434
1962void 1435void
1963cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1436cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1964 CODE: 1437 PPCODE:
1438{
1439 if (GIMME_V != G_VOID)
1440 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1441
1442 if (items > 1)
1443 {
1444 SV *cb_cv =get_cb (callback);
1445
1965 SvREFCNT_dec (req->callback); 1446 SvREFCNT_dec (req->callback);
1966 req->callback = newSVsv (callback); 1447 req->callback = SvREFCNT_inc (cb_cv);
1448 }
1449}
1967 1450
1968MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1451MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1969 1452
1970void 1453void
1971add (aio_req grp, ...) 1454add (aio_req grp, ...)
1972 PPCODE: 1455 PPCODE:
1973{ 1456{
1974 int i; 1457 int i;
1975 aio_req req;
1976
1977 if (main_sig && !block_sig_level)
1978 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1979 1458
1980 if (grp->int1 == 2) 1459 if (grp->int1 == 2)
1981 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1460 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1982 1461
1983 for (i = 1; i < items; ++i ) 1462 for (i = 1; i < items; ++i )
1984 { 1463 {
1464 aio_req req;
1465
1985 if (GIMME_V != G_VOID) 1466 if (GIMME_V != G_VOID)
1986 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1467 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1987 1468
1988 req = SvAIO_REQ (ST (i)); 1469 req = SvAIO_REQ (ST (i));
1989 1470
1990 if (req) 1471 if (req)
1991 { 1472 eio_grp_add (grp, req);
1992 ++grp->size;
1993 req->grp = grp;
1994
1995 req->grp_prev = 0;
1996 req->grp_next = grp->grp_first;
1997
1998 if (grp->grp_first)
1999 grp->grp_first->grp_prev = req;
2000
2001 grp->grp_first = req;
2002 }
2003 } 1473 }
2004} 1474}
2005 1475
2006void 1476void
2007cancel_subs (aio_req_ornot req) 1477cancel_subs (aio_req_ornot req)
2016 AV *av; 1486 AV *av;
2017 1487
2018 grp->errorno = errno; 1488 grp->errorno = errno;
2019 1489
2020 av = newAV (); 1490 av = newAV ();
1491 av_extend (av, items - 1);
2021 1492
2022 for (i = 1; i < items; ++i ) 1493 for (i = 1; i < items; ++i )
2023 av_push (av, newSVsv (ST (i))); 1494 av_push (av, newSVsv (ST (i)));
2024 1495
2025 SvREFCNT_dec (grp->sv1); 1496 SvREFCNT_dec (grp->sv1);
2032 grp->errorno = errorno; 1503 grp->errorno = errorno;
2033 1504
2034void 1505void
2035limit (aio_req grp, int limit) 1506limit (aio_req grp, int limit)
2036 CODE: 1507 CODE:
2037 grp->int2 = limit; 1508 eio_grp_limit (grp, limit);
2038 aio_grp_feed (grp);
2039 1509
2040void 1510void
2041feed (aio_req grp, SV *callback=&PL_sv_undef) 1511feed (aio_req grp, SV *callback=&PL_sv_undef)
2042 CODE: 1512 CODE:
2043{ 1513{
2044 SvREFCNT_dec (grp->sv2); 1514 SvREFCNT_dec (grp->sv2);
2045 grp->sv2 = newSVsv (callback); 1515 grp->sv2 = newSVsv (callback);
1516 grp->feed = aio_grp_feed;
2046 1517
2047 if (grp->int2 <= 0) 1518 if (grp->int2 <= 0)
2048 grp->int2 = 2; 1519 grp->int2 = 2;
2049 1520
2050 aio_grp_feed (grp); 1521 eio_grp_limit (grp, grp->int2);
2051} 1522}
2052 1523

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines