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.123 by root, Sat May 17 12:17:25 2008 UTC vs.
Revision 1.156 by root, Thu Nov 12 00:01:52 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
78 90
79static HV *stash; 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/*****************************************************************************/
103
80typedef SV SV8; /* byte-sv, used for argument-checking */ 104typedef SV SV8; /* byte-sv, used for argument-checking */
105typedef int aio_rfd; /* read file desriptor */
106typedef int aio_wfd; /* write file descriptor */
81 107
82#define AIO_REQ_KLASS "IO::AIO::REQ" 108static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
83#define AIO_GRP_KLASS "IO::AIO::GRP"
84 109
85#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
86 SV *callback; \ 111 SV *callback; \
87 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 113 STRLEN stroffset; \
90 115
91#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
92 117
93#include "libeio/eio.h" 118#include "libeio/eio.h"
94 119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122# define NO_FADVISE 1
123#endif
124
125#ifndef POSIX_FADV_SEQUENTIAL
126# define POSIX_FADV_SEQUENTIAL 0
127#endif
128
129#ifndef POSIX_FADV_RANDOM
130# define POSIX_FADV_RANDOM 0
131#endif
132
133#ifndef POSIX_FADV_NOREUSE
134# define POSIX_FADV_NOREUSE 0
135#endif
136
137#ifndef POSIX_FADV_WILLNEED
138# define POSIX_FADV_WILLNEED 0
139#endif
140
141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0
143#endif
144
95static int req_invoke (eio_req *req); 145static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 146#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 147static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
101 149
102enum { 150enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
110 158
111static SV *on_next_submit; 159static SV *on_next_submit;
112static int next_pri = EIO_PRI_DEFAULT; 160static int next_pri = EIO_PRI_DEFAULT;
113static int max_outstanding; 161static int max_outstanding;
114 162
115static int respipe_osf [2], respipe [2] = { -1, -1 }; 163static s_epipe respipe;
116 164
117static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
118static void req_cancel (aio_req req); 166static void req_cancel (aio_req req);
119 167
120static void want_poll (void) 168static void want_poll (void)
121{ 169{
122 /* write a dummy byte to the pipe so fh becomes ready */ 170 /* write a dummy byte to the pipe so fh becomes ready */
123 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 171 s_epipe_signal (&respipe);
124} 172}
125 173
126static void done_poll (void) 174static void done_poll (void)
127{ 175{
128 /* read any signals sent by the worker threads */ 176 /* read any signals sent by the worker threads */
129 char buf [4]; 177 s_epipe_drain (&respipe);
130 while (respipe_read (respipe [0], buf, 4) == 4)
131 ;
132} 178}
133 179
134/* must be called at most once */ 180/* must be called at most once */
135static SV *req_sv (aio_req req, const char *klass) 181static SV *req_sv (aio_req req, HV *stash)
136{ 182{
137 if (!req->self) 183 if (!req->self)
138 { 184 {
139 req->self = (SV *)newHV (); 185 req->self = (SV *)newHV ();
140 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 186 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
141 } 187 }
142 188
143 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 189 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
144} 190}
145 191
146static aio_req SvAIO_REQ (SV *sv) 192static aio_req SvAIO_REQ (SV *sv)
147{ 193{
148 MAGIC *mg; 194 MAGIC *mg;
149 195
150 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 196 if (!SvROK (sv)
197 || (SvSTASH (SvRV (sv)) != aio_grp_stash
198 && SvSTASH (SvRV (sv)) != aio_req_stash
199 && !sv_derived_from (sv, "IO::AIO::REQ")))
151 croak ("object of class " AIO_REQ_KLASS " expected"); 200 croak ("object of class IO::AIO::REQ expected");
152 201
153 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 202 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
154 203
155 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
156} 205}
162 dSP; 211 dSP;
163 212
164 ENTER; 213 ENTER;
165 SAVETMPS; 214 SAVETMPS;
166 PUSHMARK (SP); 215 PUSHMARK (SP);
167 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, aio_grp_stash));
168 PUTBACK; 217 PUTBACK;
169 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
170 SPAGAIN; 219 SPAGAIN;
171 FREETMPS; 220 FREETMPS;
172 LEAVE; 221 LEAVE;
175 224
176static void req_submit (eio_req *req) 225static void req_submit (eio_req *req)
177{ 226{
178 eio_submit (req); 227 eio_submit (req);
179 228
180 if (on_next_submit) 229 if (expect_false (on_next_submit))
181 { 230 {
182 dSP; 231 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 232 SV *cb = sv_2mortal (on_next_submit);
184 233
185 on_next_submit = 0; 234 on_next_submit = 0;
195 dSP; 244 dSP;
196 245
197 if (req->flags & FLAG_SV2_RO_OFF) 246 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 247 SvREADONLY_off (req->sv2);
199 248
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 249 if (!EIO_CANCELLED (req) && req->callback)
201 { 250 {
202 ENTER; 251 ENTER;
203 SAVETMPS; 252 SAVETMPS;
204 PUSHMARK (SP); 253 PUSHMARK (SP);
205 EXTEND (SP, 1); 254 EXTEND (SP, 1);
211 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
212 261
213 if (req->result >= 0) 262 if (req->result >= 0)
214 { 263 {
215 int i; 264 int i;
216 char *buf = req->ptr2; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
217 AV *av = newAV (); 267 AV *av = newAV ();
218 268
219 av_extend (av, req->result - 1); 269 av_extend (av, req->result - 1);
220 270
221 for (i = 0; i < req->result; ++i) 271 for (i = 0; i < req->result; ++i)
222 { 272 {
223 SV *sv = newSVpv (buf, 0); 273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
224 276
277 if (req->int1 & EIO_READDIR_CUSTOM2)
278 {
279 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
280 AV *avent = newAV ();
281
282 av_extend (avent, 2);
283
284 if (!sv_type [ent->type])
285 {
286 sv_type [ent->type] = newSViv (ent->type);
287 SvREADONLY_on (sv_type [ent->type]);
288 }
289
290 av_store (avent, 0, namesv);
291 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
292 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
293
294 av_store (av, i, newRV_noinc ((SV *)avent));
295 }
296 else
225 av_store (av, i, sv); 297 av_store (av, i, namesv);
298
299 ++ent;
300 }
301 else
302 {
303 SV *name = newSVpv (names, 0);
304 av_store (av, i, name);
226 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
306 }
227 } 307 }
228 308
229 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
230 } 310 }
231 311
232 PUSHs (rv); 312 PUSHs (rv);
313
314 if (req->int1 & EIO_READDIR_CUSTOM1)
315 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
233 } 316 }
234 break; 317 break;
235 318
236 case EIO_OPEN: 319 case EIO_OPEN:
237 { 320 {
243 GV *gv = (GV *)sv_newmortal (); 326 GV *gv = (GV *)sv_newmortal ();
244 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
245 char sym [64]; 328 char sym [64];
246 int symlen; 329 int symlen;
247 330
248 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
249 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, aio_stash, sym, symlen, 0);
250 333
251 symlen = snprintf ( 334 symlen = snprintf (
252 sym, 335 sym,
253 sizeof (sym), 336 sizeof (sym),
254 "%s&=%d", 337 "%s&=%d",
255 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
256 req->result 339 (int)req->result
257 ); 340 );
258 341
259 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
260 fh = (SV *)gv; 343 fh = (SV *)gv;
261 } 344 }
295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
296 PUSHs (sv_2mortal (newSViv (req->result))); 379 PUSHs (sv_2mortal (newSViv (req->result)));
297 break; 380 break;
298 381
299 case EIO_READ: 382 case EIO_READ:
383 {
300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 384 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
301 *SvEND (req->sv2) = 0; 385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
303 break; 390 break;
304 391
305 case EIO_DUP2: 392 case EIO_DUP2:
306 if (req->result > 0) 393 if (req->result > 0)
307 req->result = 0; 394 req->result = 0;
353 grp->sv2 = 0; 440 grp->sv2 = 0;
354 441
355 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
356} 443}
357 444
358#ifdef USE_SOCKETS_AS_HANDLES
359# define TO_SOCKET(x) (win32_get_osfhandle (x))
360#else
361# define TO_SOCKET(x) (x)
362#endif
363
364static void 445static void
365create_respipe (void) 446create_respipe (void)
366{ 447{
367 int old_readfd = respipe [0];
368
369 if (respipe [1] >= 0)
370 respipe_close (TO_SOCKET (respipe [1]));
371
372#ifdef _WIN32
373 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
374#else
375 if (pipe (respipe)) 448 if (s_epipe_renew (&respipe))
376#endif
377 croak ("unable to initialize result pipe"); 449 croak ("IO::AIO: unable to initialize result pipe");
378
379 if (old_readfd >= 0)
380 {
381 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
382 croak ("unable to initialize result pipe(2)");
383
384 respipe_close (respipe [0]);
385 respipe [0] = old_readfd;
386 }
387
388#ifdef _WIN32
389 int arg = 1;
390 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
391 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
392#else
393 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
394 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
395#endif
396 croak ("unable to initialize result pipe(3)");
397
398 respipe_osf [0] = TO_SOCKET (respipe [0]);
399 respipe_osf [1] = TO_SOCKET (respipe [1]);
400} 450}
401 451
402static void poll_wait (void) 452static void poll_wait (void)
403{ 453{
404 fd_set rfd;
405
406 while (eio_nreqs ()) 454 while (eio_nreqs ())
407 { 455 {
408 int size; 456 int size;
409 457
410 X_LOCK (reslock); 458 X_LOCK (reslock);
414 if (size) 462 if (size)
415 return; 463 return;
416 464
417 etp_maybe_start_thread (); 465 etp_maybe_start_thread ();
418 466
419 FD_ZERO (&rfd); 467 s_epipe_wait (&respipe);
420 FD_SET (respipe [0], &rfd);
421
422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
423 } 468 }
424} 469}
425 470
426static int poll_cb (void) 471static int poll_cb (void)
427{ 472{
428 int res; 473 for (;;)
429
430 do
431 { 474 {
432 res = eio_poll (); 475 int res = eio_poll ();
433 476
434 if (res > 0) 477 if (res > 0)
435 croak (0); 478 croak (0);
479
480 if (!max_outstanding || max_outstanding > eio_nreqs ())
481 return res;
482
483 poll_wait ();
436 } 484 }
437 while (max_outstanding && max_outstanding <= eio_nreqs ());
438
439 return res;
440} 485}
441 486
442static void atfork_child (void) 487static void atfork_child (void)
443{ 488{
444 create_respipe (); 489 create_respipe ();
445} 490}
446 491
492static SV *
493get_cb (SV *cb_sv)
494{
495 SvGETMAGIC (cb_sv);
496 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
497}
498
447#define dREQ \ 499#define dREQ \
500 SV *cb_cv; \
448 aio_req req; \ 501 aio_req req; \
449 int req_pri = next_pri; \ 502 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 503 next_pri = EIO_PRI_DEFAULT; \
451 \ 504 \
452 if (SvOK (callback) && !SvROK (callback)) \ 505 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 506 \
455 Newz (0, req, 1, eio_req); \ 507 Newz (0, req, 1, eio_req); \
456 if (!req) \ 508 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 509 croak ("out of memory during eio_req allocation"); \
458 \ 510 \
459 req->callback = newSVsv (callback); \ 511 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 512 req->pri = req_pri
461 513
462#define REQ_SEND \ 514#define REQ_SEND \
515 PUTBACK; \
463 req_submit (req); \ 516 req_submit (req); \
517 SPAGAIN; \
464 \ 518 \
465 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
467 521
468MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
469 523
470PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
471 525
472BOOT: 526BOOT:
473{ 527{
474 stash = gv_stashpv ("IO::AIO", 1); 528 static const struct {
475 529 const char *name;
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 530 IV iv;
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 531 } *civ, const_iv[] = {
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 532# define const_iv(name, value) { # name, (IV) value },
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 533# define const_eio(name) { # name, (IV) EIO_ ## name },
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 534 const_iv (EXDEV , EXDEV)
535 const_iv (ENOSYS , ENOSYS)
536 const_iv (O_RDONLY, O_RDONLY)
537 const_iv (O_WRONLY, O_WRONLY)
538 const_iv (O_CREAT , O_CREAT)
539 const_iv (O_TRUNC , O_TRUNC)
481#ifndef _WIN32 540#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 541 const_iv (S_IFIFO , S_IFIFO)
483#endif 542#endif
543 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
544 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
545 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
546 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
547 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
548 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
484 549
550 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
551 const_eio (SYNC_FILE_RANGE_WRITE)
552 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
553
554 const_eio (READDIR_DENTS)
555 const_eio (READDIR_DIRS_FIRST)
556 const_eio (READDIR_STAT_ORDER)
557 const_eio (READDIR_FOUND_UNKNOWN)
558
559 const_eio (DT_UNKNOWN)
560 const_eio (DT_FIFO)
561 const_eio (DT_CHR)
562 const_eio (DT_DIR)
563 const_eio (DT_BLK)
564 const_eio (DT_REG)
565 const_eio (DT_LNK)
566 const_eio (DT_SOCK)
567 const_eio (DT_WHT)
568 };
569
570 aio_stash = gv_stashpv ("IO::AIO" , 1);
571 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
572 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
573
574 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
575 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
576
485 create_respipe (); 577 create_respipe ();
486 578
487 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
489 581
490 /* atfork child called in fifo order, so before eio's handler */ 582 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child); 583 X_THREAD_ATFORK (0, 0, atfork_child);
492} 584}
493 585
494void 586void
495max_poll_reqs (int nreqs) 587max_poll_reqs (int nreqs)
496 PROTOTYPE: $ 588 PROTOTYPE: $
549 ALIAS: 641 ALIAS:
550 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 644 PPCODE:
553{ 645{
646 int fd = s_fileno_croak (fh, 0);
554 dREQ; 647 dREQ;
555 648
556 req->type = ix; 649 req->type = ix;
557 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 651 req->int1 = fd;
652
653 REQ_SEND (req);
654}
655
656void
657aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
658 PROTOTYPE: $$$$;$
659 PPCODE:
660{
661 int fd = s_fileno_croak (fh, 0);
662 dREQ;
663
664 req->type = EIO_SYNC_FILE_RANGE;
665 req->sv1 = newSVsv (fh);
666 req->int1 = fd;
667 req->offs = offset;
668 req->size = nbytes;
669 req->int2 = flags;
559 670
560 REQ_SEND (req); 671 REQ_SEND (req);
561} 672}
562 673
563void 674void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
566 PPCODE: 677 PPCODE:
567{ 678{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 679 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
680 int fd = s_fileno_croak (fh, 0);
569 dREQ; 681 dREQ;
570 682
571 if (close_pipe < 0) 683 if (close_pipe < 0)
572 { 684 {
573 int pipefd [2]; 685 int pipefd [2];
581 } 693 }
582 694
583 req->type = EIO_DUP2; 695 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 696 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 697 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 698 req->int2 = fd;
587 699
588 REQ_SEND (req); 700 REQ_SEND (req);
589} 701}
590 702
591void 703void
595 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
597 PPCODE: 709 PPCODE:
598{ 710{
599 STRLEN svlen; 711 STRLEN svlen;
712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 714 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 715
606 if (dataoffset < 0) 716 if (dataoffset < 0)
607 dataoffset += svlen; 717 dataoffset += svlen;
608 718
609 if (dataoffset < 0 || dataoffset > svlen) 719 if (dataoffset < 0 || dataoffset > svlen)
615 if (!SvOK (length) || len + dataoffset > svlen) 725 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 726 len = svlen - dataoffset;
617 } 727 }
618 else 728 else
619 { 729 {
620 /* read: grow scalar as necessary */ 730 /* read: check type and grow scalar as necessary */
731 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 732 svptr = SvGROW (data, len + dataoffset + 1);
622 } 733 }
623
624 if (len < 0)
625 croak ("length must not be negative");
626 734
627 { 735 {
628 dREQ; 736 dREQ;
629 737
630 req->type = ix; 738 req->type = ix;
631 req->sv1 = newSVsv (fh); 739 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 740 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 741 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 742 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 743 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 744 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 745 req->stroffset = dataoffset;
661 768
662 REQ_SEND; 769 REQ_SEND;
663} 770}
664 771
665void 772void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 773aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
668 PPCODE: 775 PPCODE:
669{ 776{
777 int ifd = s_fileno_croak (in_fh , 0);
778 int ofd = s_fileno_croak (out_fh, 1);
670 dREQ; 779 dREQ;
671 780
672 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 783 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 784 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 785 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 786 req->offs = in_offset;
678 req->size = length; 787 req->size = length;
679 788
680 REQ_SEND; 789 REQ_SEND;
681} 790}
682 791
683void 792void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 793aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
686 PPCODE: 795 PPCODE:
687{ 796{
797 int fd = s_fileno_croak (fh, 0);
688 dREQ; 798 dREQ;
689 799
690 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 802 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 803 req->offs = offset;
694 req->size = length; 804 req->size = length;
695 805
696 REQ_SEND; 806 REQ_SEND;
697} 807}
698 808
814 req->type = EIO_FCHOWN; 924 req->type = EIO_FCHOWN;
815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 925 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
816 } 926 }
817 927
818 REQ_SEND; 928 REQ_SEND;
929}
930
931void
932aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
933 PPCODE:
934{
935 dREQ;
936
937 req->type = EIO_READDIR;
938 req->sv1 = newSVsv (pathname);
939 req->ptr1 = SvPVbyte_nolen (req->sv1);
940 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
941
942 if (flags & EIO_READDIR_DENTS)
943 req->int1 |= EIO_READDIR_CUSTOM2;
944
945 REQ_SEND;
819} 946}
820 947
821void 948void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 949aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 950 ALIAS:
888{ 1015{
889 dREQ; 1016 dREQ;
890 1017
891 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
892 1019
893 eio_submit (req); 1020 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
895} 1022}
896 1023
897void 1024void
898aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
899 ALIAS: 1026 ALIAS:
951 1078
952int 1079int
953poll_fileno() 1080poll_fileno()
954 PROTOTYPE: 1081 PROTOTYPE:
955 CODE: 1082 CODE:
956 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
957 OUTPUT: 1084 OUTPUT:
958 RETVAL 1085 RETVAL
959 1086
960int 1087int
961poll_cb(...) 1088poll_cb(...)
1001 CODE: 1128 CODE:
1002 RETVAL = eio_nthreads (); 1129 RETVAL = eio_nthreads ();
1003 OUTPUT: 1130 OUTPUT:
1004 RETVAL 1131 RETVAL
1005 1132
1133int
1134fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1135 PROTOTYPE: $$$$
1136 CODE:
1137#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1138 RETVAL = posix_fadvise (fh, offset, length, advice);
1139#else
1140 RETVAL = errno = ENOSYS;
1141#endif
1142 OUTPUT:
1143 RETVAL
1144
1145ssize_t
1146sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1147 PROTOTYPE: $$$$
1148 CODE:
1149 eio_sendfile_sync (ofh, ifh, offset, count);
1150
1006void _on_next_submit (SV *cb) 1151void _on_next_submit (SV *cb)
1007 CODE: 1152 CODE:
1008 SvREFCNT_dec (on_next_submit); 1153 SvREFCNT_dec (on_next_submit);
1009 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1154 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1010 1155
1017 CODE: 1162 CODE:
1018 eio_cancel (req); 1163 eio_cancel (req);
1019 1164
1020void 1165void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1166cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1167 PPCODE:
1168{
1169 if (GIMME_V != G_VOID)
1170 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1171
1172 if (items > 1)
1173 {
1174 SV *cb_cv =get_cb (callback);
1175
1023 SvREFCNT_dec (req->callback); 1176 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1177 req->callback = SvREFCNT_inc (cb_cv);
1178 }
1179}
1025 1180
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1181MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1182
1028void 1183void
1029add (aio_req grp, ...) 1184add (aio_req grp, ...)
1061 AV *av; 1216 AV *av;
1062 1217
1063 grp->errorno = errno; 1218 grp->errorno = errno;
1064 1219
1065 av = newAV (); 1220 av = newAV ();
1221 av_extend (av, items - 1);
1066 1222
1067 for (i = 1; i < items; ++i ) 1223 for (i = 1; i < items; ++i )
1068 av_push (av, newSVsv (ST (i))); 1224 av_push (av, newSVsv (ST (i)));
1069 1225
1070 SvREFCNT_dec (grp->sv1); 1226 SvREFCNT_dec (grp->sv1);
1084void 1240void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1241feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1242 CODE:
1087{ 1243{
1088 SvREFCNT_dec (grp->sv2); 1244 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1245 grp->sv2 = newSVsv (callback);
1246 grp->feed = aio_grp_feed;
1090 1247
1091 if (grp->int2 <= 0) 1248 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1249 grp->int2 = 2;
1093 1250
1094 eio_grp_limit (grp, grp->int2); 1251 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines