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.120 by root, Sun May 11 19:17:09 2008 UTC vs.
Revision 1.155 by root, Fri Jul 17 00:56:54 2009 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>
65# include <signal.h> 67# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 68# define EIO_STRUCT_DIRENT struct dirent
67 69
68#endif 70#endif
69 71
72/* perl stupidly overrides readdir and maybe others */
73/* with thread-unsafe versions, imagine that :( */
74#undef readdir
75#undef opendir
76#undef closedir
77
70#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
71 79
72/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
74# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
75#else 85#else
86# define VAL64 NV
76# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
77#endif 89#endif
90
91/*****************************************************************************/
92
93#if __GNUC__ >= 3
94# define expect(expr,value) __builtin_expect ((expr),(value))
95#else
96# define expect(expr,value) (expr)
97#endif
98
99#define expect_false(expr) expect ((expr) != 0, 0)
100#define expect_true(expr) expect ((expr) != 0, 1)
101
102/*****************************************************************************/
78 103
79static HV *stash; 104static HV *stash;
80typedef 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 */
81 108
82#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
84 111
85#define EIO_COMMON \ 112#define EIO_REQ_MEMBERS \
86 SV *callback; \ 113 SV *callback; \
87 SV *sv1, *sv2; \ 114 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 115 STRLEN stroffset; \
89 SV *self 116 SV *self;
117
118#define EIO_NO_WRAPPERS 1
90 119
91#include "libeio/eio.h" 120#include "libeio/eio.h"
121
122#ifndef POSIX_FADV_NORMAL
123# define POSIX_FADV_NORMAL 0
124# define NO_FADVISE 1
125#endif
126
127#ifndef POSIX_FADV_SEQUENTIAL
128# define POSIX_FADV_SEQUENTIAL 0
129#endif
130
131#ifndef POSIX_FADV_RANDOM
132# define POSIX_FADV_RANDOM 0
133#endif
134
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138
139#ifndef POSIX_FADV_WILLNEED
140# define POSIX_FADV_WILLNEED 0
141#endif
142
143#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0
145#endif
92 146
93static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
99 151
100enum { 152enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
105 157
106typedef eio_req *aio_req; 158typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
108 160
109static SV *on_next_submit; 161static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 162static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 163static int max_outstanding;
112 164
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static s_epipe respipe;
114 166
115static void req_destroy (aio_req req); 167static void req_destroy (aio_req req);
116static void req_cancel (aio_req req); 168static void req_cancel (aio_req req);
117 169
118static void want_poll (void) 170static void want_poll (void)
119{ 171{
120 /* write a dummy byte to the pipe so fh becomes ready */ 172 /* write a dummy byte to the pipe so fh becomes ready */
121 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 173 s_epipe_signal (&respipe);
122} 174}
123 175
124static void done_poll (void) 176static void done_poll (void)
125{ 177{
126 /* read any signals sent by the worker threads */ 178 /* read any signals sent by the worker threads */
127 char buf [4]; 179 s_epipe_drain (&respipe);
128 while (respipe_read (respipe [0], buf, 4) == 4)
129 ;
130} 180}
131 181
132/* must be called at most once */ 182/* must be called at most once */
133static SV *req_sv (aio_req req, const char *klass) 183static SV *req_sv (aio_req req, const char *klass)
134{ 184{
173 223
174static void req_submit (eio_req *req) 224static void req_submit (eio_req *req)
175{ 225{
176 eio_submit (req); 226 eio_submit (req);
177 227
178 if (on_next_submit) 228 if (expect_false (on_next_submit))
179 { 229 {
180 dSP; 230 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 231 SV *cb = sv_2mortal (on_next_submit);
182 232
183 on_next_submit = 0; 233 on_next_submit = 0;
193 dSP; 243 dSP;
194 244
195 if (req->flags & FLAG_SV2_RO_OFF) 245 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 246 SvREADONLY_off (req->sv2);
197 247
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 248 if (!EIO_CANCELLED (req) && req->callback)
199 { 249 {
200 ENTER; 250 ENTER;
201 SAVETMPS; 251 SAVETMPS;
202 PUSHMARK (SP); 252 PUSHMARK (SP);
203 EXTEND (SP, 1); 253 EXTEND (SP, 1);
209 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
210 260
211 if (req->result >= 0) 261 if (req->result >= 0)
212 { 262 {
213 int i; 263 int i;
214 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
215 AV *av = newAV (); 266 AV *av = newAV ();
216 267
217 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
218 269
219 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
220 { 271 {
221 SV *sv = newSVpv (buf, 0); 272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
222 275
276 if (req->int1 & EIO_READDIR_CUSTOM2)
277 {
278 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
279 AV *avent = newAV ();
280
281 av_extend (avent, 2);
282
283 if (!sv_type [ent->type])
284 {
285 sv_type [ent->type] = newSViv (ent->type);
286 SvREADONLY_on (sv_type [ent->type]);
287 }
288
289 av_store (avent, 0, namesv);
290 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
291 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
292
293 av_store (av, i, newRV_noinc ((SV *)avent));
294 }
295 else
223 av_store (av, i, sv); 296 av_store (av, i, namesv);
297
298 ++ent;
299 }
300 else
301 {
302 SV *name = newSVpv (names, 0);
303 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 304 names += SvCUR (name) + 1;
305 }
225 } 306 }
226 307
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 309 }
229 310
230 PUSHs (rv); 311 PUSHs (rv);
312
313 if (req->int1 & EIO_READDIR_CUSTOM1)
314 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 315 }
232 break; 316 break;
233 317
234 case EIO_OPEN: 318 case EIO_OPEN:
235 { 319 {
241 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
242 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
243 char sym [64]; 327 char sym [64];
244 int symlen; 328 int symlen;
245 329
246 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
247 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
248 332
249 symlen = snprintf ( 333 symlen = snprintf (
250 sym, 334 sym,
251 sizeof (sym), 335 sizeof (sym),
252 "%s&=%d", 336 "%s&=%d",
253 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
254 req->result 338 (int)req->result
255 ); 339 );
256 340
257 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
258 fh = (SV *)gv; 342 fh = (SV *)gv;
259 } 343 }
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 378 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 379 break;
296 380
297 case EIO_READ: 381 case EIO_READ:
382 {
298 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 383 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
299 *SvEND (req->sv2) = 0; 384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
301 break; 389 break;
302 390
303 case EIO_DUP2: 391 case EIO_DUP2:
304 if (req->result > 0) 392 if (req->result > 0)
305 req->result = 0; 393 req->result = 0;
351 grp->sv2 = 0; 439 grp->sv2 = 0;
352 440
353 eio_grp_cancel (grp); 441 eio_grp_cancel (grp);
354} 442}
355 443
356#ifdef USE_SOCKETS_AS_HANDLES
357# define TO_SOCKET(x) (win32_get_osfhandle (x))
358#else
359# define TO_SOCKET(x) (x)
360#endif
361
362static void 444static void
363create_respipe (void) 445create_respipe (void)
364{ 446{
365 int old_readfd = respipe [0];
366
367 if (respipe [1] >= 0)
368 respipe_close (TO_SOCKET (respipe [1]));
369
370#ifdef _WIN32
371 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
372#else
373 if (pipe (respipe)) 447 if (s_epipe_renew (&respipe))
374#endif
375 croak ("unable to initialize result pipe"); 448 croak ("IO::AIO: unable to initialize result pipe");
376
377 if (old_readfd >= 0)
378 {
379 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
380 croak ("unable to initialize result pipe(2)");
381
382 respipe_close (respipe [0]);
383 respipe [0] = old_readfd;
384 }
385
386#ifdef _WIN32
387 int arg = 1;
388 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
389 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
390#else
391 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
392 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
393#endif
394 croak ("unable to initialize result pipe(3)");
395
396 respipe_osf [0] = TO_SOCKET (respipe [0]);
397 respipe_osf [1] = TO_SOCKET (respipe [1]);
398} 449}
399 450
400static void poll_wait (void) 451static void poll_wait (void)
401{ 452{
402 fd_set rfd;
403
404 while (eio_nreqs ()) 453 while (eio_nreqs ())
405 { 454 {
406 int size; 455 int size;
407 456
408 X_LOCK (reslock); 457 X_LOCK (reslock);
410 X_UNLOCK (reslock); 459 X_UNLOCK (reslock);
411 460
412 if (size) 461 if (size)
413 return; 462 return;
414 463
415 maybe_start_thread (); 464 etp_maybe_start_thread ();
416 465
417 FD_ZERO (&rfd); 466 s_epipe_wait (&respipe);
418 FD_SET (respipe [0], &rfd);
419
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 467 }
422} 468}
423 469
424static int poll_cb (void) 470static int poll_cb (void)
425{ 471{
426 int res; 472 for (;;)
427
428 do
429 { 473 {
430 res = eio_poll (); 474 int res = eio_poll ();
431 475
432 if (res > 0) 476 if (res > 0)
433 croak (0); 477 croak (0);
478
479 if (!max_outstanding || max_outstanding > eio_nreqs ())
480 return res;
481
482 poll_wait ();
434 } 483 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 484}
439 485
440static void atfork_child (void) 486static void atfork_child (void)
441{ 487{
442 create_respipe (); 488 create_respipe ();
443} 489}
444 490
491static SV *
492get_cb (SV *cb_sv)
493{
494 SvGETMAGIC (cb_sv);
495 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
496}
497
445#define dREQ \ 498#define dREQ \
499 SV *cb_cv; \
446 aio_req req; \ 500 aio_req req; \
447 int req_pri = next_pri; \ 501 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 502 next_pri = EIO_PRI_DEFAULT; \
449 \ 503 \
450 if (SvOK (callback) && !SvROK (callback)) \ 504 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 505 \
453 Newz (0, req, 1, eio_req); \ 506 Newz (0, req, 1, eio_req); \
454 if (!req) \ 507 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 508 croak ("out of memory during eio_req allocation"); \
456 \ 509 \
457 req->callback = newSVsv (callback); \ 510 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 511 req->pri = req_pri
459 512
460#define REQ_SEND \ 513#define REQ_SEND \
514 PUTBACK; \
461 req_submit (req); \ 515 req_submit (req); \
516 SPAGAIN; \
462 \ 517 \
463 if (GIMME_V != G_VOID) \ 518 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 519 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 520
466MODULE = IO::AIO PACKAGE = IO::AIO 521MODULE = IO::AIO PACKAGE = IO::AIO
467 522
468PROTOTYPES: ENABLE 523PROTOTYPES: ENABLE
469 524
470BOOT: 525BOOT:
471{ 526{
472 stash = gv_stashpv ("IO::AIO", 1); 527 static const struct {
473 528 const char *name;
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 529 IV iv;
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 } *civ, const_iv[] = {
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531# define const_iv(name, value) { # name, (IV) value },
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532# define const_eio(name) { # name, (IV) EIO_ ## name },
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 const_iv (EXDEV , EXDEV)
534 const_iv (ENOSYS , ENOSYS)
535 const_iv (O_RDONLY, O_RDONLY)
536 const_iv (O_WRONLY, O_WRONLY)
537 const_iv (O_CREAT , O_CREAT)
538 const_iv (O_TRUNC , O_TRUNC)
479#ifdef _WIN32 539#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 540 const_iv (S_IFIFO , S_IFIFO)
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#endif 541#endif
542 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
543 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
544 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
545 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
546 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
547 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
491 548
549 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
550 const_eio (SYNC_FILE_RANGE_WRITE)
551 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
552
553 const_eio (READDIR_DENTS)
554 const_eio (READDIR_DIRS_FIRST)
555 const_eio (READDIR_STAT_ORDER)
556 const_eio (READDIR_FOUND_UNKNOWN)
557
558 const_eio (DT_UNKNOWN)
559 const_eio (DT_FIFO)
560 const_eio (DT_CHR)
561 const_eio (DT_DIR)
562 const_eio (DT_BLK)
563 const_eio (DT_REG)
564 const_eio (DT_LNK)
565 const_eio (DT_SOCK)
566 const_eio (DT_WHT)
567 };
568
569 stash = gv_stashpv ("IO::AIO", 1);
570
571 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
573
492 create_respipe (); 574 create_respipe ();
493 575
494 if (eio_init (want_poll, done_poll) < 0) 576 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 577 croak ("IO::AIO: unable to initialise eio library");
496 578
497 /* atfork child called in fifo order, so before eio's handler */ 579 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 580 X_THREAD_ATFORK (0, 0, atfork_child);
499} 581}
500 582
501void 583void
502max_poll_reqs (int nreqs) 584max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 585 PROTOTYPE: $
556 ALIAS: 638 ALIAS:
557 aio_fsync = EIO_FSYNC 639 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 640 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 641 PPCODE:
560{ 642{
643 int fd = s_fileno_croak (fh, 0);
561 dREQ; 644 dREQ;
562 645
563 req->type = ix; 646 req->type = ix;
564 req->sv1 = newSVsv (fh); 647 req->sv1 = newSVsv (fh);
565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 648 req->int1 = fd;
649
650 REQ_SEND (req);
651}
652
653void
654aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
655 PROTOTYPE: $$$$;$
656 PPCODE:
657{
658 int fd = s_fileno_croak (fh, 0);
659 dREQ;
660
661 req->type = EIO_SYNC_FILE_RANGE;
662 req->sv1 = newSVsv (fh);
663 req->int1 = fd;
664 req->offs = offset;
665 req->size = nbytes;
666 req->int2 = flags;
566 667
567 REQ_SEND (req); 668 REQ_SEND (req);
568} 669}
569 670
570void 671void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 672aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 673 PROTOTYPE: $;$
573 PPCODE: 674 PPCODE:
574{ 675{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 676 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
677 int fd = s_fileno_croak (fh, 0);
576 dREQ; 678 dREQ;
577 679
578 if (close_pipe < 0) 680 if (close_pipe < 0)
579 { 681 {
580 int pipefd [2]; 682 int pipefd [2];
588 } 690 }
589 691
590 req->type = EIO_DUP2; 692 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 693 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 694 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 695 req->int2 = fd;
594 696
595 REQ_SEND (req); 697 REQ_SEND (req);
596} 698}
597 699
598void 700void
602 aio_write = EIO_WRITE 704 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 705 PROTOTYPE: $$$$$;$
604 PPCODE: 706 PPCODE:
605{ 707{
606 STRLEN svlen; 708 STRLEN svlen;
709 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 710 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 711 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 712
613 if (dataoffset < 0) 713 if (dataoffset < 0)
614 dataoffset += svlen; 714 dataoffset += svlen;
615 715
616 if (dataoffset < 0 || dataoffset > svlen) 716 if (dataoffset < 0 || dataoffset > svlen)
622 if (!SvOK (length) || len + dataoffset > svlen) 722 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 723 len = svlen - dataoffset;
624 } 724 }
625 else 725 else
626 { 726 {
627 /* read: grow scalar as necessary */ 727 /* read: check type and grow scalar as necessary */
728 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 729 svptr = SvGROW (data, len + dataoffset + 1);
629 } 730 }
630
631 if (len < 0)
632 croak ("length must not be negative");
633 731
634 { 732 {
635 dREQ; 733 dREQ;
636 734
637 req->type = ix; 735 req->type = ix;
638 req->sv1 = newSVsv (fh); 736 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 737 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 738 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 739 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 740 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 741 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 742 req->stroffset = dataoffset;
668 765
669 REQ_SEND; 766 REQ_SEND;
670} 767}
671 768
672void 769void
673aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 770aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
674 PROTOTYPE: $$$$;$ 771 PROTOTYPE: $$$$;$
675 PPCODE: 772 PPCODE:
676{ 773{
774 int ifd = s_fileno_croak (in_fh , 0);
775 int ofd = s_fileno_croak (out_fh, 1);
677 dREQ; 776 dREQ;
678 777
679 req->type = EIO_SENDFILE; 778 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 779 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 780 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 781 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 782 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 783 req->offs = in_offset;
685 req->size = length; 784 req->size = length;
686 785
687 REQ_SEND; 786 REQ_SEND;
688} 787}
689 788
690void 789void
691aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 790aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
692 PROTOTYPE: $$$;$ 791 PROTOTYPE: $$$;$
693 PPCODE: 792 PPCODE:
694{ 793{
794 int fd = s_fileno_croak (fh, 0);
695 dREQ; 795 dREQ;
696 796
697 req->type = EIO_READAHEAD; 797 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 798 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 799 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 800 req->offs = offset;
701 req->size = length; 801 req->size = length;
702 802
703 REQ_SEND; 803 REQ_SEND;
704} 804}
705 805
821 req->type = EIO_FCHOWN; 921 req->type = EIO_FCHOWN;
822 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 922 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
823 } 923 }
824 924
825 REQ_SEND; 925 REQ_SEND;
926}
927
928void
929aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
930 PPCODE:
931{
932 dREQ;
933
934 req->type = EIO_READDIR;
935 req->sv1 = newSVsv (pathname);
936 req->ptr1 = SvPVbyte_nolen (req->sv1);
937 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
938
939 if (flags & EIO_READDIR_DENTS)
940 req->int1 |= EIO_READDIR_CUSTOM2;
941
942 REQ_SEND;
826} 943}
827 944
828void 945void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 946aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 947 ALIAS:
895{ 1012{
896 dREQ; 1013 dREQ;
897 1014
898 req->type = EIO_GROUP; 1015 req->type = EIO_GROUP;
899 1016
900 eio_submit (req); 1017 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1018 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 1019}
903 1020
904void 1021void
905aio_nop (SV *callback=&PL_sv_undef) 1022aio_nop (SV *callback=&PL_sv_undef)
917 1034
918int 1035int
919aioreq_pri (int pri = 0) 1036aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 1037 PROTOTYPE: ;$
921 CODE: 1038 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 1039 RETVAL = next_pri;
923 if (items > 0) 1040 if (items > 0)
924 { 1041 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1042 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1043 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 1044 next_pri = pri;
928 } 1045 }
929 OUTPUT: 1046 OUTPUT:
930 RETVAL 1047 RETVAL
931 1048
932void 1049void
933aioreq_nice (int nice = 0) 1050aioreq_nice (int nice = 0)
934 CODE: 1051 CODE:
935 nice = next_pri - nice; 1052 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1053 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1054 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 1055 next_pri = nice;
939 1056
940void 1057void
941flush () 1058flush ()
942 PROTOTYPE: 1059 PROTOTYPE:
943 CODE: 1060 CODE:
958 1075
959int 1076int
960poll_fileno() 1077poll_fileno()
961 PROTOTYPE: 1078 PROTOTYPE:
962 CODE: 1079 CODE:
963 RETVAL = respipe [0]; 1080 RETVAL = s_epipe_fd (&respipe);
964 OUTPUT: 1081 OUTPUT:
965 RETVAL 1082 RETVAL
966 1083
967int 1084int
968poll_cb(...) 1085poll_cb(...)
1004 1121
1005int 1122int
1006nthreads() 1123nthreads()
1007 PROTOTYPE: 1124 PROTOTYPE:
1008 CODE: 1125 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1126 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1127 OUTPUT:
1013 RETVAL 1128 RETVAL
1014 1129
1130int
1131fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1132 PROTOTYPE: $$$$
1133 CODE:
1134#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1135 RETVAL = posix_fadvise (fh, offset, length, advice);
1136#else
1137 RETVAL = errno = ENOSYS;
1138#endif
1139 OUTPUT:
1140 RETVAL
1141
1142ssize_t
1143sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1144 PROTOTYPE: $$$$
1145 CODE:
1146 eio_sendfile_sync (ofh, ifh, offset, count);
1147
1015void _on_next_submit (SV *cb) 1148void _on_next_submit (SV *cb)
1016 CODE: 1149 CODE:
1017 SvREFCNT_dec (on_next_submit); 1150 SvREFCNT_dec (on_next_submit);
1018 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1151 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1019 1152
1026 CODE: 1159 CODE:
1027 eio_cancel (req); 1160 eio_cancel (req);
1028 1161
1029void 1162void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1163cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1164 PPCODE:
1165{
1166 if (GIMME_V != G_VOID)
1167 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1168
1169 if (items > 1)
1170 {
1171 SV *cb_cv =get_cb (callback);
1172
1032 SvREFCNT_dec (req->callback); 1173 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1174 req->callback = SvREFCNT_inc (cb_cv);
1175 }
1176}
1034 1177
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1178MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1179
1037void 1180void
1038add (aio_req grp, ...) 1181add (aio_req grp, ...)
1070 AV *av; 1213 AV *av;
1071 1214
1072 grp->errorno = errno; 1215 grp->errorno = errno;
1073 1216
1074 av = newAV (); 1217 av = newAV ();
1218 av_extend (av, items - 1);
1075 1219
1076 for (i = 1; i < items; ++i ) 1220 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1221 av_push (av, newSVsv (ST (i)));
1078 1222
1079 SvREFCNT_dec (grp->sv1); 1223 SvREFCNT_dec (grp->sv1);
1093void 1237void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1238feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1239 CODE:
1096{ 1240{
1097 SvREFCNT_dec (grp->sv2); 1241 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1242 grp->sv2 = newSVsv (callback);
1243 grp->feed = aio_grp_feed;
1099 1244
1100 if (grp->int2 <= 0) 1245 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1246 grp->int2 = 2;
1102 1247
1103 eio_grp_limit (grp, grp->int2); 1248 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines