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.127 by root, Tue Sep 30 13:17:32 2008 UTC vs.
Revision 1.160 by root, Thu Jan 7 18:25:51 2010 UTC

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
18/* perl namespace pollution */ 21/* perl namespace pollution */
75 78
76#define EIO_STRUCT_STAT Stat_t 79#define EIO_STRUCT_STAT Stat_t
77 80
78/* use NV for 32 bit perls as it allows larger offsets */ 81/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 82#if IVSIZE >= 8
83# define VAL64 IV
80# define SvVAL64 SvIV 84# define SvVAL64 SvIV
85# define newSVval64 newSViv
81#else 86#else
87# define VAL64 NV
82# define SvVAL64 SvNV 88# define SvVAL64 SvNV
89# define newSVval64 newSVnv
83#endif 90#endif
84 91
85/*****************************************************************************/ 92/*****************************************************************************/
86 93
87#if __GNUC__ >= 3 94#if __GNUC__ >= 3
93#define expect_false(expr) expect ((expr) != 0, 0) 100#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1) 101#define expect_true(expr) expect ((expr) != 0, 1)
95 102
96/*****************************************************************************/ 103/*****************************************************************************/
97 104
98static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
100 108
101#define AIO_REQ_KLASS "IO::AIO::REQ" 109static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
102#define AIO_GRP_KLASS "IO::AIO::GRP"
103 110
104#define EIO_REQ_MEMBERS \ 111#define EIO_REQ_MEMBERS \
105 SV *callback; \ 112 SV *callback; \
106 SV *sv1, *sv2; \ 113 SV *sv1, *sv2; \
107 STRLEN stroffset; \ 114 STRLEN stroffset; \
109 116
110#define EIO_NO_WRAPPERS 1 117#define EIO_NO_WRAPPERS 1
111 118
112#include "libeio/eio.h" 119#include "libeio/eio.h"
113 120
121#ifndef POSIX_FADV_NORMAL
122# define POSIX_FADV_NORMAL 0
123# define NO_FADVISE 1
124#endif
125
126#ifndef POSIX_FADV_SEQUENTIAL
127# define POSIX_FADV_SEQUENTIAL 0
128#endif
129
130#ifndef POSIX_FADV_RANDOM
131# define POSIX_FADV_RANDOM 0
132#endif
133
134#ifndef POSIX_FADV_NOREUSE
135# define POSIX_FADV_NOREUSE 0
136#endif
137
138#ifndef POSIX_FADV_WILLNEED
139# define POSIX_FADV_WILLNEED 0
140#endif
141
142#ifndef POSIX_FADV_DONTNEED
143# define POSIX_FADV_DONTNEED 0
144#endif
145
146#ifndef ST_NODEV
147# define ST_NODEV 0
148#endif
149
150#ifndef ST_NOEXEC
151# define ST_NOEXEC 0
152#endif
153
154#ifndef ST_SYNCHRONOUS
155# define ST_SYNCHRONOUS 0
156#endif
157
158#ifndef ST_MANDLOCK
159# define ST_MANDLOCK 0
160#endif
161
162#ifndef ST_WRITE
163# define ST_WRITE 0
164#endif
165
166#ifndef ST_APPEND
167# define ST_APPEND 0
168#endif
169
170#ifndef ST_IMMUTABLE
171# define ST_IMMUTABLE 0
172#endif
173
174#ifndef ST_NOATIME
175# define ST_NOATIME 0
176#endif
177
178#ifndef ST_NODIRATIME
179# define ST_NODIRATIME 0
180#endif
181
182#ifndef ST_RELATIME
183# define ST_RELATIME 0
184#endif
185
114static int req_invoke (eio_req *req); 186static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 187#define EIO_FINISH(req) req_invoke (req)
116static void aio_grp_feed (eio_req *grp);
117#define EIO_FEED(req) aio_grp_feed (req)
118static void req_destroy (eio_req *grp); 188static void req_destroy (eio_req *grp);
119#define EIO_DESTROY(req) req_destroy (req) 189#define EIO_DESTROY(req) req_destroy (req)
120 190
121enum { 191enum {
122 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 192 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
129 199
130static SV *on_next_submit; 200static SV *on_next_submit;
131static int next_pri = EIO_PRI_DEFAULT; 201static int next_pri = EIO_PRI_DEFAULT;
132static int max_outstanding; 202static int max_outstanding;
133 203
134static int respipe_osf [2], respipe [2] = { -1, -1 }; 204static s_epipe respipe;
135 205
136static void req_destroy (aio_req req); 206static void req_destroy (aio_req req);
137static void req_cancel (aio_req req); 207static void req_cancel (aio_req req);
138 208
139static void want_poll (void) 209static void want_poll (void)
140{ 210{
141 /* write a dummy byte to the pipe so fh becomes ready */ 211 /* write a dummy byte to the pipe so fh becomes ready */
142 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 212 s_epipe_signal (&respipe);
143} 213}
144 214
145static void done_poll (void) 215static void done_poll (void)
146{ 216{
147 /* read any signals sent by the worker threads */ 217 /* read any signals sent by the worker threads */
148 char buf [4]; 218 s_epipe_drain (&respipe);
149 while (respipe_read (respipe [0], buf, 4) == 4)
150 ;
151} 219}
152 220
153/* must be called at most once */ 221/* must be called at most once */
154static SV *req_sv (aio_req req, const char *klass) 222static SV *req_sv (aio_req req, HV *stash)
155{ 223{
156 if (!req->self) 224 if (!req->self)
157 { 225 {
158 req->self = (SV *)newHV (); 226 req->self = (SV *)newHV ();
159 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 227 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
160 } 228 }
161 229
162 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 230 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
163} 231}
164 232
165static aio_req SvAIO_REQ (SV *sv) 233static aio_req SvAIO_REQ (SV *sv)
166{ 234{
167 MAGIC *mg; 235 MAGIC *mg;
168 236
169 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 237 if (!SvROK (sv)
238 || (SvSTASH (SvRV (sv)) != aio_grp_stash
239 && SvSTASH (SvRV (sv)) != aio_req_stash
240 && !sv_derived_from (sv, "IO::AIO::REQ")))
170 croak ("object of class " AIO_REQ_KLASS " expected"); 241 croak ("object of class IO::AIO::REQ expected");
171 242
172 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 243 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
173 244
174 return mg ? (aio_req)mg->mg_ptr : 0; 245 return mg ? (aio_req)mg->mg_ptr : 0;
175} 246}
181 dSP; 252 dSP;
182 253
183 ENTER; 254 ENTER;
184 SAVETMPS; 255 SAVETMPS;
185 PUSHMARK (SP); 256 PUSHMARK (SP);
186 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 257 XPUSHs (req_sv (grp, aio_grp_stash));
187 PUTBACK; 258 PUTBACK;
188 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 259 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
189 SPAGAIN; 260 SPAGAIN;
190 FREETMPS; 261 FREETMPS;
191 LEAVE; 262 LEAVE;
214 dSP; 285 dSP;
215 286
216 if (req->flags & FLAG_SV2_RO_OFF) 287 if (req->flags & FLAG_SV2_RO_OFF)
217 SvREADONLY_off (req->sv2); 288 SvREADONLY_off (req->sv2);
218 289
219 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 290 if (!EIO_CANCELLED (req) && req->callback)
220 { 291 {
221 ENTER; 292 ENTER;
222 SAVETMPS; 293 SAVETMPS;
223 PUSHMARK (SP); 294 PUSHMARK (SP);
224 EXTEND (SP, 1); 295 EXTEND (SP, 1);
230 SV *rv = &PL_sv_undef; 301 SV *rv = &PL_sv_undef;
231 302
232 if (req->result >= 0) 303 if (req->result >= 0)
233 { 304 {
234 int i; 305 int i;
235 char *buf = req->ptr2; 306 char *names = (char *)req->ptr2;
307 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
236 AV *av = newAV (); 308 AV *av = newAV ();
237 309
238 av_extend (av, req->result - 1); 310 av_extend (av, req->result - 1);
239 311
240 for (i = 0; i < req->result; ++i) 312 for (i = 0; i < req->result; ++i)
241 { 313 {
242 SV *sv = newSVpv (buf, 0); 314 if (req->int1 & EIO_READDIR_DENTS)
315 {
316 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
243 317
318 if (req->int1 & EIO_READDIR_CUSTOM2)
319 {
320 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
321 AV *avent = newAV ();
322
323 av_extend (avent, 2);
324
325 if (!sv_type [ent->type])
326 {
327 sv_type [ent->type] = newSViv (ent->type);
328 SvREADONLY_on (sv_type [ent->type]);
329 }
330
331 av_store (avent, 0, namesv);
332 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
333 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
334
335 av_store (av, i, newRV_noinc ((SV *)avent));
336 }
337 else
244 av_store (av, i, sv); 338 av_store (av, i, namesv);
339
340 ++ent;
341 }
342 else
343 {
344 SV *name = newSVpv (names, 0);
345 av_store (av, i, name);
245 buf += SvCUR (sv) + 1; 346 names += SvCUR (name) + 1;
347 }
246 } 348 }
247 349
248 rv = sv_2mortal (newRV_noinc ((SV *)av)); 350 rv = sv_2mortal (newRV_noinc ((SV *)av));
249 } 351 }
250 352
251 PUSHs (rv); 353 PUSHs (rv);
354
355 if (req->int1 & EIO_READDIR_CUSTOM1)
356 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
252 } 357 }
253 break; 358 break;
254 359
255 case EIO_OPEN: 360 case EIO_OPEN:
256 { 361 {
262 GV *gv = (GV *)sv_newmortal (); 367 GV *gv = (GV *)sv_newmortal ();
263 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 368 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
264 char sym [64]; 369 char sym [64];
265 int symlen; 370 int symlen;
266 371
267 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 372 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
268 gv_init (gv, stash, sym, symlen, 0); 373 gv_init (gv, aio_stash, sym, symlen, 0);
269 374
270 symlen = snprintf ( 375 symlen = snprintf (
271 sym, 376 sym,
272 sizeof (sym), 377 sizeof (sym),
273 "%s&=%d", 378 "%s&=%d",
274 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 379 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
275 req->result 380 (int)req->result
276 ); 381 );
277 382
278 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 383 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
279 fh = (SV *)gv; 384 fh = (SV *)gv;
280 } 385 }
281 386
282 PUSHs (fh); 387 PUSHs (fh);
283 } 388 }
389 break;
390
391 case EIO_STATVFS:
392 case EIO_FSTATVFS:
393 {
394 SV *rv = &PL_sv_undef;
395
396 if (req->result >= 0)
397 {
398 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
399 HV *hv = newHV ();
400
401 rv = sv_2mortal (newRV_noinc ((SV *)hv));
402
403 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
404 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
405 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
406 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
407 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
408 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
409 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
410 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
411 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
412 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
413 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
414 }
415
416 PUSHs (rv);
417 }
418
284 break; 419 break;
285 420
286 case EIO_GROUP: 421 case EIO_GROUP:
287 req->int1 = 2; /* mark group as finished */ 422 req->int1 = 2; /* mark group as finished */
288 423
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 449 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 450 PUSHs (sv_2mortal (newSViv (req->result)));
316 break; 451 break;
317 452
318 case EIO_READ: 453 case EIO_READ:
454 {
319 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 455 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
320 *SvEND (req->sv2) = 0; 456 *SvEND (req->sv2) = 0;
457 SvPOK_only (req->sv2);
458 SvSETMAGIC (req->sv2);
321 PUSHs (sv_2mortal (newSViv (req->result))); 459 PUSHs (sv_2mortal (newSViv (req->result)));
460 }
322 break; 461 break;
323 462
324 case EIO_DUP2: 463 case EIO_DUP2:
325 if (req->result > 0) 464 if (req->result > 0)
326 req->result = 0; 465 req->result = 0;
372 grp->sv2 = 0; 511 grp->sv2 = 0;
373 512
374 eio_grp_cancel (grp); 513 eio_grp_cancel (grp);
375} 514}
376 515
377#ifdef USE_SOCKETS_AS_HANDLES
378# define TO_SOCKET(x) (win32_get_osfhandle (x))
379#else
380# define TO_SOCKET(x) (x)
381#endif
382
383static void 516static void
384create_respipe (void) 517create_respipe (void)
385{ 518{
386 int old_readfd = respipe [0];
387
388 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1]));
390
391#ifdef _WIN32
392 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
393#else
394 if (pipe (respipe)) 519 if (s_epipe_renew (&respipe))
395#endif
396 croak ("unable to initialize result pipe"); 520 croak ("IO::AIO: unable to initialize result pipe");
397
398 if (old_readfd >= 0)
399 {
400 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
401 croak ("unable to initialize result pipe(2)");
402
403 respipe_close (respipe [0]);
404 respipe [0] = old_readfd;
405 }
406
407#ifdef _WIN32
408 int arg = 1;
409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
411#else
412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
414#endif
415 croak ("unable to initialize result pipe(3)");
416
417 respipe_osf [0] = TO_SOCKET (respipe [0]);
418 respipe_osf [1] = TO_SOCKET (respipe [1]);
419} 521}
420 522
421static void poll_wait (void) 523static void poll_wait (void)
422{ 524{
423 fd_set rfd;
424
425 while (eio_nreqs ()) 525 while (eio_nreqs ())
426 { 526 {
427 int size; 527 int size;
428 528
429 X_LOCK (reslock); 529 X_LOCK (reslock);
433 if (size) 533 if (size)
434 return; 534 return;
435 535
436 etp_maybe_start_thread (); 536 etp_maybe_start_thread ();
437 537
438 FD_ZERO (&rfd); 538 s_epipe_wait (&respipe);
439 FD_SET (respipe [0], &rfd);
440
441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
442 } 539 }
443} 540}
444 541
445static int poll_cb (void) 542static int poll_cb (void)
446{ 543{
461static void atfork_child (void) 558static void atfork_child (void)
462{ 559{
463 create_respipe (); 560 create_respipe ();
464} 561}
465 562
563static SV *
564get_cb (SV *cb_sv)
565{
566 SvGETMAGIC (cb_sv);
567 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
568}
569
466#define dREQ \ 570#define dREQ \
571 SV *cb_cv; \
467 aio_req req; \ 572 aio_req req; \
468 int req_pri = next_pri; \ 573 int req_pri = next_pri; \
469 next_pri = EIO_PRI_DEFAULT; \ 574 next_pri = EIO_PRI_DEFAULT; \
470 \ 575 \
471 if (SvOK (callback) && !SvROK (callback)) \ 576 cb_cv = get_cb (callback); \
472 croak ("callback must be undef or of reference type"); \
473 \ 577 \
474 Newz (0, req, 1, eio_req); \ 578 Newz (0, req, 1, eio_req); \
475 if (!req) \ 579 if (!req) \
476 croak ("out of memory during eio_req allocation"); \ 580 croak ("out of memory during eio_req allocation"); \
477 \ 581 \
478 req->callback = newSVsv (callback); \ 582 req->callback = SvREFCNT_inc (cb_cv); \
479 req->pri = req_pri 583 req->pri = req_pri
480 584
481#define REQ_SEND \ 585#define REQ_SEND \
482 PUTBACK; \ 586 PUTBACK; \
483 req_submit (req); \ 587 req_submit (req); \
484 SPAGAIN; \ 588 SPAGAIN; \
485 \ 589 \
486 if (GIMME_V != G_VOID) \ 590 if (GIMME_V != G_VOID) \
487 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 591 XPUSHs (req_sv (req, aio_req_stash));
488 592
489MODULE = IO::AIO PACKAGE = IO::AIO 593MODULE = IO::AIO PACKAGE = IO::AIO
490 594
491PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
492 596
493BOOT: 597BOOT:
494{ 598{
495 stash = gv_stashpv ("IO::AIO", 1); 599 static const struct {
496 600 const char *name;
497 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 601 IV iv;
498 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 602 } *civ, const_iv[] = {
499 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 603# define const_iv(name, value) { # name, (IV) value },
500 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 604# define const_eio(name) { # name, (IV) EIO_ ## name },
501 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 605 const_iv (EXDEV , EXDEV)
606 const_iv (ENOSYS , ENOSYS)
607 const_iv (O_RDONLY, O_RDONLY)
608 const_iv (O_WRONLY, O_WRONLY)
609 const_iv (O_CREAT , O_CREAT)
610 const_iv (O_TRUNC , O_TRUNC)
502#ifndef _WIN32 611#ifndef _WIN32
503 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 612 const_iv (S_IFIFO , S_IFIFO)
504#endif 613#endif
614 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
615 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
616 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
617 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
618 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
619 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
505 620
621 const_iv (ST_RDONLY , ST_RDONLY)
622 const_iv (ST_NOSUID , ST_NOSUID)
623 const_iv (ST_NODEV , ST_NODEV)
624 const_iv (ST_NOEXEC , ST_NOEXEC)
625 const_iv (ST_SYNCHRONOUS , ST_SYNCHRONOUS)
626 const_iv (ST_MANDLOCK , ST_MANDLOCK)
627 const_iv (ST_WRITE , ST_WRITE)
628 const_iv (ST_APPEND , ST_APPEND)
629 const_iv (ST_IMMUTABLE , ST_IMMUTABLE)
630 const_iv (ST_NOATIME , ST_NOATIME)
631 const_iv (ST_NODIRATIME , ST_NODIRATIME)
632 const_iv (ST_RELATIME , ST_RELATIME)
633
634 const_eio (MS_ASYNC)
635 const_eio (MS_INVALIDATE)
636 const_eio (MS_SYNC)
637
638 const_eio (MT_MODIFY)
639
640 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
641 const_eio (SYNC_FILE_RANGE_WRITE)
642 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
643
644 const_eio (READDIR_DENTS)
645 const_eio (READDIR_DIRS_FIRST)
646 const_eio (READDIR_STAT_ORDER)
647 const_eio (READDIR_FOUND_UNKNOWN)
648
649 const_eio (DT_UNKNOWN)
650 const_eio (DT_FIFO)
651 const_eio (DT_CHR)
652 const_eio (DT_DIR)
653 const_eio (DT_BLK)
654 const_eio (DT_REG)
655 const_eio (DT_LNK)
656 const_eio (DT_SOCK)
657 const_eio (DT_WHT)
658 };
659
660 aio_stash = gv_stashpv ("IO::AIO" , 1);
661 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
662 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
663
664 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
665 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
666
506 create_respipe (); 667 create_respipe ();
507 668
508 if (eio_init (want_poll, done_poll) < 0) 669 if (eio_init (want_poll, done_poll) < 0)
509 croak ("IO::AIO: unable to initialise eio library"); 670 croak ("IO::AIO: unable to initialise eio library");
510 671
511 /* atfork child called in fifo order, so before eio's handler */ 672 /* atfork child called in fifo order, so before eio's handler */
512 X_THREAD_ATFORK (0, 0, atfork_child); 673 X_THREAD_ATFORK (0, 0, atfork_child);
513} 674}
514 675
515void 676void
516max_poll_reqs (int nreqs) 677max_poll_reqs (int nreqs)
517 PROTOTYPE: $ 678 PROTOTYPE: $
570 ALIAS: 731 ALIAS:
571 aio_fsync = EIO_FSYNC 732 aio_fsync = EIO_FSYNC
572 aio_fdatasync = EIO_FDATASYNC 733 aio_fdatasync = EIO_FDATASYNC
573 PPCODE: 734 PPCODE:
574{ 735{
736 int fd = s_fileno_croak (fh, 0);
575 dREQ; 737 dREQ;
576 738
577 req->type = ix; 739 req->type = ix;
578 req->sv1 = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
579 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 741 req->int1 = fd;
742
743 REQ_SEND (req);
744}
745
746void
747aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
748 PROTOTYPE: $$$$;$
749 PPCODE:
750{
751 int fd = s_fileno_croak (fh, 0);
752 dREQ;
753
754 req->type = EIO_SYNC_FILE_RANGE;
755 req->sv1 = newSVsv (fh);
756 req->int1 = fd;
757 req->offs = offset;
758 req->size = nbytes;
759 req->int2 = flags;
580 760
581 REQ_SEND (req); 761 REQ_SEND (req);
582} 762}
583 763
584void 764void
585aio_close (SV *fh, SV *callback=&PL_sv_undef) 765aio_close (SV *fh, SV *callback=&PL_sv_undef)
586 PROTOTYPE: $;$ 766 PROTOTYPE: $;$
587 PPCODE: 767 PPCODE:
588{ 768{
589 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 769 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
770 int fd = s_fileno_croak (fh, 0);
590 dREQ; 771 dREQ;
591 772
592 if (close_pipe < 0) 773 if (close_pipe < 0)
593 { 774 {
594 int pipefd [2]; 775 int pipefd [2];
602 } 783 }
603 784
604 req->type = EIO_DUP2; 785 req->type = EIO_DUP2;
605 req->int1 = close_pipe; 786 req->int1 = close_pipe;
606 req->sv2 = newSVsv (fh); 787 req->sv2 = newSVsv (fh);
607 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 788 req->int2 = fd;
608 789
609 REQ_SEND (req); 790 REQ_SEND (req);
610} 791}
611 792
612void 793void
616 aio_write = EIO_WRITE 797 aio_write = EIO_WRITE
617 PROTOTYPE: $$$$$;$ 798 PROTOTYPE: $$$$$;$
618 PPCODE: 799 PPCODE:
619{ 800{
620 STRLEN svlen; 801 STRLEN svlen;
802 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
621 char *svptr = SvPVbyte (data, svlen); 803 char *svptr = SvPVbyte (data, svlen);
622 UV len = SvUV (length); 804 UV len = SvUV (length);
623
624 SvUPGRADE (data, SVt_PV);
625 SvPOK_on (data);
626 805
627 if (dataoffset < 0) 806 if (dataoffset < 0)
628 dataoffset += svlen; 807 dataoffset += svlen;
629 808
630 if (dataoffset < 0 || dataoffset > svlen) 809 if (dataoffset < 0 || dataoffset > svlen)
636 if (!SvOK (length) || len + dataoffset > svlen) 815 if (!SvOK (length) || len + dataoffset > svlen)
637 len = svlen - dataoffset; 816 len = svlen - dataoffset;
638 } 817 }
639 else 818 else
640 { 819 {
641 /* read: grow scalar as necessary */ 820 /* read: check type and grow scalar as necessary */
821 SvUPGRADE (data, SVt_PV);
642 svptr = SvGROW (data, len + dataoffset + 1); 822 svptr = SvGROW (data, len + dataoffset + 1);
643 } 823 }
644
645 if (len < 0)
646 croak ("length must not be negative");
647 824
648 { 825 {
649 dREQ; 826 dREQ;
650 827
651 req->type = ix; 828 req->type = ix;
652 req->sv1 = newSVsv (fh); 829 req->sv1 = newSVsv (fh);
653 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 830 req->int1 = fd;
654 : IoOFP (sv_2io (fh)));
655 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 831 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
656 req->size = len; 832 req->size = len;
657 req->sv2 = SvREFCNT_inc (data); 833 req->sv2 = SvREFCNT_inc (data);
658 req->ptr2 = (char *)svptr + dataoffset; 834 req->ptr2 = (char *)svptr + dataoffset;
659 req->stroffset = dataoffset; 835 req->stroffset = dataoffset;
682 858
683 REQ_SEND; 859 REQ_SEND;
684} 860}
685 861
686void 862void
687aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 863aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
688 PROTOTYPE: $$$$;$ 864 PROTOTYPE: $$$$;$
689 PPCODE: 865 PPCODE:
690{ 866{
867 int ifd = s_fileno_croak (in_fh , 0);
868 int ofd = s_fileno_croak (out_fh, 1);
691 dREQ; 869 dREQ;
692 870
693 req->type = EIO_SENDFILE; 871 req->type = EIO_SENDFILE;
694 req->sv1 = newSVsv (out_fh); 872 req->sv1 = newSVsv (out_fh);
695 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 873 req->int1 = ofd;
696 req->sv2 = newSVsv (in_fh); 874 req->sv2 = newSVsv (in_fh);
697 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 875 req->int2 = ifd;
698 req->offs = SvVAL64 (in_offset); 876 req->offs = in_offset;
699 req->size = length; 877 req->size = length;
700 878
701 REQ_SEND; 879 REQ_SEND;
702} 880}
703 881
704void 882void
705aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 883aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$;$ 884 PROTOTYPE: $$$;$
707 PPCODE: 885 PPCODE:
708{ 886{
887 int fd = s_fileno_croak (fh, 0);
709 dREQ; 888 dREQ;
710 889
711 req->type = EIO_READAHEAD; 890 req->type = EIO_READAHEAD;
712 req->sv1 = newSVsv (fh); 891 req->sv1 = newSVsv (fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 892 req->int1 = fd;
714 req->offs = SvVAL64 (offset); 893 req->offs = offset;
715 req->size = length; 894 req->size = length;
716 895
717 REQ_SEND; 896 REQ_SEND;
718} 897}
719 898
720void 899void
721aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 900aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
722 ALIAS: 901 ALIAS:
723 aio_stat = EIO_STAT 902 aio_stat = EIO_STAT
724 aio_lstat = EIO_LSTAT 903 aio_lstat = EIO_LSTAT
904 aio_statvfs = EIO_STATVFS
725 PPCODE: 905 PPCODE:
726{ 906{
727 dREQ; 907 dREQ;
728 908
729 req->sv1 = newSVsv (fh_or_path); 909 req->sv1 = newSVsv (fh_or_path);
733 req->type = ix; 913 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 914 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 915 }
736 else 916 else
737 { 917 {
738 req->type = EIO_FSTAT; 918 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
739 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 919 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
740 } 920 }
741 921
742 REQ_SEND; 922 REQ_SEND;
743} 923}
835 req->type = EIO_FCHOWN; 1015 req->type = EIO_FCHOWN;
836 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1016 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
837 } 1017 }
838 1018
839 REQ_SEND; 1019 REQ_SEND;
1020}
1021
1022void
1023aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1024 PPCODE:
1025{
1026 dREQ;
1027
1028 req->type = EIO_READDIR;
1029 req->sv1 = newSVsv (pathname);
1030 req->ptr1 = SvPVbyte_nolen (req->sv1);
1031 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1032
1033 if (flags & EIO_READDIR_DENTS)
1034 req->int1 |= EIO_READDIR_CUSTOM2;
1035
1036 REQ_SEND;
840} 1037}
841 1038
842void 1039void
843aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1040aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
844 ALIAS: 1041 ALIAS:
889 1086
890 REQ_SEND; 1087 REQ_SEND;
891} 1088}
892 1089
893void 1090void
1091aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1092 ALIAS:
1093 aio_mtouch = EIO_MTOUCH
1094 aio_msync = EIO_MSYNC
1095 PROTOTYPE: $$$$;$
1096 PPCODE:
1097{
1098 STRLEN svlen;
1099 UV len = SvUV (length);
1100 char *svptr = SvPVbyte (data, svlen);
1101
1102 if (offset < 0)
1103 offset += svlen;
1104
1105 if (offset < 0 || offset > svlen)
1106 croak ("offset outside of scalar");
1107
1108 if (!SvOK (length) || len + offset > svlen)
1109 len = svlen - offset;
1110
1111 {
1112 dREQ;
1113
1114 req->type = ix;
1115 req->size = len;
1116 req->sv2 = SvREFCNT_inc (data);
1117 req->ptr2 = (char *)svptr + offset;
1118 req->int1 = flags;
1119
1120 REQ_SEND;
1121 }
1122}
1123
1124void
894aio_busy (double delay, SV *callback=&PL_sv_undef) 1125aio_busy (double delay, SV *callback=&PL_sv_undef)
895 PPCODE: 1126 PPCODE:
896{ 1127{
897 dREQ; 1128 dREQ;
898 1129
910 dREQ; 1141 dREQ;
911 1142
912 req->type = EIO_GROUP; 1143 req->type = EIO_GROUP;
913 1144
914 req_submit (req); 1145 req_submit (req);
915 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1146 XPUSHs (req_sv (req, aio_grp_stash));
916} 1147}
917 1148
918void 1149void
919aio_nop (SV *callback=&PL_sv_undef) 1150aio_nop (SV *callback=&PL_sv_undef)
920 ALIAS: 1151 ALIAS:
972 1203
973int 1204int
974poll_fileno() 1205poll_fileno()
975 PROTOTYPE: 1206 PROTOTYPE:
976 CODE: 1207 CODE:
977 RETVAL = respipe [0]; 1208 RETVAL = s_epipe_fd (&respipe);
978 OUTPUT: 1209 OUTPUT:
979 RETVAL 1210 RETVAL
980 1211
981int 1212int
982poll_cb(...) 1213poll_cb(...)
1022 CODE: 1253 CODE:
1023 RETVAL = eio_nthreads (); 1254 RETVAL = eio_nthreads ();
1024 OUTPUT: 1255 OUTPUT:
1025 RETVAL 1256 RETVAL
1026 1257
1258int
1259fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1260 PROTOTYPE: $$$$
1261 CODE:
1262#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1263 RETVAL = posix_fadvise (fh, offset, length, advice);
1264#else
1265 RETVAL = errno = ENOSYS;
1266#endif
1267 OUTPUT:
1268 RETVAL
1269
1270ssize_t
1271sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1272 PROTOTYPE: $$$$
1273 CODE:
1274 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1275 OUTPUT:
1276 RETVAL
1277
1027void _on_next_submit (SV *cb) 1278void _on_next_submit (SV *cb)
1028 CODE: 1279 CODE:
1029 SvREFCNT_dec (on_next_submit); 1280 SvREFCNT_dec (on_next_submit);
1030 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1281 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1031 1282
1038 CODE: 1289 CODE:
1039 eio_cancel (req); 1290 eio_cancel (req);
1040 1291
1041void 1292void
1042cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1293cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1043 CODE: 1294 PPCODE:
1295{
1296 if (GIMME_V != G_VOID)
1297 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1298
1299 if (items > 1)
1300 {
1301 SV *cb_cv =get_cb (callback);
1302
1044 SvREFCNT_dec (req->callback); 1303 SvREFCNT_dec (req->callback);
1045 req->callback = newSVsv (callback); 1304 req->callback = SvREFCNT_inc (cb_cv);
1305 }
1306}
1046 1307
1047MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1308MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1048 1309
1049void 1310void
1050add (aio_req grp, ...) 1311add (aio_req grp, ...)
1082 AV *av; 1343 AV *av;
1083 1344
1084 grp->errorno = errno; 1345 grp->errorno = errno;
1085 1346
1086 av = newAV (); 1347 av = newAV ();
1348 av_extend (av, items - 1);
1087 1349
1088 for (i = 1; i < items; ++i ) 1350 for (i = 1; i < items; ++i )
1089 av_push (av, newSVsv (ST (i))); 1351 av_push (av, newSVsv (ST (i)));
1090 1352
1091 SvREFCNT_dec (grp->sv1); 1353 SvREFCNT_dec (grp->sv1);
1105void 1367void
1106feed (aio_req grp, SV *callback=&PL_sv_undef) 1368feed (aio_req grp, SV *callback=&PL_sv_undef)
1107 CODE: 1369 CODE:
1108{ 1370{
1109 SvREFCNT_dec (grp->sv2); 1371 SvREFCNT_dec (grp->sv2);
1110 grp->sv2 = newSVsv (callback); 1372 grp->sv2 = newSVsv (callback);
1373 grp->feed = aio_grp_feed;
1111 1374
1112 if (grp->int2 <= 0) 1375 if (grp->int2 <= 0)
1113 grp->int2 = 2; 1376 grp->int2 = 2;
1114 1377
1115 eio_grp_limit (grp, grp->int2); 1378 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines