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.116 by root, Sat May 10 19:25:33 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
159static SV *on_next_submit;
160static int next_pri = EIO_PRI_DEFAULT;
106static int max_outstanding = 0; 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{
410 int res; 473 for (;;)
411
412 do
413 { 474 {
414 res = eio_poll (); 475 int res = eio_poll ();
415 476
416 if (res > 0) 477 if (res > 0)
417 croak (0); 478 croak (0);
479
480 if (!max_outstanding || max_outstanding > eio_nreqs ())
481 return res;
482
483 poll_wait ();
418 } 484 }
419 while (max_outstanding && max_outstanding <= eio_nreqs ());
420
421 return res;
422} 485}
423 486
424static void atfork_child (void) 487static void atfork_child (void)
425{ 488{
426 create_respipe (); 489 create_respipe ();
427} 490}
428 491
492static SV *
493get_cb (SV *cb_sv)
494{
495 SvGETMAGIC (cb_sv);
496 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
497}
498
429#define dREQ \ 499#define dREQ \
500 SV *cb_cv; \
430 aio_req req; \ 501 aio_req req; \
431 int req_pri = next_pri; \ 502 int req_pri = next_pri; \
432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 503 next_pri = EIO_PRI_DEFAULT; \
433 \ 504 \
434 if (SvOK (callback) && !SvROK (callback)) \ 505 cb_cv = get_cb (callback); \
435 croak ("callback must be undef or of reference type"); \
436 \ 506 \
437 Newz (0, req, 1, eio_req); \ 507 Newz (0, req, 1, eio_req); \
438 if (!req) \ 508 if (!req) \
439 croak ("out of memory during eio_req allocation"); \ 509 croak ("out of memory during eio_req allocation"); \
440 \ 510 \
441 req->callback = newSVsv (callback); \ 511 req->callback = SvREFCNT_inc (cb_cv); \
442 req->pri = req_pri 512 req->pri = req_pri
443 513
444#define REQ_SEND \ 514#define REQ_SEND \
515 PUTBACK; \
445 eio_submit (req); \ 516 req_submit (req); \
517 SPAGAIN; \
446 \ 518 \
447 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
448 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
449 521
450MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
451 523
452PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
453 525
454BOOT: 526BOOT:
455{ 527{
456 stash = gv_stashpv ("IO::AIO", 1); 528 static const struct {
457 529 const char *name;
458 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 530 IV iv;
459 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 531 } *civ, const_iv[] = {
460 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 532# define const_iv(name, value) { # name, (IV) value },
461 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 533# define const_eio(name) { # name, (IV) EIO_ ## name },
462 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)
463#ifdef _WIN32 540#ifndef _WIN32
464 X_MUTEX_CHECK (wrklock); 541 const_iv (S_IFIFO , S_IFIFO)
465 X_MUTEX_CHECK (reslock);
466 X_MUTEX_CHECK (reqlock);
467 X_MUTEX_CHECK (reqwait);
468 X_MUTEX_CHECK (preadwritelock);
469 X_MUTEX_CHECK (readdirlock);
470
471 X_COND_CHECK (reqwait);
472#else
473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
474#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)
475 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
476 create_respipe (); 577 create_respipe ();
477 578
478 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
479 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
480 581
481 /* atfork child called in fifo order, so before eio's handler */ 582 /* atfork child called in fifo order, so before eio's handler */
482 X_THREAD_ATFORK (0, 0, atfork_child); 583 X_THREAD_ATFORK (0, 0, atfork_child);
483} 584}
484 585
485void 586void
486max_poll_reqs (int nreqs) 587max_poll_reqs (int nreqs)
487 PROTOTYPE: $ 588 PROTOTYPE: $
540 ALIAS: 641 ALIAS:
541 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
542 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
543 PPCODE: 644 PPCODE:
544{ 645{
646 int fd = s_fileno_croak (fh, 0);
545 dREQ; 647 dREQ;
546 648
547 req->type = ix; 649 req->type = ix;
548 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
549 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;
550 670
551 REQ_SEND (req); 671 REQ_SEND (req);
552} 672}
553 673
554void 674void
555aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
556 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
557 PPCODE: 677 PPCODE:
558{ 678{
559 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);
560 dREQ; 681 dREQ;
561 682
562 if (close_pipe < 0) 683 if (close_pipe < 0)
563 { 684 {
564 int pipefd [2]; 685 int pipefd [2];
572 } 693 }
573 694
574 req->type = EIO_DUP2; 695 req->type = EIO_DUP2;
575 req->int1 = close_pipe; 696 req->int1 = close_pipe;
576 req->sv2 = newSVsv (fh); 697 req->sv2 = newSVsv (fh);
577 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 698 req->int2 = fd;
578 699
579 REQ_SEND (req); 700 REQ_SEND (req);
580} 701}
581 702
582void 703void
586 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
587 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
588 PPCODE: 709 PPCODE:
589{ 710{
590 STRLEN svlen; 711 STRLEN svlen;
712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
591 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
592 UV len = SvUV (length); 714 UV len = SvUV (length);
593
594 SvUPGRADE (data, SVt_PV);
595 SvPOK_on (data);
596 715
597 if (dataoffset < 0) 716 if (dataoffset < 0)
598 dataoffset += svlen; 717 dataoffset += svlen;
599 718
600 if (dataoffset < 0 || dataoffset > svlen) 719 if (dataoffset < 0 || dataoffset > svlen)
606 if (!SvOK (length) || len + dataoffset > svlen) 725 if (!SvOK (length) || len + dataoffset > svlen)
607 len = svlen - dataoffset; 726 len = svlen - dataoffset;
608 } 727 }
609 else 728 else
610 { 729 {
611 /* read: grow scalar as necessary */ 730 /* read: check type and grow scalar as necessary */
731 SvUPGRADE (data, SVt_PV);
612 svptr = SvGROW (data, len + dataoffset + 1); 732 svptr = SvGROW (data, len + dataoffset + 1);
613 } 733 }
614
615 if (len < 0)
616 croak ("length must not be negative");
617 734
618 { 735 {
619 dREQ; 736 dREQ;
620 737
621 req->type = ix; 738 req->type = ix;
622 req->sv1 = newSVsv (fh); 739 req->sv1 = newSVsv (fh);
623 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 740 req->int1 = fd;
624 : IoOFP (sv_2io (fh)));
625 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 741 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
626 req->size = len; 742 req->size = len;
627 req->sv2 = SvREFCNT_inc (data); 743 req->sv2 = SvREFCNT_inc (data);
628 req->ptr2 = (char *)svptr + dataoffset; 744 req->ptr2 = (char *)svptr + dataoffset;
629 req->stroffset = dataoffset; 745 req->stroffset = dataoffset;
644 PPCODE: 760 PPCODE:
645{ 761{
646 SV *data; 762 SV *data;
647 dREQ; 763 dREQ;
648 764
649 data = newSV (NAME_MAX);
650 SvPOK_on (data);
651
652 req->type = EIO_READLINK; 765 req->type = EIO_READLINK;
653 req->sv1 = newSVsv (path); 766 req->sv1 = newSVsv (path);
654 req->ptr1 = SvPVbyte_nolen (req->sv1); 767 req->ptr1 = SvPVbyte_nolen (req->sv1);
655 req->sv2 = data;
656 req->ptr2 = SvPVbyte_nolen (data);
657 768
658 REQ_SEND; 769 REQ_SEND;
659} 770}
660 771
661void 772void
662aio_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)
663 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
664 PPCODE: 775 PPCODE:
665{ 776{
777 int ifd = s_fileno_croak (in_fh , 0);
778 int ofd = s_fileno_croak (out_fh, 1);
666 dREQ; 779 dREQ;
667 780
668 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
669 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
670 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 783 req->int1 = ofd;
671 req->sv2 = newSVsv (in_fh); 784 req->sv2 = newSVsv (in_fh);
672 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 785 req->int2 = ifd;
673 req->offs = SvVAL64 (in_offset); 786 req->offs = in_offset;
674 req->size = length; 787 req->size = length;
675 788
676 REQ_SEND; 789 REQ_SEND;
677} 790}
678 791
679void 792void
680aio_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)
681 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
682 PPCODE: 795 PPCODE:
683{ 796{
797 int fd = s_fileno_croak (fh, 0);
684 dREQ; 798 dREQ;
685 799
686 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
687 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
688 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 802 req->int1 = fd;
689 req->offs = SvVAL64 (offset); 803 req->offs = offset;
690 req->size = length; 804 req->size = length;
691 805
692 REQ_SEND; 806 REQ_SEND;
693} 807}
694 808
699 aio_lstat = EIO_LSTAT 813 aio_lstat = EIO_LSTAT
700 PPCODE: 814 PPCODE:
701{ 815{
702 dREQ; 816 dREQ;
703 817
704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
705 if (!req->ptr2)
706 {
707 req_destroy (req);
708 croak ("out of memory during aio_stat statdata allocation");
709 }
710
711 req->flags |= EIO_FLAG_PTR2_FREE;
712 req->sv1 = newSVsv (fh_or_path); 818 req->sv1 = newSVsv (fh_or_path);
713 819
714 if (SvPOK (fh_or_path)) 820 if (SvPOK (req->sv1))
715 { 821 {
716 req->type = ix; 822 req->type = ix;
717 req->ptr1 = SvPVbyte_nolen (req->sv1); 823 req->ptr1 = SvPVbyte_nolen (req->sv1);
718 } 824 }
719 else 825 else
733 839
734 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 840 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 841 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
736 req->sv1 = newSVsv (fh_or_path); 842 req->sv1 = newSVsv (fh_or_path);
737 843
738 if (SvPOK (fh_or_path)) 844 if (SvPOK (req->sv1))
739 { 845 {
740 req->type = EIO_UTIME; 846 req->type = EIO_UTIME;
741 req->ptr1 = SvPVbyte_nolen (req->sv1); 847 req->ptr1 = SvPVbyte_nolen (req->sv1);
742 } 848 }
743 else 849 else
756 dREQ; 862 dREQ;
757 863
758 req->sv1 = newSVsv (fh_or_path); 864 req->sv1 = newSVsv (fh_or_path);
759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 865 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
760 866
761 if (SvPOK (fh_or_path)) 867 if (SvPOK (req->sv1))
762 { 868 {
763 req->type = EIO_TRUNCATE; 869 req->type = EIO_TRUNCATE;
764 req->ptr1 = SvPVbyte_nolen (req->sv1); 870 req->ptr1 = SvPVbyte_nolen (req->sv1);
765 } 871 }
766 else 872 else
774 880
775void 881void
776aio_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)
777 ALIAS: 883 ALIAS:
778 aio_chmod = EIO_CHMOD 884 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR 885 aio_mkdir = EIO_MKDIR
781 PPCODE: 886 PPCODE:
782{ 887{
783 dREQ; 888 dREQ;
784 889
785 req->type = ix;
786 req->int2 = mode; 890 req->int2 = mode;
787 req->sv1 = newSVsv (fh_or_path); 891 req->sv1 = newSVsv (fh_or_path);
788 892
789 if (ix == EIO_FCHMOD) 893 if (SvPOK (req->sv1))
790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 894 {
895 req->type = ix;
896 req->ptr1 = SvPVbyte_nolen (req->sv1);
897 }
791 else 898 else
792 req->ptr1 = SvPVbyte_nolen (req->sv1); 899 {
900 req->type = EIO_FCHMOD;
901 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
902 }
793 903
794 REQ_SEND; 904 REQ_SEND;
795} 905}
796 906
797void 907void
802 912
803 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 913 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
804 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 914 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
805 req->sv1 = newSVsv (fh_or_path); 915 req->sv1 = newSVsv (fh_or_path);
806 916
807 if (SvPOK (fh_or_path)) 917 if (SvPOK (req->sv1))
808 { 918 {
809 req->type = EIO_CHOWN; 919 req->type = EIO_CHOWN;
810 req->ptr1 = SvPVbyte_nolen (req->sv1); 920 req->ptr1 = SvPVbyte_nolen (req->sv1);
811 } 921 }
812 else 922 else
814 req->type = EIO_FCHOWN; 924 req->type = EIO_FCHOWN;
815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 925 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
816 } 926 }
817 927
818 REQ_SEND; 928 REQ_SEND;
929}
930
931void
932aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
933 PPCODE:
934{
935 dREQ;
936
937 req->type = EIO_READDIR;
938 req->sv1 = newSVsv (pathname);
939 req->ptr1 = SvPVbyte_nolen (req->sv1);
940 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
941
942 if (flags & EIO_READDIR_DENTS)
943 req->int1 |= EIO_READDIR_CUSTOM2;
944
945 REQ_SEND;
819} 946}
820 947
821void 948void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 949aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 950 ALIAS:
888{ 1015{
889 dREQ; 1016 dREQ;
890 1017
891 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
892 1019
893 eio_submit (req); 1020 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
895} 1022}
896 1023
897void 1024void
898aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
899 ALIAS: 1026 ALIAS:
910 1037
911int 1038int
912aioreq_pri (int pri = 0) 1039aioreq_pri (int pri = 0)
913 PROTOTYPE: ;$ 1040 PROTOTYPE: ;$
914 CODE: 1041 CODE:
915 RETVAL = next_pri - EIO_PRI_BIAS; 1042 RETVAL = next_pri;
916 if (items > 0) 1043 if (items > 0)
917 { 1044 {
918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1045 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1046 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
920 next_pri = pri + EIO_PRI_BIAS; 1047 next_pri = pri;
921 } 1048 }
922 OUTPUT: 1049 OUTPUT:
923 RETVAL 1050 RETVAL
924 1051
925void 1052void
926aioreq_nice (int nice = 0) 1053aioreq_nice (int nice = 0)
927 CODE: 1054 CODE:
928 nice = next_pri - nice; 1055 nice = next_pri - nice;
929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1056 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1057 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
931 next_pri = nice + EIO_PRI_BIAS; 1058 next_pri = nice;
932 1059
933void 1060void
934flush () 1061flush ()
935 PROTOTYPE: 1062 PROTOTYPE:
936 CODE: 1063 CODE:
951 1078
952int 1079int
953poll_fileno() 1080poll_fileno()
954 PROTOTYPE: 1081 PROTOTYPE:
955 CODE: 1082 CODE:
956 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
957 OUTPUT: 1084 OUTPUT:
958 RETVAL 1085 RETVAL
959 1086
960int 1087int
961poll_cb(...) 1088poll_cb(...)
997 1124
998int 1125int
999nthreads() 1126nthreads()
1000 PROTOTYPE: 1127 PROTOTYPE:
1001 CODE: 1128 CODE:
1002 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1129 RETVAL = eio_nthreads ();
1003 RETVAL = started;
1004 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1005 OUTPUT: 1130 OUTPUT:
1006 RETVAL 1131 RETVAL
1007 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
1008PROTOTYPES: DISABLE 1158PROTOTYPES: DISABLE
1009 1159
1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1160MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1011 1161
1012void 1162void
1014 CODE: 1164 CODE:
1015 eio_cancel (req); 1165 eio_cancel (req);
1016 1166
1017void 1167void
1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1168cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1019 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
1020 SvREFCNT_dec (req->callback); 1178 SvREFCNT_dec (req->callback);
1021 req->callback = newSVsv (callback); 1179 req->callback = SvREFCNT_inc (cb_cv);
1180 }
1181}
1022 1182
1023MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1183MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1024 1184
1025void 1185void
1026add (aio_req grp, ...) 1186add (aio_req grp, ...)
1058 AV *av; 1218 AV *av;
1059 1219
1060 grp->errorno = errno; 1220 grp->errorno = errno;
1061 1221
1062 av = newAV (); 1222 av = newAV ();
1223 av_extend (av, items - 1);
1063 1224
1064 for (i = 1; i < items; ++i ) 1225 for (i = 1; i < items; ++i )
1065 av_push (av, newSVsv (ST (i))); 1226 av_push (av, newSVsv (ST (i)));
1066 1227
1067 SvREFCNT_dec (grp->sv1); 1228 SvREFCNT_dec (grp->sv1);
1081void 1242void
1082feed (aio_req grp, SV *callback=&PL_sv_undef) 1243feed (aio_req grp, SV *callback=&PL_sv_undef)
1083 CODE: 1244 CODE:
1084{ 1245{
1085 SvREFCNT_dec (grp->sv2); 1246 SvREFCNT_dec (grp->sv2);
1086 grp->sv2 = newSVsv (callback); 1247 grp->sv2 = newSVsv (callback);
1248 grp->feed = aio_grp_feed;
1087 1249
1088 if (grp->int2 <= 0) 1250 if (grp->int2 <= 0)
1089 grp->int2 = 2; 1251 grp->int2 = 2;
1090 1252
1091 eio_grp_limit (grp, grp->int2); 1253 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines