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.100 by root, Fri Jun 1 06:00:40 2007 UTC vs.
Revision 1.170 by root, Wed Aug 4 16:09:36 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines