ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines