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.165 by root, Sun May 9 20:42:55 2010 UTC vs.
Revision 1.169 by root, Wed Aug 4 16:06:54 2010 UTC

… …
140#endif 140#endif
141#ifndef POSIX_FADV_DONTNEED 141#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0 142# define POSIX_FADV_DONTNEED 0
143#endif 143#endif
144 144
145#ifndef POSIX_MADV_NORMAL
146# define POSIX_MADV_NORMAL 0
147# define NO_MADVISE 1
148#endif
149#ifndef POSIX_MADV_SEQUENTIAL
150# define POSIX_MADV_SEQUENTIAL 0
151#endif
152#ifndef POSIX_MADV_RANDOM
153# define POSIX_MADV_RANDOM 0
154#endif
155#ifndef POSIX_MADV_WILLNEED
156# define POSIX_MADV_WILLNEED 0
157#endif
158#ifndef POSIX_MADV_DONTNEED
159# define POSIX_MADV_DONTNEED 0
160#endif
161
145#ifndef ST_NODEV 162#ifndef ST_NODEV
146# define ST_NODEV 0 163# define ST_NODEV 0
147#endif 164#endif
148#ifndef ST_NOEXEC 165#ifndef ST_NOEXEC
149# define ST_NOEXEC 0 166# define ST_NOEXEC 0
… …
304 } 321 }
305} 322}
306 323
307static int req_invoke (eio_req *req) 324static int req_invoke (eio_req *req)
308{ 325{
309 dSP;
310
311 if (req->flags & FLAG_SV2_RO_OFF) 326 if (req->flags & FLAG_SV2_RO_OFF)
312 SvREADONLY_off (req->sv2); 327 SvREADONLY_off (req->sv2);
313 328
314 if (!EIO_CANCELLED (req) && req->callback) 329 if (!EIO_CANCELLED (req) && req->callback)
315 { 330 {
331 dSP;
316 static SV *sv_result_cache; /* caches the result integer SV */ 332 static SV *sv_result_cache; /* caches the result integer SV */
317 SV *sv_result; 333 SV *sv_result;
318 334
319 ENTER; 335 ENTER;
320 SAVETMPS; 336 SAVETMPS;
… …
497 SvSETMAGIC (req->sv2); 513 SvSETMAGIC (req->sv2);
498 PUSHs (sv_result); 514 PUSHs (sv_result);
499 } 515 }
500 break; 516 break;
501 517
502 case EIO_DUP2: 518 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
503 if (req->result > 0) 519 if (req->result > 0)
504 SvIV_set (sv_result, 0); 520 SvIV_set (sv_result, 0);
505 /* FALLTHROUGH */ 521 /* FALLTHROUGH */
506 522
507 default: 523 default:
… …
621 errno = old_errno; 637 errno = old_errno;
622 638
623 mg->mg_obj = 0; /* just in case */ 639 mg->mg_obj = 0; /* just in case */
624 640
625 SvREADONLY_off (sv); 641 SvREADONLY_off (sv);
642
643 if (SvPVX (sv) != mg->mg_ptr)
644 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
645
626 SvCUR_set (sv, 0); 646 SvCUR_set (sv, 0);
627 SvLEN_set (sv, 0);
628 SvPVX (sv) = 0; 647 SvPVX (sv) = 0;
629 SvOK_off (sv); 648 SvOK_off (sv);
630 649
631 return 0; 650 return 0;
632} 651}
… …
697 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 716 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
698 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 717 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
699 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 718 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
700 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED) 719 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
701 720
721 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
722 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
723 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
724 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
725 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
726
702 const_iv (ST_RDONLY) 727 const_iv (ST_RDONLY)
703 const_iv (ST_NOSUID) 728 const_iv (ST_NOSUID)
704 const_iv (ST_NODEV) 729 const_iv (ST_NODEV)
705 const_iv (ST_NOEXEC) 730 const_iv (ST_NOEXEC)
706 const_iv (ST_SYNCHRONOUS) 731 const_iv (ST_SYNCHRONOUS)
… …
1387 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1412 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1388 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1413 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1389 if (addr == (void *)-1) 1414 if (addr == (void *)-1)
1390 XSRETURN_NO; 1415 XSRETURN_NO;
1391 1416
1417 sv_force_normal (scalar);
1418
1392 /* we store the length in mg_obj, as namlen is I32 :/ */ 1419 /* we store the length in mg_obj, as namlen is I32 :/ */
1393 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0) 1420 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1394 ->mg_obj = (SV *)length; 1421 ->mg_obj = (SV *)length;
1395 1422
1396 SvUPGRADE (scalar, SVt_PV); /* nop... */ 1423 SvUPGRADE (scalar, SVt_PV); /* nop... */
1424
1397 if (!(prot & PROT_WRITE)) 1425 if (!(prot & PROT_WRITE))
1398 SvREADONLY_on (scalar); 1426 SvREADONLY_on (scalar);
1427
1428 if (SvLEN (scalar))
1429 Safefree (SvPVX (scalar));
1399 1430
1400 SvPVX (scalar) = (char *)addr; 1431 SvPVX (scalar) = (char *)addr;
1401 SvCUR_set (scalar, length); 1432 SvCUR_set (scalar, length);
1402 SvLEN_set (scalar, 0); 1433 SvLEN_set (scalar, 0);
1403 SvPOK_only (scalar); 1434 SvPOK_only (scalar);
… …
1408void 1439void
1409munmap (SV *scalar) 1440munmap (SV *scalar)
1410 PROTOTYPE: $ 1441 PROTOTYPE: $
1411 CODE: 1442 CODE:
1412 sv_unmagic (scalar, MMAP_MAGIC); 1443 sv_unmagic (scalar, MMAP_MAGIC);
1444
1445int
1446madvise (SV *scalar, off_t offset, off_t length, IV advice)
1447 PROTOTYPE: $$$$
1448 CODE:
1449{
1450 char *addr = SvPV_nolen (scalar) + offset;
1451
1452 if (!SvOK (ST (2)))
1453 length = SvCUR (scalar) - offset;
1454
1455 if (addr >= SvEND (scalar) || length <= 0)
1456 XSRETURN_EMPTY;
1457
1458 #if _XOPEN_SOURCE >= 600 && !NO_MADVISE
1459 RETVAL = posix_madvise (addr, length, advice);
1460 #else
1461 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1462 #endif
1463}
1464 OUTPUT:
1465 RETVAL
1413 1466
1414int 1467int
1415mlockall (int flags) 1468mlockall (int flags)
1416 PROTOTYPE: $ 1469 PROTOTYPE: $
1417 CODE: 1470 CODE:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines