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.171 by root, Wed Aug 4 17:16:19 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#if _XOPEN_SOURCE < 600 || NO_FADVISE
146# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
147#endif
148
149#ifndef POSIX_MADV_NORMAL
150# define POSIX_MADV_NORMAL 0
151# define NO_MADVISE 1
152#endif
153#ifndef POSIX_MADV_SEQUENTIAL
154# define POSIX_MADV_SEQUENTIAL 0
155#endif
156#ifndef POSIX_MADV_RANDOM
157# define POSIX_MADV_RANDOM 0
158#endif
159#ifndef POSIX_MADV_WILLNEED
160# define POSIX_MADV_WILLNEED 0
161#endif
162#ifndef POSIX_MADV_DONTNEED
163# define POSIX_MADV_DONTNEED 0
164#endif
165
166#if _XOPEN_SOURCE < 600 || NO_MADVISE
167# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
168#endif
169
170#ifndef PROT_NONE
171# define PROT_NONE 0
172#endif
173#ifndef PROT_READ
174# define PROT_READ 0
175#endif
176#ifndef PROT_WRITE
177# define PROT_READ 0
178#endif
179#ifndef PROT_EXEC
180# define PROT_EXEC 0
181#endif
182
145#ifndef ST_NODEV 183#ifndef ST_NODEV
146# define ST_NODEV 0 184# define ST_NODEV 0
147#endif 185#endif
148#ifndef ST_NOEXEC 186#ifndef ST_NOEXEC
149# define ST_NOEXEC 0 187# define ST_NOEXEC 0
… …
304 } 342 }
305} 343}
306 344
307static int req_invoke (eio_req *req) 345static int req_invoke (eio_req *req)
308{ 346{
309 dSP;
310
311 if (req->flags & FLAG_SV2_RO_OFF) 347 if (req->flags & FLAG_SV2_RO_OFF)
312 SvREADONLY_off (req->sv2); 348 SvREADONLY_off (req->sv2);
313 349
314 if (!EIO_CANCELLED (req) && req->callback) 350 if (!EIO_CANCELLED (req) && req->callback)
315 { 351 {
352 dSP;
316 static SV *sv_result_cache; /* caches the result integer SV */ 353 static SV *sv_result_cache; /* caches the result integer SV */
317 SV *sv_result; 354 SV *sv_result;
318 355
319 ENTER; 356 ENTER;
320 SAVETMPS; 357 SAVETMPS;
… …
497 SvSETMAGIC (req->sv2); 534 SvSETMAGIC (req->sv2);
498 PUSHs (sv_result); 535 PUSHs (sv_result);
499 } 536 }
500 break; 537 break;
501 538
502 case EIO_DUP2: 539 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */
503 if (req->result > 0) 540 if (req->result > 0)
504 SvIV_set (sv_result, 0); 541 SvIV_set (sv_result, 0);
505 /* FALLTHROUGH */ 542 /* FALLTHROUGH */
506 543
507 default: 544 default:
… …
607/*****************************************************************************/ 644/*****************************************************************************/
608 645
609#if !_POSIX_MAPPED_FILES 646#if !_POSIX_MAPPED_FILES
610# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 647# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
611# define munmap(addr,length) (errno = ENOSYS, -1) 648# define munmap(addr,length) (errno = ENOSYS, -1)
649# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
612#endif 650#endif
613 651
614#define MMAP_MAGIC PERL_MAGIC_ext 652#define MMAP_MAGIC PERL_MAGIC_ext
615 653
616static int 654static int
… …
621 errno = old_errno; 659 errno = old_errno;
622 660
623 mg->mg_obj = 0; /* just in case */ 661 mg->mg_obj = 0; /* just in case */
624 662
625 SvREADONLY_off (sv); 663 SvREADONLY_off (sv);
664
665 if (SvPVX (sv) != mg->mg_ptr)
666 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
667
626 SvCUR_set (sv, 0); 668 SvCUR_set (sv, 0);
627 SvLEN_set (sv, 0);
628 SvPVX (sv) = 0; 669 SvPVX (sv) = 0;
629 SvOK_off (sv); 670 SvOK_off (sv);
630 671
631 return 0; 672 return 0;
632} 673}
… …
697 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 738 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
698 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 739 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
699 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 740 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
700 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED) 741 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
701 742
743 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
744 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
745 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
746 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
747 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
748
702 const_iv (ST_RDONLY) 749 const_iv (ST_RDONLY)
703 const_iv (ST_NOSUID) 750 const_iv (ST_NOSUID)
704 const_iv (ST_NODEV) 751 const_iv (ST_NODEV)
705 const_iv (ST_NOEXEC) 752 const_iv (ST_NOEXEC)
706 const_iv (ST_SYNCHRONOUS) 753 const_iv (ST_SYNCHRONOUS)
… …
710 const_iv (ST_IMMUTABLE) 757 const_iv (ST_IMMUTABLE)
711 const_iv (ST_NOATIME) 758 const_iv (ST_NOATIME)
712 const_iv (ST_NODIRATIME) 759 const_iv (ST_NODIRATIME)
713 const_iv (ST_RELATIME) 760 const_iv (ST_RELATIME)
714 761
762 const_iv (PROT_NONE)
715 const_iv (PROT_EXEC) 763 const_iv (PROT_EXEC)
716 const_iv (PROT_NONE)
717 const_iv (PROT_READ) 764 const_iv (PROT_READ)
718 const_iv (PROT_WRITE) 765 const_iv (PROT_WRITE)
719 766
720 /*const_iv (MAP_FIXED)*/ 767 /*const_iv (MAP_FIXED)*/
721 const_iv (MAP_PRIVATE) 768 const_iv (MAP_PRIVATE)
… …
1360 1407
1361int 1408int
1362fadvise (aio_rfd fh, off_t offset, off_t length, IV advice) 1409fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1363 PROTOTYPE: $$$$ 1410 PROTOTYPE: $$$$
1364 CODE: 1411 CODE:
1365#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1366 RETVAL = posix_fadvise (fh, offset, length, advice); 1412 RETVAL = posix_fadvise (fh, offset, length, advice);
1367#else
1368 RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1369#endif
1370 OUTPUT: 1413 OUTPUT:
1371 RETVAL 1414 RETVAL
1372 1415
1373ssize_t 1416ssize_t
1374sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1417sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
… …
1387 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1430 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1388 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1431 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1389 if (addr == (void *)-1) 1432 if (addr == (void *)-1)
1390 XSRETURN_NO; 1433 XSRETURN_NO;
1391 1434
1435 sv_force_normal (scalar);
1436
1392 /* we store the length in mg_obj, as namlen is I32 :/ */ 1437 /* we store the length in mg_obj, as namlen is I32 :/ */
1393 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0) 1438 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1394 ->mg_obj = (SV *)length; 1439 ->mg_obj = (SV *)length;
1395 1440
1396 SvUPGRADE (scalar, SVt_PV); /* nop... */ 1441 SvUPGRADE (scalar, SVt_PV); /* nop... */
1442
1397 if (!(prot & PROT_WRITE)) 1443 if (!(prot & PROT_WRITE))
1398 SvREADONLY_on (scalar); 1444 SvREADONLY_on (scalar);
1445
1446 if (SvLEN (scalar))
1447 Safefree (SvPVX (scalar));
1399 1448
1400 SvPVX (scalar) = (char *)addr; 1449 SvPVX (scalar) = (char *)addr;
1401 SvCUR_set (scalar, length); 1450 SvCUR_set (scalar, length);
1402 SvLEN_set (scalar, 0); 1451 SvLEN_set (scalar, 0);
1403 SvPOK_only (scalar); 1452 SvPOK_only (scalar);
… …
1408void 1457void
1409munmap (SV *scalar) 1458munmap (SV *scalar)
1410 PROTOTYPE: $ 1459 PROTOTYPE: $
1411 CODE: 1460 CODE:
1412 sv_unmagic (scalar, MMAP_MAGIC); 1461 sv_unmagic (scalar, MMAP_MAGIC);
1462
1463int
1464madvise (SV *scalar, off_t offset, off_t length, IV advice_or_prot)
1465 ALIAS:
1466 mprotect = 1
1467 PROTOTYPE: $$$$
1468 CODE:
1469{
1470 STRLEN cur;
1471 char *addr = SvPVbyte (scalar, cur);
1472
1473 if (offset > cur)
1474 RETVAL = errno = EFAULT;
1475 else
1476 {
1477 if (!SvOK (ST (2)))
1478 length = cur - offset;
1479
1480 if (offset + length > cur)
1481 RETVAL = errno = EFAULT;
1482 else
1483 switch (ix)
1484 {
1485 case 0: RETVAL = posix_madvise (addr + offset, length, advice_or_prot); break;
1486 case 1: RETVAL = mprotect (addr + offset, length, advice_or_prot); break;
1487 }
1488 }
1489}
1490 OUTPUT:
1491 RETVAL
1413 1492
1414int 1493int
1415mlockall (int flags) 1494mlockall (int flags)
1416 PROTOTYPE: $ 1495 PROTOTYPE: $
1417 CODE: 1496 CODE:

Diff Legend

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