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.115 by root, Sat May 10 18:06:41 2008 UTC vs.
Revision 1.157 by root, Sat Jan 2 12:58:37 2010 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
75 90
76static 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
77typedef 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 */
78 107
79#define AIO_REQ_KLASS "IO::AIO::REQ" 108static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
80#define AIO_GRP_KLASS "IO::AIO::GRP"
81 109
82#define EIO_COMMON \ 110#define EIO_REQ_MEMBERS \
83 SV *callback; \ 111 SV *callback; \
84 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 113 STRLEN stroffset; \
86 SV *self 114 SV *self;
115
116#define EIO_NO_WRAPPERS 1
87 117
88#include "libeio/eio.h" 118#include "libeio/eio.h"
119
120#ifndef POSIX_FADV_NORMAL
121# define POSIX_FADV_NORMAL 0
122# 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
89 144
90static int req_invoke (eio_req *req); 145static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 146#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); 147static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 148#define EIO_DESTROY(req) req_destroy (req)
96 149
97enum { 150enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 151 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
101#include "libeio/eio.c" 154#include "libeio/eio.c"
102 155
103typedef eio_req *aio_req; 156typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 157typedef eio_req *aio_req_ornot;
105 158
106static unsigned int max_outstanding = 0x7fffffff; 159static SV *on_next_submit;
160static int next_pri = EIO_PRI_DEFAULT;
161static int max_outstanding;
107 162
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 163static s_epipe respipe;
109
110static int respipe_osf [2], respipe [2] = { -1, -1 };
111 164
112static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
113static void req_cancel (aio_req req); 166static void req_cancel (aio_req req);
114 167
115static void want_poll (void) 168static void want_poll (void)
116{ 169{
117 /* write a dummy byte to the pipe so fh becomes ready */ 170 /* write a dummy byte to the pipe so fh becomes ready */
118 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 171 s_epipe_signal (&respipe);
119} 172}
120 173
121static void done_poll (void) 174static void done_poll (void)
122{ 175{
123 /* read any signals sent by the worker threads */ 176 /* read any signals sent by the worker threads */
124 char buf [4]; 177 s_epipe_drain (&respipe);
125 while (respipe_read (respipe [0], buf, 4) == 4)
126 ;
127} 178}
128 179
129/* must be called at most once */ 180/* must be called at most once */
130static SV *req_sv (aio_req req, const char *klass) 181static SV *req_sv (aio_req req, HV *stash)
131{ 182{
132 if (!req->self) 183 if (!req->self)
133 { 184 {
134 req->self = (SV *)newHV (); 185 req->self = (SV *)newHV ();
135 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 186 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
136 } 187 }
137 188
138 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 189 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
139} 190}
140 191
141static aio_req SvAIO_REQ (SV *sv) 192static aio_req SvAIO_REQ (SV *sv)
142{ 193{
143 MAGIC *mg; 194 MAGIC *mg;
144 195
145 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")))
146 croak ("object of class " AIO_REQ_KLASS " expected"); 200 croak ("object of class IO::AIO::REQ expected");
147 201
148 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 202 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
149 203
150 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
151} 205}
157 dSP; 211 dSP;
158 212
159 ENTER; 213 ENTER;
160 SAVETMPS; 214 SAVETMPS;
161 PUSHMARK (SP); 215 PUSHMARK (SP);
162 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, aio_grp_stash));
163 PUTBACK; 217 PUTBACK;
164 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
165 SPAGAIN; 219 SPAGAIN;
166 FREETMPS; 220 FREETMPS;
167 LEAVE; 221 LEAVE;
168 } 222 }
169} 223}
170 224
225static void req_submit (eio_req *req)
226{
227 eio_submit (req);
228
229 if (expect_false (on_next_submit))
230 {
231 dSP;
232 SV *cb = sv_2mortal (on_next_submit);
233
234 on_next_submit = 0;
235
236 PUSHMARK (SP);
237 PUTBACK;
238 call_sv (cb, G_DISCARD | G_EVAL);
239 }
240}
241
171static int req_invoke (eio_req *req) 242static int req_invoke (eio_req *req)
172{ 243{
173 dSP; 244 dSP;
174 245
175 if (req->flags & FLAG_SV2_RO_OFF) 246 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 247 SvREADONLY_off (req->sv2);
177 248
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 249 if (!EIO_CANCELLED (req) && req->callback)
179 { 250 {
180 ENTER; 251 ENTER;
181 SAVETMPS; 252 SAVETMPS;
182 PUSHMARK (SP); 253 PUSHMARK (SP);
183 EXTEND (SP, 1); 254 EXTEND (SP, 1);
189 SV *rv = &PL_sv_undef; 260 SV *rv = &PL_sv_undef;
190 261
191 if (req->result >= 0) 262 if (req->result >= 0)
192 { 263 {
193 int i; 264 int i;
194 char *buf = req->ptr2; 265 char *names = (char *)req->ptr2;
266 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
195 AV *av = newAV (); 267 AV *av = newAV ();
196 268
197 av_extend (av, req->result - 1); 269 av_extend (av, req->result - 1);
198 270
199 for (i = 0; i < req->result; ++i) 271 for (i = 0; i < req->result; ++i)
200 { 272 {
201 SV *sv = newSVpv (buf, 0); 273 if (req->int1 & EIO_READDIR_DENTS)
274 {
275 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
202 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
203 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);
204 buf += SvCUR (sv) + 1; 305 names += SvCUR (name) + 1;
306 }
205 } 307 }
206 308
207 rv = sv_2mortal (newRV_noinc ((SV *)av)); 309 rv = sv_2mortal (newRV_noinc ((SV *)av));
208 } 310 }
209 311
210 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))));
211 } 316 }
212 break; 317 break;
213 318
214 case EIO_OPEN: 319 case EIO_OPEN:
215 { 320 {
221 GV *gv = (GV *)sv_newmortal (); 326 GV *gv = (GV *)sv_newmortal ();
222 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
223 char sym [64]; 328 char sym [64];
224 int symlen; 329 int symlen;
225 330
226 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
227 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, aio_stash, sym, symlen, 0);
228 333
229 symlen = snprintf ( 334 symlen = snprintf (
230 sym, 335 sym,
231 sizeof (sym), 336 sizeof (sym),
232 "%s&=%d", 337 "%s&=%d",
233 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 338 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
234 req->result 339 (int)req->result
235 ); 340 );
236 341
237 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 342 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
238 fh = (SV *)gv; 343 fh = (SV *)gv;
239 } 344 }
260 case EIO_BUSY: 365 case EIO_BUSY:
261 break; 366 break;
262 367
263 case EIO_READLINK: 368 case EIO_READLINK:
264 if (req->result > 0) 369 if (req->result > 0)
265 { 370 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 371 break;
271 372
272 case EIO_STAT: 373 case EIO_STAT:
273 case EIO_LSTAT: 374 case EIO_LSTAT:
274 case EIO_FSTAT: 375 case EIO_FSTAT:
277 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 378 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
278 PUSHs (sv_2mortal (newSViv (req->result))); 379 PUSHs (sv_2mortal (newSViv (req->result)));
279 break; 380 break;
280 381
281 case EIO_READ: 382 case EIO_READ:
383 {
282 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));
283 *SvEND (req->sv2) = 0; 385 *SvEND (req->sv2) = 0;
386 SvPOK_only (req->sv2);
387 SvSETMAGIC (req->sv2);
284 PUSHs (sv_2mortal (newSViv (req->result))); 388 PUSHs (sv_2mortal (newSViv (req->result)));
389 }
285 break; 390 break;
286 391
287 case EIO_DUP2: 392 case EIO_DUP2:
288 if (req->result > 0) 393 if (req->result > 0)
289 req->result = 0; 394 req->result = 0;
335 grp->sv2 = 0; 440 grp->sv2 = 0;
336 441
337 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
338} 443}
339 444
340#ifdef USE_SOCKETS_AS_HANDLES
341# define TO_SOCKET(x) (win32_get_osfhandle (x))
342#else
343# define TO_SOCKET(x) (x)
344#endif
345
346static void 445static void
347create_respipe (void) 446create_respipe (void)
348{ 447{
349 int old_readfd = respipe [0];
350
351 if (respipe [1] >= 0)
352 respipe_close (TO_SOCKET (respipe [1]));
353
354#ifdef _WIN32
355 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
356#else
357 if (pipe (respipe)) 448 if (s_epipe_renew (&respipe))
358#endif
359 croak ("unable to initialize result pipe"); 449 croak ("IO::AIO: unable to initialize result pipe");
360
361 if (old_readfd >= 0)
362 {
363 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
364 croak ("unable to initialize result pipe(2)");
365
366 respipe_close (respipe [0]);
367 respipe [0] = old_readfd;
368 }
369
370#ifdef _WIN32
371 int arg = 1;
372 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
373 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
374#else
375 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
376 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
377#endif
378 croak ("unable to initialize result pipe(3)");
379
380 respipe_osf [0] = TO_SOCKET (respipe [0]);
381 respipe_osf [1] = TO_SOCKET (respipe [1]);
382} 450}
383 451
384static void poll_wait (void) 452static void poll_wait (void)
385{ 453{
386 fd_set rfd;
387
388 while (eio_nreqs ()) 454 while (eio_nreqs ())
389 { 455 {
390 int size; 456 int size;
391 457
392 X_LOCK (reslock); 458 X_LOCK (reslock);
394 X_UNLOCK (reslock); 460 X_UNLOCK (reslock);
395 461
396 if (size) 462 if (size)
397 return; 463 return;
398 464
399 maybe_start_thread (); 465 etp_maybe_start_thread ();
400 466
401 FD_ZERO (&rfd); 467 s_epipe_wait (&respipe);
402 FD_SET (respipe [0], &rfd);
403
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 468 }
406} 469}
407 470
408static int poll_cb (void) 471static int poll_cb (void)
409{ 472{
473 for (;;)
474 {
410 int res = eio_poll (); 475 int res = eio_poll ();
411 476
412 if (res > 0) 477 if (res > 0)
413 croak (0); 478 croak (0);
414 479
480 if (!max_outstanding || max_outstanding > eio_nreqs ())
415 return res; 481 return res;
482
483 poll_wait ();
484 }
485}
486
487static void atfork_child (void)
488{
489 create_respipe ();
490}
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;
416} 497}
417 498
418#define dREQ \ 499#define dREQ \
500 SV *cb_cv; \
419 aio_req req; \ 501 aio_req req; \
420 int req_pri = next_pri; \ 502 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 503 next_pri = EIO_PRI_DEFAULT; \
422 \ 504 \
423 if (SvOK (callback) && !SvROK (callback)) \ 505 cb_cv = get_cb (callback); \
424 croak ("callback must be undef or of reference type"); \
425 \ 506 \
426 Newz (0, req, 1, eio_req); \ 507 Newz (0, req, 1, eio_req); \
427 if (!req) \ 508 if (!req) \
428 croak ("out of memory during eio_req allocation"); \ 509 croak ("out of memory during eio_req allocation"); \
429 \ 510 \
430 req->callback = newSVsv (callback); \ 511 req->callback = SvREFCNT_inc (cb_cv); \
431 req->pri = req_pri 512 req->pri = req_pri
432 513
433#define REQ_SEND \ 514#define REQ_SEND \
515 PUTBACK; \
434 eio_submit (req); \ 516 req_submit (req); \
517 SPAGAIN; \
435 \ 518 \
436 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
438 521
439MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
440 523
441PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
442 525
443BOOT: 526BOOT:
444{ 527{
445 stash = gv_stashpv ("IO::AIO", 1); 528 static const struct {
446 529 const char *name;
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 530 IV iv;
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 531 } *civ, const_iv[] = {
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 532# define const_iv(name, value) { # name, (IV) value },
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 533# define const_eio(name) { # name, (IV) EIO_ ## name },
451 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)
452#ifdef _WIN32 540#ifndef _WIN32
453 X_MUTEX_CHECK (wrklock); 541 const_iv (S_IFIFO , S_IFIFO)
454 X_MUTEX_CHECK (reslock);
455 X_MUTEX_CHECK (reqlock);
456 X_MUTEX_CHECK (reqwait);
457 X_MUTEX_CHECK (preadwritelock);
458 X_MUTEX_CHECK (readdirlock);
459
460 X_COND_CHECK (reqwait);
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#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)
464 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
465 create_respipe (); 577 create_respipe ();
466 578
467 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
581
582 /* atfork child called in fifo order, so before eio's handler */
583 X_THREAD_ATFORK (0, 0, atfork_child);
469} 584}
470 585
471void 586void
472max_poll_reqs (int nreqs) 587max_poll_reqs (int nreqs)
473 PROTOTYPE: $ 588 PROTOTYPE: $
526 ALIAS: 641 ALIAS:
527 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
528 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
529 PPCODE: 644 PPCODE:
530{ 645{
646 int fd = s_fileno_croak (fh, 0);
531 dREQ; 647 dREQ;
532 648
533 req->type = ix; 649 req->type = ix;
534 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
535 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;
536 670
537 REQ_SEND (req); 671 REQ_SEND (req);
538} 672}
539 673
540void 674void
541aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
542 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
543 PPCODE: 677 PPCODE:
544{ 678{
545 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);
546 dREQ; 681 dREQ;
547 682
548 if (close_pipe < 0) 683 if (close_pipe < 0)
549 { 684 {
550 int pipefd [2]; 685 int pipefd [2];
558 } 693 }
559 694
560 req->type = EIO_DUP2; 695 req->type = EIO_DUP2;
561 req->int1 = close_pipe; 696 req->int1 = close_pipe;
562 req->sv2 = newSVsv (fh); 697 req->sv2 = newSVsv (fh);
563 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 698 req->int2 = fd;
564 699
565 REQ_SEND (req); 700 REQ_SEND (req);
566} 701}
567 702
568void 703void
572 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
573 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
574 PPCODE: 709 PPCODE:
575{ 710{
576 STRLEN svlen; 711 STRLEN svlen;
712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
577 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
578 UV len = SvUV (length); 714 UV len = SvUV (length);
579
580 SvUPGRADE (data, SVt_PV);
581 SvPOK_on (data);
582 715
583 if (dataoffset < 0) 716 if (dataoffset < 0)
584 dataoffset += svlen; 717 dataoffset += svlen;
585 718
586 if (dataoffset < 0 || dataoffset > svlen) 719 if (dataoffset < 0 || dataoffset > svlen)
592 if (!SvOK (length) || len + dataoffset > svlen) 725 if (!SvOK (length) || len + dataoffset > svlen)
593 len = svlen - dataoffset; 726 len = svlen - dataoffset;
594 } 727 }
595 else 728 else
596 { 729 {
597 /* read: grow scalar as necessary */ 730 /* read: check type and grow scalar as necessary */
731 SvUPGRADE (data, SVt_PV);
598 svptr = SvGROW (data, len + dataoffset + 1); 732 svptr = SvGROW (data, len + dataoffset + 1);
599 } 733 }
600
601 if (len < 0)
602 croak ("length must not be negative");
603 734
604 { 735 {
605 dREQ; 736 dREQ;
606 737
607 req->type = ix; 738 req->type = ix;
608 req->sv1 = newSVsv (fh); 739 req->sv1 = newSVsv (fh);
609 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 740 req->int1 = fd;
610 : IoOFP (sv_2io (fh)));
611 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 741 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
612 req->size = len; 742 req->size = len;
613 req->sv2 = SvREFCNT_inc (data); 743 req->sv2 = SvREFCNT_inc (data);
614 req->ptr2 = (char *)svptr + dataoffset; 744 req->ptr2 = (char *)svptr + dataoffset;
615 req->stroffset = dataoffset; 745 req->stroffset = dataoffset;
630 PPCODE: 760 PPCODE:
631{ 761{
632 SV *data; 762 SV *data;
633 dREQ; 763 dREQ;
634 764
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 765 req->type = EIO_READLINK;
639 req->sv1 = newSVsv (path); 766 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 767 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 768
644 REQ_SEND; 769 REQ_SEND;
645} 770}
646 771
647void 772void
648aio_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)
649 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
650 PPCODE: 775 PPCODE:
651{ 776{
777 int ifd = s_fileno_croak (in_fh , 0);
778 int ofd = s_fileno_croak (out_fh, 1);
652 dREQ; 779 dREQ;
653 780
654 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
655 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
656 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 783 req->int1 = ofd;
657 req->sv2 = newSVsv (in_fh); 784 req->sv2 = newSVsv (in_fh);
658 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 785 req->int2 = ifd;
659 req->offs = SvVAL64 (in_offset); 786 req->offs = in_offset;
660 req->size = length; 787 req->size = length;
661 788
662 REQ_SEND; 789 REQ_SEND;
663} 790}
664 791
665void 792void
666aio_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)
667 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
668 PPCODE: 795 PPCODE:
669{ 796{
797 int fd = s_fileno_croak (fh, 0);
670 dREQ; 798 dREQ;
671 799
672 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
673 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 802 req->int1 = fd;
675 req->offs = SvVAL64 (offset); 803 req->offs = offset;
676 req->size = length; 804 req->size = length;
677 805
678 REQ_SEND; 806 REQ_SEND;
679} 807}
680 808
685 aio_lstat = EIO_LSTAT 813 aio_lstat = EIO_LSTAT
686 PPCODE: 814 PPCODE:
687{ 815{
688 dREQ; 816 dREQ;
689 817
690 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691 if (!req->ptr2)
692 {
693 req_destroy (req);
694 croak ("out of memory during aio_stat statdata allocation");
695 }
696
697 req->flags |= EIO_FLAG_PTR2_FREE;
698 req->sv1 = newSVsv (fh_or_path); 818 req->sv1 = newSVsv (fh_or_path);
699 819
700 if (SvPOK (fh_or_path)) 820 if (SvPOK (req->sv1))
701 { 821 {
702 req->type = ix; 822 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 823 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 824 }
705 else 825 else
719 839
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 840 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 841 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 842 req->sv1 = newSVsv (fh_or_path);
723 843
724 if (SvPOK (fh_or_path)) 844 if (SvPOK (req->sv1))
725 { 845 {
726 req->type = EIO_UTIME; 846 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 847 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 848 }
729 else 849 else
742 dREQ; 862 dREQ;
743 863
744 req->sv1 = newSVsv (fh_or_path); 864 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 865 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 866
747 if (SvPOK (fh_or_path)) 867 if (SvPOK (req->sv1))
748 { 868 {
749 req->type = EIO_TRUNCATE; 869 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 870 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 871 }
752 else 872 else
760 880
761void 881void
762aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 882aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
763 ALIAS: 883 ALIAS:
764 aio_chmod = EIO_CHMOD 884 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 885 aio_mkdir = EIO_MKDIR
767 PPCODE: 886 PPCODE:
768{ 887{
769 dREQ; 888 dREQ;
770 889
771 req->type = ix;
772 req->int2 = mode; 890 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 891 req->sv1 = newSVsv (fh_or_path);
774 892
775 if (ix == EIO_FCHMOD) 893 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 894 {
895 req->type = ix;
896 req->ptr1 = SvPVbyte_nolen (req->sv1);
897 }
777 else 898 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 899 {
900 req->type = EIO_FCHMOD;
901 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
902 }
779 903
780 REQ_SEND; 904 REQ_SEND;
781} 905}
782 906
783void 907void
788 912
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 913 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 914 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 915 req->sv1 = newSVsv (fh_or_path);
792 916
793 if (SvPOK (fh_or_path)) 917 if (SvPOK (req->sv1))
794 { 918 {
795 req->type = EIO_CHOWN; 919 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 920 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 921 }
798 else 922 else
800 req->type = EIO_FCHOWN; 924 req->type = EIO_FCHOWN;
801 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 925 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
802 } 926 }
803 927
804 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;
805} 946}
806 947
807void 948void
808aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 949aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
809 ALIAS: 950 ALIAS:
874{ 1015{
875 dREQ; 1016 dREQ;
876 1017
877 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
878 1019
879 eio_submit (req); 1020 req_submit (req);
880 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
881} 1022}
882 1023
883void 1024void
884aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
885 ALIAS: 1026 ALIAS:
896 1037
897int 1038int
898aioreq_pri (int pri = 0) 1039aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$ 1040 PROTOTYPE: ;$
900 CODE: 1041 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 1042 RETVAL = next_pri;
902 if (items > 0) 1043 if (items > 0)
903 { 1044 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1045 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1046 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 1047 next_pri = pri;
907 } 1048 }
908 OUTPUT: 1049 OUTPUT:
909 RETVAL 1050 RETVAL
910 1051
911void 1052void
912aioreq_nice (int nice = 0) 1053aioreq_nice (int nice = 0)
913 CODE: 1054 CODE:
914 nice = next_pri - nice; 1055 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1056 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1057 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 1058 next_pri = nice;
918 1059
919void 1060void
920flush () 1061flush ()
921 PROTOTYPE: 1062 PROTOTYPE:
922 CODE: 1063 CODE:
923 while (nreqs) 1064 while (eio_nreqs ())
924 { 1065 {
925 poll_wait (); 1066 poll_wait ();
926 poll_cb (); 1067 poll_cb ();
927 } 1068 }
928 1069
937 1078
938int 1079int
939poll_fileno() 1080poll_fileno()
940 PROTOTYPE: 1081 PROTOTYPE:
941 CODE: 1082 CODE:
942 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
943 OUTPUT: 1084 OUTPUT:
944 RETVAL 1085 RETVAL
945 1086
946int 1087int
947poll_cb(...) 1088poll_cb(...)
983 1124
984int 1125int
985nthreads() 1126nthreads()
986 PROTOTYPE: 1127 PROTOTYPE:
987 CODE: 1128 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1129 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1130 OUTPUT:
992 RETVAL 1131 RETVAL
993 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 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1150 OUTPUT:
1151 RETVAL
1152
1153void _on_next_submit (SV *cb)
1154 CODE:
1155 SvREFCNT_dec (on_next_submit);
1156 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1157
994PROTOTYPES: DISABLE 1158PROTOTYPES: DISABLE
995 1159
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1160MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1161
998void 1162void
1000 CODE: 1164 CODE:
1001 eio_cancel (req); 1165 eio_cancel (req);
1002 1166
1003void 1167void
1004cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1168cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005 CODE: 1169 PPCODE:
1170{
1171 if (GIMME_V != G_VOID)
1172 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1173
1174 if (items > 1)
1175 {
1176 SV *cb_cv =get_cb (callback);
1177
1006 SvREFCNT_dec (req->callback); 1178 SvREFCNT_dec (req->callback);
1007 req->callback = newSVsv (callback); 1179 req->callback = SvREFCNT_inc (cb_cv);
1180 }
1181}
1008 1182
1009MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1183MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010 1184
1011void 1185void
1012add (aio_req grp, ...) 1186add (aio_req grp, ...)
1044 AV *av; 1218 AV *av;
1045 1219
1046 grp->errorno = errno; 1220 grp->errorno = errno;
1047 1221
1048 av = newAV (); 1222 av = newAV ();
1223 av_extend (av, items - 1);
1049 1224
1050 for (i = 1; i < items; ++i ) 1225 for (i = 1; i < items; ++i )
1051 av_push (av, newSVsv (ST (i))); 1226 av_push (av, newSVsv (ST (i)));
1052 1227
1053 SvREFCNT_dec (grp->sv1); 1228 SvREFCNT_dec (grp->sv1);
1067void 1242void
1068feed (aio_req grp, SV *callback=&PL_sv_undef) 1243feed (aio_req grp, SV *callback=&PL_sv_undef)
1069 CODE: 1244 CODE:
1070{ 1245{
1071 SvREFCNT_dec (grp->sv2); 1246 SvREFCNT_dec (grp->sv2);
1072 grp->sv2 = newSVsv (callback); 1247 grp->sv2 = newSVsv (callback);
1248 grp->feed = aio_grp_feed;
1073 1249
1074 if (grp->int2 <= 0) 1250 if (grp->int2 <= 0)
1075 grp->int2 = 2; 1251 grp->int2 = 2;
1076 1252
1077 eio_grp_limit (grp, grp->int2); 1253 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines