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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines