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.166 by root, Sun May 9 20:43:28 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
… …
496 SvSETMAGIC (req->sv2); 513 SvSETMAGIC (req->sv2);
497 PUSHs (sv_result); 514 PUSHs (sv_result);
498 } 515 }
499 break; 516 break;
500 517
501 case EIO_DUP2: 518 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
502 if (req->result > 0) 519 if (req->result > 0)
503 SvIV_set (sv_result, 0); 520 SvIV_set (sv_result, 0);
504 /* FALLTHROUGH */ 521 /* FALLTHROUGH */
505 522
506 default: 523 default:
… …
620 errno = old_errno; 637 errno = old_errno;
621 638
622 mg->mg_obj = 0; /* just in case */ 639 mg->mg_obj = 0; /* just in case */
623 640
624 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
625 SvCUR_set (sv, 0); 646 SvCUR_set (sv, 0);
626 SvLEN_set (sv, 0);
627 SvPVX (sv) = 0; 647 SvPVX (sv) = 0;
628 SvOK_off (sv); 648 SvOK_off (sv);
629 649
630 return 0; 650 return 0;
631} 651}
… …
696 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 716 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
697 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 717 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
698 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 718 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
699 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED) 719 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
700 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
701 const_iv (ST_RDONLY) 727 const_iv (ST_RDONLY)
702 const_iv (ST_NOSUID) 728 const_iv (ST_NOSUID)
703 const_iv (ST_NODEV) 729 const_iv (ST_NODEV)
704 const_iv (ST_NOEXEC) 730 const_iv (ST_NOEXEC)
705 const_iv (ST_SYNCHRONOUS) 731 const_iv (ST_SYNCHRONOUS)
… …
1386 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;
1387 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1413 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1388 if (addr == (void *)-1) 1414 if (addr == (void *)-1)
1389 XSRETURN_NO; 1415 XSRETURN_NO;
1390 1416
1417 sv_force_normal (scalar);
1418
1391 /* we store the length in mg_obj, as namlen is I32 :/ */ 1419 /* we store the length in mg_obj, as namlen is I32 :/ */
1392 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0) 1420 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1393 ->mg_obj = (SV *)length; 1421 ->mg_obj = (SV *)length;
1394 1422
1395 SvUPGRADE (scalar, SVt_PV); /* nop... */ 1423 SvUPGRADE (scalar, SVt_PV); /* nop... */
1424
1396 if (!(prot & PROT_WRITE)) 1425 if (!(prot & PROT_WRITE))
1397 SvREADONLY_on (scalar); 1426 SvREADONLY_on (scalar);
1427
1428 if (SvLEN (scalar))
1429 Safefree (SvPVX (scalar));
1398 1430
1399 SvPVX (scalar) = (char *)addr; 1431 SvPVX (scalar) = (char *)addr;
1400 SvCUR_set (scalar, length); 1432 SvCUR_set (scalar, length);
1401 SvLEN_set (scalar, 0); 1433 SvLEN_set (scalar, 0);
1402 SvPOK_only (scalar); 1434 SvPOK_only (scalar);
… …
1407void 1439void
1408munmap (SV *scalar) 1440munmap (SV *scalar)
1409 PROTOTYPE: $ 1441 PROTOTYPE: $
1410 CODE: 1442 CODE:
1411 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
1412 1466
1413int 1467int
1414mlockall (int flags) 1468mlockall (int flags)
1415 PROTOTYPE: $ 1469 PROTOTYPE: $
1416 CODE: 1470 CODE:

Diff Legend

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