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.83 by root, Sat Oct 28 00:17:30 2006 UTC vs.
Revision 1.193 by root, Mon Jul 25 16:51:07 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines