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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines