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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines