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.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>
13#include <sys/stat.h> 15#include <sys/stat.h>
14#include <limits.h> 16#include <limits.h>
15#include <fcntl.h> 17#include <fcntl.h>
16#include <sched.h> 18#include <sched.h>
19
20/* perl namespace pollution */
21#undef VERSION
17 22
18#ifdef _WIN32 23#ifdef _WIN32
19 24
20# define EIO_STRUCT_DIRENT Direntry_t 25# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 26# undef malloc
62# include <signal.h> 67# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 68# define EIO_STRUCT_DIRENT struct dirent
64 69
65#endif 70#endif
66 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
67#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
68 79
69/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
71# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
72#else 85#else
86# define VAL64 NV
73# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
74#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/*****************************************************************************/
75 103
76static HV *stash; 104static HV *stash;
77typedef 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 */
78 108
79#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
80#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
81 111
82#define EIO_COMMON \ 112#define EIO_REQ_MEMBERS \
83 SV *callback; \ 113 SV *callback; \
84 SV *sv1, *sv2; \ 114 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 115 STRLEN stroffset; \
86 SV *self 116 SV *self;
117
118#define EIO_NO_WRAPPERS 1
87 119
88#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
89 146
90static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 148#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); 149static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
96 151
97enum { 152enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
102 157
103typedef eio_req *aio_req; 158typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
105 160
106static SV *on_next_submit; 161static SV *on_next_submit;
107static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 162static int next_pri = EIO_PRI_DEFAULT;
108static int max_outstanding; 163static int max_outstanding;
109 164
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 165static s_epipe respipe;
111 166
112static void req_destroy (aio_req req); 167static void req_destroy (aio_req req);
113static void req_cancel (aio_req req); 168static void req_cancel (aio_req req);
114 169
115static void want_poll (void) 170static void want_poll (void)
116{ 171{
117 /* write a dummy byte to the pipe so fh becomes ready */ 172 /* write a dummy byte to the pipe so fh becomes ready */
118 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 173 s_epipe_signal (&respipe);
119} 174}
120 175
121static void done_poll (void) 176static void done_poll (void)
122{ 177{
123 /* read any signals sent by the worker threads */ 178 /* read any signals sent by the worker threads */
124 char buf [4]; 179 s_epipe_drain (&respipe);
125 while (respipe_read (respipe [0], buf, 4) == 4)
126 ;
127} 180}
128 181
129/* must be called at most once */ 182/* must be called at most once */
130static SV *req_sv (aio_req req, const char *klass) 183static SV *req_sv (aio_req req, const char *klass)
131{ 184{
170 223
171static void req_submit (eio_req *req) 224static void req_submit (eio_req *req)
172{ 225{
173 eio_submit (req); 226 eio_submit (req);
174 227
175 if (on_next_submit) 228 if (expect_false (on_next_submit))
176 { 229 {
177 dSP; 230 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 231 SV *cb = sv_2mortal (on_next_submit);
179 232
180 on_next_submit = 0; 233 on_next_submit = 0;
190 dSP; 243 dSP;
191 244
192 if (req->flags & FLAG_SV2_RO_OFF) 245 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 246 SvREADONLY_off (req->sv2);
194 247
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 248 if (!EIO_CANCELLED (req) && req->callback)
196 { 249 {
197 ENTER; 250 ENTER;
198 SAVETMPS; 251 SAVETMPS;
199 PUSHMARK (SP); 252 PUSHMARK (SP);
200 EXTEND (SP, 1); 253 EXTEND (SP, 1);
206 SV *rv = &PL_sv_undef; 259 SV *rv = &PL_sv_undef;
207 260
208 if (req->result >= 0) 261 if (req->result >= 0)
209 { 262 {
210 int i; 263 int i;
211 char *buf = req->ptr2; 264 char *names = (char *)req->ptr2;
265 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
212 AV *av = newAV (); 266 AV *av = newAV ();
213 267
214 av_extend (av, req->result - 1); 268 av_extend (av, req->result - 1);
215 269
216 for (i = 0; i < req->result; ++i) 270 for (i = 0; i < req->result; ++i)
217 { 271 {
218 SV *sv = newSVpv (buf, 0); 272 if (req->int1 & EIO_READDIR_DENTS)
273 {
274 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
219 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
220 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);
221 buf += SvCUR (sv) + 1; 304 names += SvCUR (name) + 1;
305 }
222 } 306 }
223 307
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 308 rv = sv_2mortal (newRV_noinc ((SV *)av));
225 } 309 }
226 310
227 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))));
228 } 315 }
229 break; 316 break;
230 317
231 case EIO_OPEN: 318 case EIO_OPEN:
232 { 319 {
238 GV *gv = (GV *)sv_newmortal (); 325 GV *gv = (GV *)sv_newmortal ();
239 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
240 char sym [64]; 327 char sym [64];
241 int symlen; 328 int symlen;
242 329
243 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
244 gv_init (gv, stash, sym, symlen, 0); 331 gv_init (gv, stash, sym, symlen, 0);
245 332
246 symlen = snprintf ( 333 symlen = snprintf (
247 sym, 334 sym,
248 sizeof (sym), 335 sizeof (sym),
249 "%s&=%d", 336 "%s&=%d",
250 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 337 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
251 req->result 338 (int)req->result
252 ); 339 );
253 340
254 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 341 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
255 fh = (SV *)gv; 342 fh = (SV *)gv;
256 } 343 }
277 case EIO_BUSY: 364 case EIO_BUSY:
278 break; 365 break;
279 366
280 case EIO_READLINK: 367 case EIO_READLINK:
281 if (req->result > 0) 368 if (req->result > 0)
282 { 369 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; 370 break;
288 371
289 case EIO_STAT: 372 case EIO_STAT:
290 case EIO_LSTAT: 373 case EIO_LSTAT:
291 case EIO_FSTAT: 374 case EIO_FSTAT:
294 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 377 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
295 PUSHs (sv_2mortal (newSViv (req->result))); 378 PUSHs (sv_2mortal (newSViv (req->result)));
296 break; 379 break;
297 380
298 case EIO_READ: 381 case EIO_READ:
382 {
299 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));
300 *SvEND (req->sv2) = 0; 384 *SvEND (req->sv2) = 0;
385 SvPOK_only (req->sv2);
386 SvSETMAGIC (req->sv2);
301 PUSHs (sv_2mortal (newSViv (req->result))); 387 PUSHs (sv_2mortal (newSViv (req->result)));
388 }
302 break; 389 break;
303 390
304 case EIO_DUP2: 391 case EIO_DUP2:
305 if (req->result > 0) 392 if (req->result > 0)
306 req->result = 0; 393 req->result = 0;
352 grp->sv2 = 0; 439 grp->sv2 = 0;
353 440
354 eio_grp_cancel (grp); 441 eio_grp_cancel (grp);
355} 442}
356 443
357#ifdef USE_SOCKETS_AS_HANDLES
358# define TO_SOCKET(x) (win32_get_osfhandle (x))
359#else
360# define TO_SOCKET(x) (x)
361#endif
362
363static void 444static void
364create_respipe (void) 445create_respipe (void)
365{ 446{
366 int old_readfd = respipe [0];
367
368 if (respipe [1] >= 0)
369 respipe_close (TO_SOCKET (respipe [1]));
370
371#ifdef _WIN32
372 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
373#else
374 if (pipe (respipe)) 447 if (s_epipe_renew (&respipe))
375#endif
376 croak ("unable to initialize result pipe"); 448 croak ("IO::AIO: unable to initialize result pipe");
377
378 if (old_readfd >= 0)
379 {
380 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
381 croak ("unable to initialize result pipe(2)");
382
383 respipe_close (respipe [0]);
384 respipe [0] = old_readfd;
385 }
386
387#ifdef _WIN32
388 int arg = 1;
389 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
390 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
391#else
392 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
393 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
394#endif
395 croak ("unable to initialize result pipe(3)");
396
397 respipe_osf [0] = TO_SOCKET (respipe [0]);
398 respipe_osf [1] = TO_SOCKET (respipe [1]);
399} 449}
400 450
401static void poll_wait (void) 451static void poll_wait (void)
402{ 452{
403 fd_set rfd;
404
405 while (eio_nreqs ()) 453 while (eio_nreqs ())
406 { 454 {
407 int size; 455 int size;
408 456
409 X_LOCK (reslock); 457 X_LOCK (reslock);
411 X_UNLOCK (reslock); 459 X_UNLOCK (reslock);
412 460
413 if (size) 461 if (size)
414 return; 462 return;
415 463
416 maybe_start_thread (); 464 etp_maybe_start_thread ();
417 465
418 FD_ZERO (&rfd); 466 s_epipe_wait (&respipe);
419 FD_SET (respipe [0], &rfd);
420
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 467 }
423} 468}
424 469
425static int poll_cb (void) 470static int poll_cb (void)
426{ 471{
427 int res; 472 for (;;)
428
429 do
430 { 473 {
431 res = eio_poll (); 474 int res = eio_poll ();
432 475
433 if (res > 0) 476 if (res > 0)
434 croak (0); 477 croak (0);
478
479 if (!max_outstanding || max_outstanding > eio_nreqs ())
480 return res;
481
482 poll_wait ();
435 } 483 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 484}
440 485
441static void atfork_child (void) 486static void atfork_child (void)
442{ 487{
443 create_respipe (); 488 create_respipe ();
444} 489}
445 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
446#define dREQ \ 498#define dREQ \
499 SV *cb_cv; \
447 aio_req req; \ 500 aio_req req; \
448 int req_pri = next_pri; \ 501 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 502 next_pri = EIO_PRI_DEFAULT; \
450 \ 503 \
451 if (SvOK (callback) && !SvROK (callback)) \ 504 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 505 \
454 Newz (0, req, 1, eio_req); \ 506 Newz (0, req, 1, eio_req); \
455 if (!req) \ 507 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 508 croak ("out of memory during eio_req allocation"); \
457 \ 509 \
458 req->callback = newSVsv (callback); \ 510 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 511 req->pri = req_pri
460 512
461#define REQ_SEND \ 513#define REQ_SEND \
514 PUTBACK; \
462 req_submit (req); \ 515 req_submit (req); \
516 SPAGAIN; \
463 \ 517 \
464 if (GIMME_V != G_VOID) \ 518 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 519 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 520
467MODULE = IO::AIO PACKAGE = IO::AIO 521MODULE = IO::AIO PACKAGE = IO::AIO
468 522
469PROTOTYPES: ENABLE 523PROTOTYPES: ENABLE
470 524
471BOOT: 525BOOT:
472{ 526{
473 stash = gv_stashpv ("IO::AIO", 1); 527 static const struct {
474 528 const char *name;
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 529 IV iv;
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 } *civ, const_iv[] = {
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531# define const_iv(name, value) { # name, (IV) value },
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532# define const_eio(name) { # name, (IV) EIO_ ## name },
479 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)
480#ifdef _WIN32 539#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock); 540 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 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)
492 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
493 create_respipe (); 574 create_respipe ();
494 575
495 if (eio_init (want_poll, done_poll) < 0) 576 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 577 croak ("IO::AIO: unable to initialise eio library");
497 578
498 /* atfork child called in fifo order, so before eio's handler */ 579 /* atfork child called in fifo order, so before eio's handler */
499 X_THREAD_ATFORK (0, 0, atfork_child); 580 X_THREAD_ATFORK (0, 0, atfork_child);
500} 581}
501 582
502void 583void
503max_poll_reqs (int nreqs) 584max_poll_reqs (int nreqs)
504 PROTOTYPE: $ 585 PROTOTYPE: $
557 ALIAS: 638 ALIAS:
558 aio_fsync = EIO_FSYNC 639 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 640 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 641 PPCODE:
561{ 642{
643 int fd = s_fileno_croak (fh, 0);
562 dREQ; 644 dREQ;
563 645
564 req->type = ix; 646 req->type = ix;
565 req->sv1 = newSVsv (fh); 647 req->sv1 = newSVsv (fh);
566 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;
567 667
568 REQ_SEND (req); 668 REQ_SEND (req);
569} 669}
570 670
571void 671void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 672aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 673 PROTOTYPE: $;$
574 PPCODE: 674 PPCODE:
575{ 675{
576 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);
577 dREQ; 678 dREQ;
578 679
579 if (close_pipe < 0) 680 if (close_pipe < 0)
580 { 681 {
581 int pipefd [2]; 682 int pipefd [2];
589 } 690 }
590 691
591 req->type = EIO_DUP2; 692 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 693 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 694 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 695 req->int2 = fd;
595 696
596 REQ_SEND (req); 697 REQ_SEND (req);
597} 698}
598 699
599void 700void
603 aio_write = EIO_WRITE 704 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 705 PROTOTYPE: $$$$$;$
605 PPCODE: 706 PPCODE:
606{ 707{
607 STRLEN svlen; 708 STRLEN svlen;
709 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 710 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 711 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 712
614 if (dataoffset < 0) 713 if (dataoffset < 0)
615 dataoffset += svlen; 714 dataoffset += svlen;
616 715
617 if (dataoffset < 0 || dataoffset > svlen) 716 if (dataoffset < 0 || dataoffset > svlen)
623 if (!SvOK (length) || len + dataoffset > svlen) 722 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 723 len = svlen - dataoffset;
625 } 724 }
626 else 725 else
627 { 726 {
628 /* read: grow scalar as necessary */ 727 /* read: check type and grow scalar as necessary */
728 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 729 svptr = SvGROW (data, len + dataoffset + 1);
630 } 730 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 731
635 { 732 {
636 dREQ; 733 dREQ;
637 734
638 req->type = ix; 735 req->type = ix;
639 req->sv1 = newSVsv (fh); 736 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 737 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 738 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 739 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 740 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 741 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 742 req->stroffset = dataoffset;
661 PPCODE: 757 PPCODE:
662{ 758{
663 SV *data; 759 SV *data;
664 dREQ; 760 dREQ;
665 761
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 762 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 763 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 764 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 765
675 REQ_SEND; 766 REQ_SEND;
676} 767}
677 768
678void 769void
679aio_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)
680 PROTOTYPE: $$$$;$ 771 PROTOTYPE: $$$$;$
681 PPCODE: 772 PPCODE:
682{ 773{
774 int ifd = s_fileno_croak (in_fh , 0);
775 int ofd = s_fileno_croak (out_fh, 1);
683 dREQ; 776 dREQ;
684 777
685 req->type = EIO_SENDFILE; 778 req->type = EIO_SENDFILE;
686 req->sv1 = newSVsv (out_fh); 779 req->sv1 = newSVsv (out_fh);
687 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 780 req->int1 = ofd;
688 req->sv2 = newSVsv (in_fh); 781 req->sv2 = newSVsv (in_fh);
689 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 782 req->int2 = ifd;
690 req->offs = SvVAL64 (in_offset); 783 req->offs = in_offset;
691 req->size = length; 784 req->size = length;
692 785
693 REQ_SEND; 786 REQ_SEND;
694} 787}
695 788
696void 789void
697aio_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)
698 PROTOTYPE: $$$;$ 791 PROTOTYPE: $$$;$
699 PPCODE: 792 PPCODE:
700{ 793{
794 int fd = s_fileno_croak (fh, 0);
701 dREQ; 795 dREQ;
702 796
703 req->type = EIO_READAHEAD; 797 req->type = EIO_READAHEAD;
704 req->sv1 = newSVsv (fh); 798 req->sv1 = newSVsv (fh);
705 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 799 req->int1 = fd;
706 req->offs = SvVAL64 (offset); 800 req->offs = offset;
707 req->size = length; 801 req->size = length;
708 802
709 REQ_SEND; 803 REQ_SEND;
710} 804}
711 805
716 aio_lstat = EIO_LSTAT 810 aio_lstat = EIO_LSTAT
717 PPCODE: 811 PPCODE:
718{ 812{
719 dREQ; 813 dREQ;
720 814
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); 815 req->sv1 = newSVsv (fh_or_path);
730 816
731 if (SvPOK (fh_or_path)) 817 if (SvPOK (req->sv1))
732 { 818 {
733 req->type = ix; 819 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 820 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 821 }
736 else 822 else
750 836
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 837 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 838 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 839 req->sv1 = newSVsv (fh_or_path);
754 840
755 if (SvPOK (fh_or_path)) 841 if (SvPOK (req->sv1))
756 { 842 {
757 req->type = EIO_UTIME; 843 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 844 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 845 }
760 else 846 else
773 dREQ; 859 dREQ;
774 860
775 req->sv1 = newSVsv (fh_or_path); 861 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 862 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 863
778 if (SvPOK (fh_or_path)) 864 if (SvPOK (req->sv1))
779 { 865 {
780 req->type = EIO_TRUNCATE; 866 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 867 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 868 }
783 else 869 else
791 877
792void 878void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 879aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 880 ALIAS:
795 aio_chmod = EIO_CHMOD 881 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 882 aio_mkdir = EIO_MKDIR
798 PPCODE: 883 PPCODE:
799{ 884{
800 dREQ; 885 dREQ;
801 886
802 req->type = ix;
803 req->int2 = mode; 887 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 888 req->sv1 = newSVsv (fh_or_path);
805 889
806 if (ix == EIO_FCHMOD) 890 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 891 {
892 req->type = ix;
893 req->ptr1 = SvPVbyte_nolen (req->sv1);
894 }
808 else 895 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 896 {
897 req->type = EIO_FCHMOD;
898 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
899 }
810 900
811 REQ_SEND; 901 REQ_SEND;
812} 902}
813 903
814void 904void
819 909
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 910 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 911 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 912 req->sv1 = newSVsv (fh_or_path);
823 913
824 if (SvPOK (fh_or_path)) 914 if (SvPOK (req->sv1))
825 { 915 {
826 req->type = EIO_CHOWN; 916 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 917 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 918 }
829 else 919 else
831 req->type = EIO_FCHOWN; 921 req->type = EIO_FCHOWN;
832 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 922 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
833 } 923 }
834 924
835 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;
836} 943}
837 944
838void 945void
839aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 946aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
840 ALIAS: 947 ALIAS:
905{ 1012{
906 dREQ; 1013 dREQ;
907 1014
908 req->type = EIO_GROUP; 1015 req->type = EIO_GROUP;
909 1016
910 eio_submit (req); 1017 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1018 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 1019}
913 1020
914void 1021void
915aio_nop (SV *callback=&PL_sv_undef) 1022aio_nop (SV *callback=&PL_sv_undef)
927 1034
928int 1035int
929aioreq_pri (int pri = 0) 1036aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 1037 PROTOTYPE: ;$
931 CODE: 1038 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 1039 RETVAL = next_pri;
933 if (items > 0) 1040 if (items > 0)
934 { 1041 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1042 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1043 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 1044 next_pri = pri;
938 } 1045 }
939 OUTPUT: 1046 OUTPUT:
940 RETVAL 1047 RETVAL
941 1048
942void 1049void
943aioreq_nice (int nice = 0) 1050aioreq_nice (int nice = 0)
944 CODE: 1051 CODE:
945 nice = next_pri - nice; 1052 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1053 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1054 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 1055 next_pri = nice;
949 1056
950void 1057void
951flush () 1058flush ()
952 PROTOTYPE: 1059 PROTOTYPE:
953 CODE: 1060 CODE:
968 1075
969int 1076int
970poll_fileno() 1077poll_fileno()
971 PROTOTYPE: 1078 PROTOTYPE:
972 CODE: 1079 CODE:
973 RETVAL = respipe [0]; 1080 RETVAL = s_epipe_fd (&respipe);
974 OUTPUT: 1081 OUTPUT:
975 RETVAL 1082 RETVAL
976 1083
977int 1084int
978poll_cb(...) 1085poll_cb(...)
1014 1121
1015int 1122int
1016nthreads() 1123nthreads()
1017 PROTOTYPE: 1124 PROTOTYPE:
1018 CODE: 1125 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1126 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1127 OUTPUT:
1023 RETVAL 1128 RETVAL
1024 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
1025void _on_next_submit (SV *cb) 1148void _on_next_submit (SV *cb)
1026 CODE: 1149 CODE:
1027 SvREFCNT_dec (on_next_submit); 1150 SvREFCNT_dec (on_next_submit);
1028 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1151 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1029 1152
1036 CODE: 1159 CODE:
1037 eio_cancel (req); 1160 eio_cancel (req);
1038 1161
1039void 1162void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1163cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 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
1042 SvREFCNT_dec (req->callback); 1173 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1174 req->callback = SvREFCNT_inc (cb_cv);
1175 }
1176}
1044 1177
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1178MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1179
1047void 1180void
1048add (aio_req grp, ...) 1181add (aio_req grp, ...)
1080 AV *av; 1213 AV *av;
1081 1214
1082 grp->errorno = errno; 1215 grp->errorno = errno;
1083 1216
1084 av = newAV (); 1217 av = newAV ();
1218 av_extend (av, items - 1);
1085 1219
1086 for (i = 1; i < items; ++i ) 1220 for (i = 1; i < items; ++i )
1087 av_push (av, newSVsv (ST (i))); 1221 av_push (av, newSVsv (ST (i)));
1088 1222
1089 SvREFCNT_dec (grp->sv1); 1223 SvREFCNT_dec (grp->sv1);
1103void 1237void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1238feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1239 CODE:
1106{ 1240{
1107 SvREFCNT_dec (grp->sv2); 1241 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1242 grp->sv2 = newSVsv (callback);
1243 grp->feed = aio_grp_feed;
1109 1244
1110 if (grp->int2 <= 0) 1245 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1246 grp->int2 = 2;
1112 1247
1113 eio_grp_limit (grp, grp->int2); 1248 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines