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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines