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.106 by root, Mon Sep 24 18:14:00 2007 UTC vs.
Revision 1.109 by root, Sat Oct 6 14:05:19 2007 UTC

… …
97# define SvVAL64 SvIV 97# define SvVAL64 SvIV
98#else 98#else
99# define SvVAL64 SvNV 99# define SvVAL64 SvNV
100#endif 100#endif
101 101
102static HV *stash;
103
102#define dBUF \ 104#define dBUF \
103 char *aio_buf; \ 105 char *aio_buf; \
104 X_LOCK (wrklock); \ 106 X_LOCK (wrklock); \
105 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 107 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
106 X_UNLOCK (wrklock); \ 108 X_UNLOCK (wrklock); \
… …
501 break; 503 break;
502 504
503 case REQ_OPEN: 505 case REQ_OPEN:
504 { 506 {
505 /* convert fd to fh */ 507 /* convert fd to fh */
506 SV *fh; 508 SV *fh = &PL_sv_undef;
507 509
508 PUSHs (sv_2mortal (newSViv (req->result))); 510 if (req->result >= 0)
509 PUTBACK; 511 {
510 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 512 GV *gv = (GV *)sv_newmortal ();
511 SPAGAIN; 513 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
514 char sym [64];
515 int symlen;
516
517 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);
518 gv_init (gv, stash, sym, symlen, 0);
512 519
513 fh = POPs; 520 symlen = snprintf (
514 PUSHMARK (SP); 521 sym,
522 sizeof (sym),
523 "%s&=%d",
524 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
525 req->result
526 );
527
528 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
529 fh = (SV *)gv;
530 }
531
515 XPUSHs (fh); 532 PUSHs (fh);
516 } 533 }
517 break; 534 break;
518 535
519 case REQ_GROUP: 536 case REQ_GROUP:
520 req->int1 = 2; /* mark group as finished */ 537 req->int1 = 2; /* mark group as finished */
… …
564 } 581 }
565 582
566 errno = req->errorno; 583 errno = req->errorno;
567 584
568 PUTBACK; 585 PUTBACK;
569 call_sv (req->callback, G_VOID | G_EVAL); 586 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
570 SPAGAIN; 587 SPAGAIN;
571 588
572 FREETMPS; 589 FREETMPS;
573 LEAVE; 590 LEAVE;
591
592 PUTBACK;
574 } 593 }
575 594
576 if (req->grp) 595 if (req->grp)
577 { 596 {
578 aio_req grp = req->grp; 597 aio_req grp = req->grp;
… …
1421 1440
1422PROTOTYPES: ENABLE 1441PROTOTYPES: ENABLE
1423 1442
1424BOOT: 1443BOOT:
1425{ 1444{
1426 HV *stash = gv_stashpv ("IO::AIO", 1); 1445 stash = gv_stashpv ("IO::AIO", 1);
1427 1446
1428 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1429 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1430 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1431 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
… …
1499 1518
1500 REQ_SEND; 1519 REQ_SEND;
1501} 1520}
1502 1521
1503void 1522void
1504aio_close (SV *fh, SV *callback=&PL_sv_undef) 1523aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1505 PROTOTYPE: $;$ 1524 PROTOTYPE: $;$
1506 ALIAS: 1525 ALIAS:
1507 aio_close = REQ_CLOSE
1508 aio_fsync = REQ_FSYNC 1526 aio_fsync = REQ_FSYNC
1509 aio_fdatasync = REQ_FDATASYNC 1527 aio_fdatasync = REQ_FDATASYNC
1510 PPCODE: 1528 PPCODE:
1511{ 1529{
1512 dREQ; 1530 dREQ;
1513 1531
1514 req->type = ix; 1532 req->type = ix;
1515 req->sv1 = newSVsv (fh); 1533 req->sv1 = newSVsv (fh);
1516 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1534 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1535
1536 REQ_SEND (req);
1537}
1538
1539int
1540_dup (int fd)
1541 PROTOTYPE: $
1542 CODE:
1543 RETVAL = dup (fd);
1544 OUTPUT:
1545 RETVAL
1546
1547void
1548_aio_close (int fd, SV *callback=&PL_sv_undef)
1549 PROTOTYPE: $;$
1550 PPCODE:
1551{
1552 dREQ;
1553
1554 req->type = REQ_CLOSE;
1555 req->int1 = fd;
1517 1556
1518 REQ_SEND (req); 1557 REQ_SEND (req);
1519} 1558}
1520 1559
1521void 1560void

Diff Legend

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