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.153 by root, Wed Jul 15 01:36:04 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 int respipe_osf [2];
166static s_epipe respipe;
111 167
112static void req_destroy (aio_req req); 168static void req_destroy (aio_req req);
113static void req_cancel (aio_req req); 169static void req_cancel (aio_req req);
114 170
115static void want_poll (void) 171static void want_poll (void)
116{ 172{
117 /* write a dummy byte to the pipe so fh becomes ready */ 173 /* write a dummy byte to the pipe so fh becomes ready */
118 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 174 s_epipe_signal (&respipe);
119} 175}
120 176
121static void done_poll (void) 177static void done_poll (void)
122{ 178{
123 /* read any signals sent by the worker threads */ 179 /* read any signals sent by the worker threads */
124 char buf [4]; 180 s_epipe_drain (&respipe);
125 while (respipe_read (respipe [0], buf, 4) == 4)
126 ;
127} 181}
128 182
129/* must be called at most once */ 183/* must be called at most once */
130static SV *req_sv (aio_req req, const char *klass) 184static SV *req_sv (aio_req req, const char *klass)
131{ 185{
170 224
171static void req_submit (eio_req *req) 225static void req_submit (eio_req *req)
172{ 226{
173 eio_submit (req); 227 eio_submit (req);
174 228
175 if (on_next_submit) 229 if (expect_false (on_next_submit))
176 { 230 {
177 dSP; 231 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 232 SV *cb = sv_2mortal (on_next_submit);
179 233
180 on_next_submit = 0; 234 on_next_submit = 0;
190 dSP; 244 dSP;
191 245
192 if (req->flags & FLAG_SV2_RO_OFF) 246 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 247 SvREADONLY_off (req->sv2);
194 248
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 249 if (!EIO_CANCELLED (req) && req->callback)
196 { 250 {
197 ENTER; 251 ENTER;
198 SAVETMPS; 252 SAVETMPS;
199 PUSHMARK (SP); 253 PUSHMARK (SP);
200 EXTEND (SP, 1); 254 EXTEND (SP, 1);
206 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
207 261
208 if (req->result >= 0) 262 if (req->result >= 0)
209 { 263 {
210 int i; 264 int i;
211 char *buf = req->ptr2; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
212 AV *av = newAV (); 267 AV *av = newAV ();
213 268
214 av_extend (av, req->result - 1); 269 av_extend (av, req->result - 1);
215 270
216 for (i = 0; i < req->result; ++i) 271 for (i = 0; i < req->result; ++i)
217 { 272 {
218 SV *sv = newSVpv (buf, 0); 273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
219 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
220 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);
221 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
306 }
222 } 307 }
223 308
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
225 } 310 }
226 311
227 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))));
228 } 316 }
229 break; 317 break;
230 318
231 case EIO_OPEN: 319 case EIO_OPEN:
232 { 320 {
238 GV *gv = (GV *)sv_newmortal (); 326 GV *gv = (GV *)sv_newmortal ();
239 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
240 char sym [64]; 328 char sym [64];
241 int symlen; 329 int symlen;
242 330
243 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
244 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, stash, sym, symlen, 0);
245 333
246 symlen = snprintf ( 334 symlen = snprintf (
247 sym, 335 sym,
248 sizeof (sym), 336 sizeof (sym),
249 "%s&=%d", 337 "%s&=%d",
250 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
251 req->result 339 (int)req->result
252 ); 340 );
253 341
254 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
255 fh = (SV *)gv; 343 fh = (SV *)gv;
256 } 344 }
277 case EIO_BUSY: 365 case EIO_BUSY:
278 break; 366 break;
279 367
280 case EIO_READLINK: 368 case EIO_READLINK:
281 if (req->result > 0) 369 if (req->result > 0)
282 { 370 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; 371 break;
288 372
289 case EIO_STAT: 373 case EIO_STAT:
290 case EIO_LSTAT: 374 case EIO_LSTAT:
291 case EIO_FSTAT: 375 case EIO_FSTAT:
294 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
295 PUSHs (sv_2mortal (newSViv (req->result))); 379 PUSHs (sv_2mortal (newSViv (req->result)));
296 break; 380 break;
297 381
298 case EIO_READ: 382 case EIO_READ:
383 {
299 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));
300 *SvEND (req->sv2) = 0; 385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
301 PUSHs (sv_2mortal (newSViv (req->result))); 388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
302 break; 390 break;
303 391
304 case EIO_DUP2: 392 case EIO_DUP2:
305 if (req->result > 0) 393 if (req->result > 0)
306 req->result = 0; 394 req->result = 0;
352 grp->sv2 = 0; 440 grp->sv2 = 0;
353 441
354 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
355} 443}
356 444
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 445static void
364create_respipe (void) 446create_respipe (void)
365{ 447{
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)) 448 if (s_epipe_renew (&respipe))
375#endif
376 croak ("unable to initialize result pipe"); 449 croak ("unable to initialize result pipe");
377 450
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]); 451 respipe_osf [0] = S_TO_SOCKET (respipe.fd [0]);
398 respipe_osf [1] = TO_SOCKET (respipe [1]); 452 respipe_osf [1] = S_TO_SOCKET (respipe.fd [1]);
399} 453}
400 454
401static void poll_wait (void) 455static void poll_wait (void)
402{ 456{
403 fd_set rfd;
404
405 while (eio_nreqs ()) 457 while (eio_nreqs ())
406 { 458 {
407 int size; 459 int size;
408 460
409 X_LOCK (reslock); 461 X_LOCK (reslock);
411 X_UNLOCK (reslock); 463 X_UNLOCK (reslock);
412 464
413 if (size) 465 if (size)
414 return; 466 return;
415 467
416 maybe_start_thread (); 468 etp_maybe_start_thread ();
417 469
418 FD_ZERO (&rfd); 470 s_epipe_wait (&respipe);
419 FD_SET (respipe [0], &rfd);
420
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 471 }
423} 472}
424 473
425static int poll_cb (void) 474static int poll_cb (void)
426{ 475{
427 int res; 476 for (;;)
428
429 do
430 { 477 {
431 res = eio_poll (); 478 int res = eio_poll ();
432 479
433 if (res > 0) 480 if (res > 0)
434 croak (0); 481 croak (0);
482
483 if (!max_outstanding || max_outstanding > eio_nreqs ())
484 return res;
485
486 poll_wait ();
435 } 487 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 488}
440 489
441static void atfork_child (void) 490static void atfork_child (void)
442{ 491{
443 create_respipe (); 492 create_respipe ();
444} 493}
445 494
495static SV *
496get_cb (SV *cb_sv)
497{
498 SvGETMAGIC (cb_sv);
499 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
500}
501
446#define dREQ \ 502#define dREQ \
503 SV *cb_cv; \
447 aio_req req; \ 504 aio_req req; \
448 int req_pri = next_pri; \ 505 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 506 next_pri = EIO_PRI_DEFAULT; \
450 \ 507 \
451 if (SvOK (callback) && !SvROK (callback)) \ 508 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 509 \
454 Newz (0, req, 1, eio_req); \ 510 Newz (0, req, 1, eio_req); \
455 if (!req) \ 511 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 512 croak ("out of memory during eio_req allocation"); \
457 \ 513 \
458 req->callback = newSVsv (callback); \ 514 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 515 req->pri = req_pri
460 516
461#define REQ_SEND \ 517#define REQ_SEND \
518 PUTBACK; \
462 req_submit (req); \ 519 req_submit (req); \
520 SPAGAIN; \
463 \ 521 \
464 if (GIMME_V != G_VOID) \ 522 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 523 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 524
467MODULE = IO::AIO PACKAGE = IO::AIO 525MODULE = IO::AIO PACKAGE = IO::AIO
468 526
469PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
470 528
471BOOT: 529BOOT:
472{ 530{
473 stash = gv_stashpv ("IO::AIO", 1); 531 static const struct {
474 532 const char *name;
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 533 IV iv;
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 534 } *civ, const_iv[] = {
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 535# define const_iv(name, value) { # name, (IV) value },
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 536# define const_eio(name) { # name, (IV) EIO_ ## name },
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 537 const_iv (EXDEV , EXDEV)
538 const_iv (ENOSYS , ENOSYS)
539 const_iv (O_RDONLY, O_RDONLY)
540 const_iv (O_WRONLY, O_WRONLY)
541 const_iv (O_CREAT , O_CREAT)
542 const_iv (O_TRUNC , O_TRUNC)
480#ifdef _WIN32 543#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock); 544 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 545#endif
546 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
547 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
548 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
549 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
550 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
551 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
492 552
553 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
554 const_eio (SYNC_FILE_RANGE_WRITE)
555 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
556
557 const_eio (READDIR_DENTS)
558 const_eio (READDIR_DIRS_FIRST)
559 const_eio (READDIR_STAT_ORDER)
560 const_eio (READDIR_FOUND_UNKNOWN)
561
562 const_eio (DT_UNKNOWN)
563 const_eio (DT_FIFO)
564 const_eio (DT_CHR)
565 const_eio (DT_DIR)
566 const_eio (DT_BLK)
567 const_eio (DT_REG)
568 const_eio (DT_LNK)
569 const_eio (DT_SOCK)
570 const_eio (DT_WHT)
571 };
572
573 stash = gv_stashpv ("IO::AIO", 1);
574
575 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
576 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
577
493 create_respipe (); 578 create_respipe ();
494 579
495 if (eio_init (want_poll, done_poll) < 0) 580 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 581 croak ("IO::AIO: unable to initialise eio library");
497 582
498 /* atfork child called in fifo order, so before eio's handler */ 583 /* atfork child called in fifo order, so before eio's handler */
499 X_THREAD_ATFORK (0, 0, atfork_child); 584 X_THREAD_ATFORK (0, 0, atfork_child);
500} 585}
501 586
502void 587void
503max_poll_reqs (int nreqs) 588max_poll_reqs (int nreqs)
504 PROTOTYPE: $ 589 PROTOTYPE: $
557 ALIAS: 642 ALIAS:
558 aio_fsync = EIO_FSYNC 643 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 644 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 645 PPCODE:
561{ 646{
647 int fd = s_fileno_croak (fh, 0);
562 dREQ; 648 dREQ;
563 649
564 req->type = ix; 650 req->type = ix;
565 req->sv1 = newSVsv (fh); 651 req->sv1 = newSVsv (fh);
566 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 652 req->int1 = fd;
653
654 REQ_SEND (req);
655}
656
657void
658aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
659 PROTOTYPE: $$$$;$
660 PPCODE:
661{
662 int fd = s_fileno_croak (fh, 0);
663 dREQ;
664
665 req->type = EIO_SYNC_FILE_RANGE;
666 req->sv1 = newSVsv (fh);
667 req->int1 = fd;
668 req->offs = offset;
669 req->size = nbytes;
670 req->int2 = flags;
567 671
568 REQ_SEND (req); 672 REQ_SEND (req);
569} 673}
570 674
571void 675void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 676aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 677 PROTOTYPE: $;$
574 PPCODE: 678 PPCODE:
575{ 679{
576 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 680 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
681 int fd = s_fileno_croak (fh, 0);
577 dREQ; 682 dREQ;
578 683
579 if (close_pipe < 0) 684 if (close_pipe < 0)
580 { 685 {
581 int pipefd [2]; 686 int pipefd [2];
589 } 694 }
590 695
591 req->type = EIO_DUP2; 696 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 697 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 698 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 699 req->int2 = fd;
595 700
596 REQ_SEND (req); 701 REQ_SEND (req);
597} 702}
598 703
599void 704void
603 aio_write = EIO_WRITE 708 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 709 PROTOTYPE: $$$$$;$
605 PPCODE: 710 PPCODE:
606{ 711{
607 STRLEN svlen; 712 STRLEN svlen;
713 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 714 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 715 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 716
614 if (dataoffset < 0) 717 if (dataoffset < 0)
615 dataoffset += svlen; 718 dataoffset += svlen;
616 719
617 if (dataoffset < 0 || dataoffset > svlen) 720 if (dataoffset < 0 || dataoffset > svlen)
623 if (!SvOK (length) || len + dataoffset > svlen) 726 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 727 len = svlen - dataoffset;
625 } 728 }
626 else 729 else
627 { 730 {
628 /* read: grow scalar as necessary */ 731 /* read: check type and grow scalar as necessary */
732 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 733 svptr = SvGROW (data, len + dataoffset + 1);
630 } 734 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 735
635 { 736 {
636 dREQ; 737 dREQ;
637 738
638 req->type = ix; 739 req->type = ix;
639 req->sv1 = newSVsv (fh); 740 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 741 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 742 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 743 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 744 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 745 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 746 req->stroffset = dataoffset;
661 PPCODE: 761 PPCODE:
662{ 762{
663 SV *data; 763 SV *data;
664 dREQ; 764 dREQ;
665 765
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 766 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 767 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 768 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 769
675 REQ_SEND; 770 REQ_SEND;
676} 771}
677 772
678void 773void
679aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 774aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
680 PROTOTYPE: $$$$;$ 775 PROTOTYPE: $$$$;$
681 PPCODE: 776 PPCODE:
682{ 777{
778 int ifd = s_fileno_croak (in_fh , 0);
779 int ofd = s_fileno_croak (out_fh, 1);
683 dREQ; 780 dREQ;
684 781
685 req->type = EIO_SENDFILE; 782 req->type = EIO_SENDFILE;
686 req->sv1 = newSVsv (out_fh); 783 req->sv1 = newSVsv (out_fh);
687 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 784 req->int1 = ofd;
688 req->sv2 = newSVsv (in_fh); 785 req->sv2 = newSVsv (in_fh);
689 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 786 req->int2 = ifd;
690 req->offs = SvVAL64 (in_offset); 787 req->offs = in_offset;
691 req->size = length; 788 req->size = length;
692 789
693 REQ_SEND; 790 REQ_SEND;
694} 791}
695 792
696void 793void
697aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 794aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
698 PROTOTYPE: $$$;$ 795 PROTOTYPE: $$$;$
699 PPCODE: 796 PPCODE:
700{ 797{
798 int fd = s_fileno_croak (fh, 0);
701 dREQ; 799 dREQ;
702 800
703 req->type = EIO_READAHEAD; 801 req->type = EIO_READAHEAD;
704 req->sv1 = newSVsv (fh); 802 req->sv1 = newSVsv (fh);
705 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 803 req->int1 = fd;
706 req->offs = SvVAL64 (offset); 804 req->offs = offset;
707 req->size = length; 805 req->size = length;
708 806
709 REQ_SEND; 807 REQ_SEND;
710} 808}
711 809
716 aio_lstat = EIO_LSTAT 814 aio_lstat = EIO_LSTAT
717 PPCODE: 815 PPCODE:
718{ 816{
719 dREQ; 817 dREQ;
720 818
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); 819 req->sv1 = newSVsv (fh_or_path);
730 820
731 if (SvPOK (fh_or_path)) 821 if (SvPOK (req->sv1))
732 { 822 {
733 req->type = ix; 823 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 824 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 825 }
736 else 826 else
750 840
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 841 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 842 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 843 req->sv1 = newSVsv (fh_or_path);
754 844
755 if (SvPOK (fh_or_path)) 845 if (SvPOK (req->sv1))
756 { 846 {
757 req->type = EIO_UTIME; 847 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 848 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 849 }
760 else 850 else
773 dREQ; 863 dREQ;
774 864
775 req->sv1 = newSVsv (fh_or_path); 865 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 866 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 867
778 if (SvPOK (fh_or_path)) 868 if (SvPOK (req->sv1))
779 { 869 {
780 req->type = EIO_TRUNCATE; 870 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 871 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 872 }
783 else 873 else
791 881
792void 882void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 883aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 884 ALIAS:
795 aio_chmod = EIO_CHMOD 885 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 886 aio_mkdir = EIO_MKDIR
798 PPCODE: 887 PPCODE:
799{ 888{
800 dREQ; 889 dREQ;
801 890
802 req->type = ix;
803 req->int2 = mode; 891 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 892 req->sv1 = newSVsv (fh_or_path);
805 893
806 if (ix == EIO_FCHMOD) 894 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 895 {
896 req->type = ix;
897 req->ptr1 = SvPVbyte_nolen (req->sv1);
898 }
808 else 899 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 900 {
901 req->type = EIO_FCHMOD;
902 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
903 }
810 904
811 REQ_SEND; 905 REQ_SEND;
812} 906}
813 907
814void 908void
819 913
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 914 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 915 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 916 req->sv1 = newSVsv (fh_or_path);
823 917
824 if (SvPOK (fh_or_path)) 918 if (SvPOK (req->sv1))
825 { 919 {
826 req->type = EIO_CHOWN; 920 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 921 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 922 }
829 else 923 else
831 req->type = EIO_FCHOWN; 925 req->type = EIO_FCHOWN;
832 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 926 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
833 } 927 }
834 928
835 REQ_SEND; 929 REQ_SEND;
930}
931
932void
933aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
934 PPCODE:
935{
936 dREQ;
937
938 req->type = EIO_READDIR;
939 req->sv1 = newSVsv (pathname);
940 req->ptr1 = SvPVbyte_nolen (req->sv1);
941 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
942
943 if (flags & EIO_READDIR_DENTS)
944 req->int1 |= EIO_READDIR_CUSTOM2;
945
946 REQ_SEND;
836} 947}
837 948
838void 949void
839aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 950aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
840 ALIAS: 951 ALIAS:
905{ 1016{
906 dREQ; 1017 dREQ;
907 1018
908 req->type = EIO_GROUP; 1019 req->type = EIO_GROUP;
909 1020
910 eio_submit (req); 1021 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1022 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 1023}
913 1024
914void 1025void
915aio_nop (SV *callback=&PL_sv_undef) 1026aio_nop (SV *callback=&PL_sv_undef)
927 1038
928int 1039int
929aioreq_pri (int pri = 0) 1040aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 1041 PROTOTYPE: ;$
931 CODE: 1042 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 1043 RETVAL = next_pri;
933 if (items > 0) 1044 if (items > 0)
934 { 1045 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1046 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1047 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 1048 next_pri = pri;
938 } 1049 }
939 OUTPUT: 1050 OUTPUT:
940 RETVAL 1051 RETVAL
941 1052
942void 1053void
943aioreq_nice (int nice = 0) 1054aioreq_nice (int nice = 0)
944 CODE: 1055 CODE:
945 nice = next_pri - nice; 1056 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1057 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1058 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 1059 next_pri = nice;
949 1060
950void 1061void
951flush () 1062flush ()
952 PROTOTYPE: 1063 PROTOTYPE:
953 CODE: 1064 CODE:
968 1079
969int 1080int
970poll_fileno() 1081poll_fileno()
971 PROTOTYPE: 1082 PROTOTYPE:
972 CODE: 1083 CODE:
973 RETVAL = respipe [0]; 1084 RETVAL = s_epipe_fd (&respipe);
974 OUTPUT: 1085 OUTPUT:
975 RETVAL 1086 RETVAL
976 1087
977int 1088int
978poll_cb(...) 1089poll_cb(...)
1014 1125
1015int 1126int
1016nthreads() 1127nthreads()
1017 PROTOTYPE: 1128 PROTOTYPE:
1018 CODE: 1129 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1130 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1131 OUTPUT:
1023 RETVAL 1132 RETVAL
1024 1133
1134int
1135fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1136 PROTOTYPE: $$$$
1137 CODE:
1138#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1139 RETVAL = posix_fadvise (fh, offset, length, advice);
1140#else
1141 RETVAL = errno = ENOSYS;
1142#endif
1143 OUTPUT:
1144 RETVAL
1145
1146ssize_t
1147sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1148 PROTOTYPE: $$$$
1149 CODE:
1150 eio_sendfile_sync (ofh, ifh, offset, count);
1151
1025void _on_next_submit (SV *cb) 1152void _on_next_submit (SV *cb)
1026 CODE: 1153 CODE:
1027 SvREFCNT_dec (on_next_submit); 1154 SvREFCNT_dec (on_next_submit);
1028 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1155 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1029 1156
1036 CODE: 1163 CODE:
1037 eio_cancel (req); 1164 eio_cancel (req);
1038 1165
1039void 1166void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1167cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 CODE: 1168 PPCODE:
1169{
1170 if (GIMME_V != G_VOID)
1171 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1172
1173 if (items > 1)
1174 {
1175 SV *cb_cv =get_cb (callback);
1176
1042 SvREFCNT_dec (req->callback); 1177 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1178 req->callback = SvREFCNT_inc (cb_cv);
1179 }
1180}
1044 1181
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1182MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1183
1047void 1184void
1048add (aio_req grp, ...) 1185add (aio_req grp, ...)
1080 AV *av; 1217 AV *av;
1081 1218
1082 grp->errorno = errno; 1219 grp->errorno = errno;
1083 1220
1084 av = newAV (); 1221 av = newAV ();
1222 av_extend (av, items - 1);
1085 1223
1086 for (i = 1; i < items; ++i ) 1224 for (i = 1; i < items; ++i )
1087 av_push (av, newSVsv (ST (i))); 1225 av_push (av, newSVsv (ST (i)));
1088 1226
1089 SvREFCNT_dec (grp->sv1); 1227 SvREFCNT_dec (grp->sv1);
1103void 1241void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1242feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1243 CODE:
1106{ 1244{
1107 SvREFCNT_dec (grp->sv2); 1245 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1246 grp->sv2 = newSVsv (callback);
1247 grp->feed = aio_grp_feed;
1109 1248
1110 if (grp->int2 <= 0) 1249 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1250 grp->int2 = 2;
1112 1251
1113 eio_grp_limit (grp, grp->int2); 1252 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines