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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines