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.117 by root, Sat May 10 20:02:09 2008 UTC vs.
Revision 1.148 by root, Wed Jun 17 01:14:48 2009 UTC

… …
12#include <sys/types.h> 12#include <sys/types.h>
13#include <sys/stat.h> 13#include <sys/stat.h>
14#include <limits.h> 14#include <limits.h>
15#include <fcntl.h> 15#include <fcntl.h>
16#include <sched.h> 16#include <sched.h>
17
18/* perl namespace pollution */
19#undef VERSION
17 20
18#ifdef _WIN32 21#ifdef _WIN32
19 22
20# define EIO_STRUCT_DIRENT Direntry_t 23# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 24# undef malloc
… …
62# include <signal.h> 65# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
64 67
65#endif 68#endif
66 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
67#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
68 77
69/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 79#if IVSIZE >= 8
80# define VAL64 IV
71# define SvVAL64 SvIV 81# define SvVAL64 SvIV
82# define newSVval64 newSViv
72#else 83#else
84# define VAL64 NV
73# define SvVAL64 SvNV 85# define SvVAL64 SvNV
86# define newSVval64 newSVnv
74#endif 87#endif
88
89/*****************************************************************************/
90
91#if __GNUC__ >= 3
92# define expect(expr,value) __builtin_expect ((expr),(value))
93#else
94# define expect(expr,value) (expr)
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100/*****************************************************************************/
75 101
76static HV *stash; 102static HV *stash;
77typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
104typedef int aio_rfd; /* read file desriptor */
105typedef int aio_wfd; /* write file descriptor */
78 106
79#define AIO_REQ_KLASS "IO::AIO::REQ" 107#define AIO_REQ_KLASS "IO::AIO::REQ"
80#define AIO_GRP_KLASS "IO::AIO::GRP" 108#define AIO_GRP_KLASS "IO::AIO::GRP"
81 109
82#define EIO_COMMON \ 110#define EIO_REQ_MEMBERS \
83 SV *callback; \ 111 SV *callback; \
84 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 113 STRLEN stroffset; \
86 SV *self 114 SV *self;
115
116#define EIO_NO_WRAPPERS 1
87 117
88#include "libeio/eio.h" 118#include "libeio/eio.h"
119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122#endif
123
124#ifndef POSIX_FADV_SEQUENTIAL
125# define POSIX_FADV_SEQUENTIAL 0
126#endif
127
128#ifndef POSIX_FADV_RANDOM
129# define POSIX_FADV_RANDOM 0
130#endif
131
132#ifndef POSIX_FADV_NOREUSE
133# define POSIX_FADV_NOREUSE 0
134#endif
135
136#ifndef POSIX_FADV_WILLNEED
137# define POSIX_FADV_WILLNEED 0
138#endif
139
140#ifndef POSIX_FADV_DONTNEED
141# define POSIX_FADV_DONTNEED 0
142#endif
89 143
90static int req_invoke (eio_req *req); 144static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 145#define EIO_FINISH(req) req_invoke (req)
92static void aio_grp_feed (eio_req *grp);
93#define EIO_FEED(req) aio_grp_feed (req)
94static void req_destroy (eio_req *grp); 146static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 147#define EIO_DESTROY(req) req_destroy (req)
96 148
97enum { 149enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 150 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
102 154
103typedef eio_req *aio_req; 155typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 156typedef eio_req *aio_req_ornot;
105 157
106static SV *on_next_submit; 158static SV *on_next_submit;
107static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 159static int next_pri = EIO_PRI_DEFAULT;
108static int max_outstanding; 160static int max_outstanding;
109 161
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 162static int respipe_osf [2], respipe [2] = { -1, -1 };
111 163
112static void req_destroy (aio_req req); 164static void req_destroy (aio_req req);
… …
170 222
171static void req_submit (eio_req *req) 223static void req_submit (eio_req *req)
172{ 224{
173 eio_submit (req); 225 eio_submit (req);
174 226
175 if (on_next_submit) 227 if (expect_false (on_next_submit))
176 { 228 {
177 dSP; 229 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 230 SV *cb = sv_2mortal (on_next_submit);
179 231
180 on_next_submit = 0; 232 on_next_submit = 0;
… …
190 dSP; 242 dSP;
191 243
192 if (req->flags & FLAG_SV2_RO_OFF) 244 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 245 SvREADONLY_off (req->sv2);
194 246
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 247 if (!EIO_CANCELLED (req) && req->callback)
196 { 248 {
197 ENTER; 249 ENTER;
198 SAVETMPS; 250 SAVETMPS;
199 PUSHMARK (SP); 251 PUSHMARK (SP);
200 EXTEND (SP, 1); 252 EXTEND (SP, 1);
… …
206 SV *rv = &PL_sv_undef; 258 SV *rv = &PL_sv_undef;
207 259
208 if (req->result >= 0) 260 if (req->result >= 0)
209 { 261 {
210 int i; 262 int i;
211 char *buf = req->ptr2; 263 char *names = (char *)req->ptr2;
264 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
212 AV *av = newAV (); 265 AV *av = newAV ();
213 266
214 av_extend (av, req->result - 1); 267 av_extend (av, req->result - 1);
215 268
216 for (i = 0; i < req->result; ++i) 269 for (i = 0; i < req->result; ++i)
217 { 270 {
218 SV *sv = newSVpv (buf, 0); 271 if (req->int1 & EIO_READDIR_DENTS)
272 {
273 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
219 274
275 if (req->int1 & EIO_READDIR_CUSTOM2)
276 {
277 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
278 AV *avent = newAV ();
279
280 av_extend (avent, 2);
281
282 if (!sv_type [ent->type])
283 {
284 sv_type [ent->type] = newSViv (ent->type);
285 SvREADONLY_on (sv_type [ent->type]);
286 }
287
288 av_store (avent, 0, namesv);
289 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
290 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
291
292 av_store (av, i, newRV_noinc ((SV *)avent));
293 }
294 else
220 av_store (av, i, sv); 295 av_store (av, i, namesv);
296
297 ++ent;
298 }
299 else
300 {
301 SV *name = newSVpv (names, 0);
302 av_store (av, i, name);
221 buf += SvCUR (sv) + 1; 303 names += SvCUR (name) + 1;
304 }
222 } 305 }
223 306
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 307 rv = sv_2mortal (newRV_noinc ((SV *)av));
225 } 308 }
226 309
227 PUSHs (rv); 310 PUSHs (rv);
311
312 if (req->int1 & EIO_READDIR_CUSTOM1)
313 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
228 } 314 }
229 break; 315 break;
230 316
231 case EIO_OPEN: 317 case EIO_OPEN:
232 { 318 {
… …
238 GV *gv = (GV *)sv_newmortal (); 324 GV *gv = (GV *)sv_newmortal ();
239 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 325 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
240 char sym [64]; 326 char sym [64];
241 int symlen; 327 int symlen;
242 328
243 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 329 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
244 gv_init (gv, stash, sym, symlen, 0); 330 gv_init (gv, stash, sym, symlen, 0);
245 331
246 symlen = snprintf ( 332 symlen = snprintf (
247 sym, 333 sym,
248 sizeof (sym), 334 sizeof (sym),
249 "%s&=%d", 335 "%s&=%d",
250 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 336 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
251 req->result 337 (int)req->result
252 ); 338 );
253 339
254 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 340 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
255 fh = (SV *)gv; 341 fh = (SV *)gv;
256 } 342 }
… …
277 case EIO_BUSY: 363 case EIO_BUSY:
278 break; 364 break;
279 365
280 case EIO_READLINK: 366 case EIO_READLINK:
281 if (req->result > 0) 367 if (req->result > 0)
282 { 368 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
283 SvCUR_set (req->sv2, req->result);
284 *SvEND (req->sv2) = 0;
285 PUSHs (req->sv2);
286 }
287 break; 369 break;
288 370
289 case EIO_STAT: 371 case EIO_STAT:
290 case EIO_LSTAT: 372 case EIO_LSTAT:
291 case EIO_FSTAT: 373 case EIO_FSTAT:
… …
294 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 376 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
295 PUSHs (sv_2mortal (newSViv (req->result))); 377 PUSHs (sv_2mortal (newSViv (req->result)));
296 break; 378 break;
297 379
298 case EIO_READ: 380 case EIO_READ:
381 {
299 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 382 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
300 *SvEND (req->sv2) = 0; 383 *SvEND (req->sv2) = 0;
384 SvPOK_only (req->sv2);
385 SvSETMAGIC (req->sv2);
301 PUSHs (sv_2mortal (newSViv (req->result))); 386 PUSHs (sv_2mortal (newSViv (req->result)));
387 }
302 break; 388 break;
303 389
304 case EIO_DUP2: 390 case EIO_DUP2:
305 if (req->result > 0) 391 if (req->result > 0)
306 req->result = 0; 392 req->result = 0;
… …
411 X_UNLOCK (reslock); 497 X_UNLOCK (reslock);
412 498
413 if (size) 499 if (size)
414 return; 500 return;
415 501
416 maybe_start_thread (); 502 etp_maybe_start_thread ();
417 503
418 FD_ZERO (&rfd); 504 FD_ZERO (&rfd);
419 FD_SET (respipe [0], &rfd); 505 FD_SET (respipe [0], &rfd);
420 506
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 507 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 508 }
423} 509}
424 510
425static int poll_cb (void) 511static int poll_cb (void)
426{ 512{
427 int res; 513 for (;;)
428
429 do
430 { 514 {
431 res = eio_poll (); 515 int res = eio_poll ();
432 516
433 if (res > 0) 517 if (res > 0)
434 croak (0); 518 croak (0);
519
520 if (!max_outstanding || max_outstanding > eio_nreqs ())
521 return res;
522
523 poll_wait ();
435 } 524 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 525}
440 526
441static void atfork_child (void) 527static void atfork_child (void)
442{ 528{
443 create_respipe (); 529 create_respipe ();
444} 530}
445 531
532static SV *
533get_cb (SV *cb_sv)
534{
535 HV *st;
536 GV *gvp;
537 CV *cv;
538
539 if (!SvOK (cb_sv))
540 return 0;
541
542 cv = sv_2cv (cb_sv, &st, &gvp, 0);
543
544 if (!cv)
545 croak ("IO::AIO callback must be undef or a CODE reference");
546
547 return (SV *)cv;
548}
549
446#define dREQ \ 550#define dREQ \
551 SV *cb_cv; \
447 aio_req req; \ 552 aio_req req; \
448 int req_pri = next_pri; \ 553 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 554 next_pri = EIO_PRI_DEFAULT; \
450 \ 555 \
451 if (SvOK (callback) && !SvROK (callback)) \ 556 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 557 \
454 Newz (0, req, 1, eio_req); \ 558 Newz (0, req, 1, eio_req); \
455 if (!req) \ 559 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 560 croak ("out of memory during eio_req allocation"); \
457 \ 561 \
458 req->callback = newSVsv (callback); \ 562 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 563 req->pri = req_pri
460 564
461#define REQ_SEND \ 565#define REQ_SEND \
566 PUTBACK; \
462 req_submit (req); \ 567 req_submit (req); \
568 SPAGAIN; \
463 \ 569 \
464 if (GIMME_V != G_VOID) \ 570 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 571 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 572
573static int
574extract_fd (SV *fh, int wr)
575{
576 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
577
578 if (fd < 0)
579 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
580
581 return fd;
582}
583
467MODULE = IO::AIO PACKAGE = IO::AIO 584MODULE = IO::AIO PACKAGE = IO::AIO
468 585
469PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
470 587
471BOOT: 588BOOT:
472{ 589{
473 stash = gv_stashpv ("IO::AIO", 1); 590 static const struct {
474 591 const char *name;
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 592 IV iv;
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 593 } *civ, const_iv[] = {
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 594# define const_iv(name, value) { # name, (IV) value },
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 595# define const_eio(name) { # name, (IV) EIO_ ## name },
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 596 const_iv (EXDEV , EXDEV)
597 const_iv (ENOSYS , ENOSYS)
598 const_iv (O_RDONLY, O_RDONLY)
599 const_iv (O_WRONLY, O_WRONLY)
600 const_iv (O_CREAT , O_CREAT)
601 const_iv (O_TRUNC , O_TRUNC)
480#ifdef _WIN32 602#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock); 603 const_iv (S_IFIFO , S_IFIFO)
482 X_MUTEX_CHECK (reslock);
483 X_MUTEX_CHECK (reqlock);
484 X_MUTEX_CHECK (reqwait);
485 X_MUTEX_CHECK (preadwritelock);
486 X_MUTEX_CHECK (readdirlock);
487
488 X_COND_CHECK (reqwait);
489#else
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#endif 604#endif
605 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
606 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
607 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
608 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
609 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
610 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
492 611
612 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
613 const_eio (SYNC_FILE_RANGE_WRITE)
614 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
615
616 const_eio (READDIR_DENTS)
617 const_eio (READDIR_DIRS_FIRST)
618 const_eio (READDIR_STAT_ORDER)
619 const_eio (READDIR_FOUND_UNKNOWN)
620
621 const_eio (DT_UNKNOWN)
622 const_eio (DT_FIFO)
623 const_eio (DT_CHR)
624 const_eio (DT_DIR)
625 const_eio (DT_BLK)
626 const_eio (DT_REG)
627 const_eio (DT_LNK)
628 const_eio (DT_SOCK)
629 const_eio (DT_WHT)
630 };
631
632 stash = gv_stashpv ("IO::AIO", 1);
633
634 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
635 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
636
493 create_respipe (); 637 create_respipe ();
494 638
495 if (eio_init (want_poll, done_poll) < 0) 639 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 640 croak ("IO::AIO: unable to initialise eio library");
497 641
498 /* atfork child called in fifo order, so before eio's handler */ 642 /* atfork child called in fifo order, so before eio's handler */
499 X_THREAD_ATFORK (0, 0, atfork_child); 643 X_THREAD_ATFORK (0, 0, atfork_child);
500} 644}
501 645
502void 646void
503max_poll_reqs (int nreqs) 647max_poll_reqs (int nreqs)
504 PROTOTYPE: $ 648 PROTOTYPE: $
… …
557 ALIAS: 701 ALIAS:
558 aio_fsync = EIO_FSYNC 702 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 703 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 704 PPCODE:
561{ 705{
706 int fd = extract_fd (fh, 0);
562 dREQ; 707 dREQ;
563 708
564 req->type = ix; 709 req->type = ix;
565 req->sv1 = newSVsv (fh); 710 req->sv1 = newSVsv (fh);
566 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 711 req->int1 = fd;
712
713 REQ_SEND (req);
714}
715
716void
717aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
718 PROTOTYPE: $$$$;$
719 PPCODE:
720{
721 int fd = extract_fd (fh, 0);
722 dREQ;
723
724 req->type = EIO_SYNC_FILE_RANGE;
725 req->sv1 = newSVsv (fh);
726 req->int1 = fd;
727 req->offs = offset;
728 req->size = nbytes;
729 req->int2 = flags;
567 730
568 REQ_SEND (req); 731 REQ_SEND (req);
569} 732}
570 733
571void 734void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 735aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 736 PROTOTYPE: $;$
574 PPCODE: 737 PPCODE:
575{ 738{
576 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 739 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
740 int fd = extract_fd (fh, 0);
577 dREQ; 741 dREQ;
578 742
579 if (close_pipe < 0) 743 if (close_pipe < 0)
580 { 744 {
581 int pipefd [2]; 745 int pipefd [2];
… …
589 } 753 }
590 754
591 req->type = EIO_DUP2; 755 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 756 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 757 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 758 req->int2 = fd;
595 759
596 REQ_SEND (req); 760 REQ_SEND (req);
597} 761}
598 762
599void 763void
… …
603 aio_write = EIO_WRITE 767 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 768 PROTOTYPE: $$$$$;$
605 PPCODE: 769 PPCODE:
606{ 770{
607 STRLEN svlen; 771 STRLEN svlen;
772 int fd = extract_fd (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 773 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 774 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 775
614 if (dataoffset < 0) 776 if (dataoffset < 0)
615 dataoffset += svlen; 777 dataoffset += svlen;
616 778
617 if (dataoffset < 0 || dataoffset > svlen) 779 if (dataoffset < 0 || dataoffset > svlen)
… …
623 if (!SvOK (length) || len + dataoffset > svlen) 785 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 786 len = svlen - dataoffset;
625 } 787 }
626 else 788 else
627 { 789 {
628 /* read: grow scalar as necessary */ 790 /* read: check type and grow scalar as necessary */
791 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 792 svptr = SvGROW (data, len + dataoffset + 1);
630 } 793 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 794
635 { 795 {
636 dREQ; 796 dREQ;
637 797
638 req->type = ix; 798 req->type = ix;
639 req->sv1 = newSVsv (fh); 799 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 800 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 801 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 802 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 803 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 804 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 805 req->stroffset = dataoffset;
… …
661 PPCODE: 820 PPCODE:
662{ 821{
663 SV *data; 822 SV *data;
664 dREQ; 823 dREQ;
665 824
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 825 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 826 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 827 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 828
675 REQ_SEND; 829 REQ_SEND;
676} 830}
677 831
678void 832void
679aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 833aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
680 PROTOTYPE: $$$$;$ 834 PROTOTYPE: $$$$;$
681 PPCODE: 835 PPCODE:
682{ 836{
837 int ifd = extract_fd (in_fh , 0);
838 int ofd = extract_fd (out_fh, 0);
683 dREQ; 839 dREQ;
684 840
685 req->type = EIO_SENDFILE; 841 req->type = EIO_SENDFILE;
686 req->sv1 = newSVsv (out_fh); 842 req->sv1 = newSVsv (out_fh);
687 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 843 req->int1 = ofd;
688 req->sv2 = newSVsv (in_fh); 844 req->sv2 = newSVsv (in_fh);
689 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 845 req->int2 = ifd;
690 req->offs = SvVAL64 (in_offset); 846 req->offs = in_offset;
691 req->size = length; 847 req->size = length;
692 848
693 REQ_SEND; 849 REQ_SEND;
694} 850}
695 851
696void 852void
697aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 853aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
698 PROTOTYPE: $$$;$ 854 PROTOTYPE: $$$;$
699 PPCODE: 855 PPCODE:
700{ 856{
857 int fd = extract_fd (fh, 0);
701 dREQ; 858 dREQ;
702 859
703 req->type = EIO_READAHEAD; 860 req->type = EIO_READAHEAD;
704 req->sv1 = newSVsv (fh); 861 req->sv1 = newSVsv (fh);
705 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 862 req->int1 = fd;
706 req->offs = SvVAL64 (offset); 863 req->offs = offset;
707 req->size = length; 864 req->size = length;
708 865
709 REQ_SEND; 866 REQ_SEND;
710} 867}
711 868
… …
716 aio_lstat = EIO_LSTAT 873 aio_lstat = EIO_LSTAT
717 PPCODE: 874 PPCODE:
718{ 875{
719 dREQ; 876 dREQ;
720 877
721 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
722 if (!req->ptr2)
723 {
724 req_destroy (req);
725 croak ("out of memory during aio_stat statdata allocation");
726 }
727
728 req->flags |= EIO_FLAG_PTR2_FREE;
729 req->sv1 = newSVsv (fh_or_path); 878 req->sv1 = newSVsv (fh_or_path);
730 879
731 if (SvPOK (fh_or_path)) 880 if (SvPOK (req->sv1))
732 { 881 {
733 req->type = ix; 882 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 883 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 884 }
736 else 885 else
… …
750 899
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 900 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 901 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 902 req->sv1 = newSVsv (fh_or_path);
754 903
755 if (SvPOK (fh_or_path)) 904 if (SvPOK (req->sv1))
756 { 905 {
757 req->type = EIO_UTIME; 906 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 907 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 908 }
760 else 909 else
… …
773 dREQ; 922 dREQ;
774 923
775 req->sv1 = newSVsv (fh_or_path); 924 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 925 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 926
778 if (SvPOK (fh_or_path)) 927 if (SvPOK (req->sv1))
779 { 928 {
780 req->type = EIO_TRUNCATE; 929 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 930 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 931 }
783 else 932 else
… …
791 940
792void 941void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 942aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 943 ALIAS:
795 aio_chmod = EIO_CHMOD 944 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 945 aio_mkdir = EIO_MKDIR
798 PPCODE: 946 PPCODE:
799{ 947{
800 dREQ; 948 dREQ;
801 949
802 req->type = ix;
803 req->int2 = mode; 950 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 951 req->sv1 = newSVsv (fh_or_path);
805 952
806 if (ix == EIO_FCHMOD) 953 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 954 {
955 req->type = ix;
956 req->ptr1 = SvPVbyte_nolen (req->sv1);
957 }
808 else 958 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 959 {
960 req->type = EIO_FCHMOD;
961 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
962 }
810 963
811 REQ_SEND; 964 REQ_SEND;
812} 965}
813 966
814void 967void
… …
819 972
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 973 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 974 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 975 req->sv1 = newSVsv (fh_or_path);
823 976
824 if (SvPOK (fh_or_path)) 977 if (SvPOK (req->sv1))
825 { 978 {
826 req->type = EIO_CHOWN; 979 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 980 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 981 }
829 else 982 else
… …
831 req->type = EIO_FCHOWN; 984 req->type = EIO_FCHOWN;
832 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 985 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
833 } 986 }
834 987
835 REQ_SEND; 988 REQ_SEND;
989}
990
991void
992aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
993 PPCODE:
994{
995 dREQ;
996
997 req->type = EIO_READDIR;
998 req->sv1 = newSVsv (pathname);
999 req->ptr1 = SvPVbyte_nolen (req->sv1);
1000 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1001
1002 if (flags & EIO_READDIR_DENTS)
1003 req->int1 |= EIO_READDIR_CUSTOM2;
1004
1005 REQ_SEND;
836} 1006}
837 1007
838void 1008void
839aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1009aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
840 ALIAS: 1010 ALIAS:
… …
905{ 1075{
906 dREQ; 1076 dREQ;
907 1077
908 req->type = EIO_GROUP; 1078 req->type = EIO_GROUP;
909 1079
910 eio_submit (req); 1080 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1081 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 1082}
913 1083
914void 1084void
915aio_nop (SV *callback=&PL_sv_undef) 1085aio_nop (SV *callback=&PL_sv_undef)
… …
927 1097
928int 1098int
929aioreq_pri (int pri = 0) 1099aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 1100 PROTOTYPE: ;$
931 CODE: 1101 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 1102 RETVAL = next_pri;
933 if (items > 0) 1103 if (items > 0)
934 { 1104 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1105 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1106 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 1107 next_pri = pri;
938 } 1108 }
939 OUTPUT: 1109 OUTPUT:
940 RETVAL 1110 RETVAL
941 1111
942void 1112void
943aioreq_nice (int nice = 0) 1113aioreq_nice (int nice = 0)
944 CODE: 1114 CODE:
945 nice = next_pri - nice; 1115 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1116 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1117 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 1118 next_pri = nice;
949 1119
950void 1120void
951flush () 1121flush ()
952 PROTOTYPE: 1122 PROTOTYPE:
953 CODE: 1123 CODE:
… …
1014 1184
1015int 1185int
1016nthreads() 1186nthreads()
1017 PROTOTYPE: 1187 PROTOTYPE:
1018 CODE: 1188 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1189 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1190 OUTPUT:
1023 RETVAL 1191 RETVAL
1024 1192
1193int
1194fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1195 PROTOTYPE: $$$$
1196 CODE:
1197{
1198 #if _XOPEN_SOURCE >= 600
1199 RETVAL = posix_fadvise (fh, offset, length, advice);
1200 #else
1201 RETVAL = errno = ENOSYS;
1202 #endif
1203}
1204 OUTPUT:
1205 RETVAL
1206
1207ssize_t
1208sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1209 PROTOTYPE: $$$$
1210 CODE:
1211 eio_sendfile_sync (ofh, ifh, offset, count);
1212
1025void _on_next_submit (SV *cb) 1213void _on_next_submit (SV *cb)
1026 CODE: 1214 CODE:
1027 SvREFCNT_dec (on_next_submit); 1215 SvREFCNT_dec (on_next_submit);
1028 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1216 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1029 1217
… …
1036 CODE: 1224 CODE:
1037 eio_cancel (req); 1225 eio_cancel (req);
1038 1226
1039void 1227void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1228cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 CODE: 1229 PPCODE:
1230{
1231 if (GIMME_V != G_VOID)
1232 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1233
1234 if (items > 1)
1235 {
1236 SV *cb_cv = get_cb (callback);
1237
1042 SvREFCNT_dec (req->callback); 1238 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1239 req->callback = SvREFCNT_inc (cb_cv);
1240 }
1241}
1044 1242
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1243MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1244
1047void 1245void
1048add (aio_req grp, ...) 1246add (aio_req grp, ...)
… …
1080 AV *av; 1278 AV *av;
1081 1279
1082 grp->errorno = errno; 1280 grp->errorno = errno;
1083 1281
1084 av = newAV (); 1282 av = newAV ();
1283 av_extend (av, items - 1);
1085 1284
1086 for (i = 1; i < items; ++i ) 1285 for (i = 1; i < items; ++i )
1087 av_push (av, newSVsv (ST (i))); 1286 av_push (av, newSVsv (ST (i)));
1088 1287
1089 SvREFCNT_dec (grp->sv1); 1288 SvREFCNT_dec (grp->sv1);
… …
1103void 1302void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1303feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1304 CODE:
1106{ 1305{
1107 SvREFCNT_dec (grp->sv2); 1306 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1307 grp->sv2 = newSVsv (callback);
1308 grp->feed = aio_grp_feed;
1109 1309
1110 if (grp->int2 <= 0) 1310 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1311 grp->int2 = 2;
1112 1312
1113 eio_grp_limit (grp, grp->int2); 1313 eio_grp_limit (grp, grp->int2);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines