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.31 by root, Thu Aug 18 16:34:53 2005 UTC vs.
Revision 1.35 by root, Tue Aug 23 01:16:50 2005 UTC

… …
4#include "EXTERN.h" 4#include "EXTERN.h"
5#include "perl.h" 5#include "perl.h"
6#include "XSUB.h" 6#include "XSUB.h"
7 7
8#include "autoconf/config.h" 8#include "autoconf/config.h"
9
10#include <pthread.h>
9 11
10#include <sys/types.h> 12#include <sys/types.h>
11#include <sys/stat.h> 13#include <sys/stat.h>
12 14
13#include <unistd.h> 15#include <unistd.h>
14#include <fcntl.h> 16#include <fcntl.h>
15#include <signal.h> 17#include <signal.h>
16#include <sched.h> 18#include <sched.h>
17 19
18#include <pthread.h> 20#if HAVE_SENDFILE
19 21# if __linux
20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 22# include <sys/sendfile.h>
21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 23# elif __freebsd
22typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 24# include <sys/socket.h>
25# include <sys/uio.h>
26# elif __hpux
27# include <sys/socket.h>
28# elif __solaris /* not yet */
29# include <sys/sendfile.h>
30# else
31# error sendfile support requested but not available
32# endif
33#endif
23 34
24#if __ia64 35#if __ia64
25# define STACKSIZE 65536 36# define STACKSIZE 65536
26#else 37#else
27# define STACKSIZE 4096 38# define STACKSIZE 4096
… …
29 40
30enum { 41enum {
31 REQ_QUIT, 42 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 43 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 44 REQ_READ, REQ_WRITE, REQ_READAHEAD,
45 REQ_SENDFILE,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 46 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 47 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR, 48 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK, 49 REQ_SYMLINK,
38}; 50};
… …
40typedef struct aio_cb { 52typedef struct aio_cb {
41 struct aio_cb *volatile next; 53 struct aio_cb *volatile next;
42 54
43 int type; 55 int type;
44 56
45 int fd; 57 int fd, fd2;
46 off_t offset; 58 off_t offset;
47 size_t length; 59 size_t length;
48 ssize_t result; 60 ssize_t result;
49 mode_t mode; /* open */ 61 mode_t mode; /* open */
50 int errorno; 62 int errorno;
51 SV *data, *callback, *fh; 63 SV *data, *callback;
64 SV *fh, *fh2;
52 void *dataptr, *data2ptr; 65 void *dataptr, *data2ptr;
53 STRLEN dataoffset; 66 STRLEN dataoffset;
54 67
55 Stat_t *statdata; 68 Stat_t *statdata;
56} aio_cb; 69} aio_cb;
… …
74 if (req->data) 87 if (req->data)
75 SvREFCNT_dec (req->data); 88 SvREFCNT_dec (req->data);
76 89
77 if (req->fh) 90 if (req->fh)
78 SvREFCNT_dec (req->fh); 91 SvREFCNT_dec (req->fh);
92
93 if (req->fh2)
94 SvREFCNT_dec (req->fh2);
79 95
80 if (req->statdata) 96 if (req->statdata)
81 Safefree (req->statdata); 97 Safefree (req->statdata);
82 98
83 if (req->callback) 99 if (req->callback)
… …
344 create_pipe (); 360 create_pipe ();
345 361
346 atfork_parent (); 362 atfork_parent ();
347} 363}
348 364
365/* currently noops */
366#define LOCK_FD(fd) do { } while (0)
367#define UNLOCK_FD(fd) do { } while (0)
368
349/*****************************************************************************/ 369/*****************************************************************************/
350/* work around various missing functions */ 370/* work around various missing functions */
351 371
352#if !HAVE_PREADWRITE 372#if !HAVE_PREADWRITE
353# define pread aio_pread 373# define pread aio_pread
… …
364pread (int fd, void *buf, size_t count, off_t offset) 384pread (int fd, void *buf, size_t count, off_t offset)
365{ 385{
366 ssize_t res; 386 ssize_t res;
367 off_t ooffset; 387 off_t ooffset;
368 388
369 pthread_mutex_lock (&iolock); 389 LOCK_FD (fd);
390 pthread_mutex_lock (&iolock); /* replace by LOCK_FD and private buffer */
370 ooffset = lseek (fd, 0, SEEK_CUR); 391 ooffset = lseek (fd, 0, SEEK_CUR);
371 lseek (fd, offset, SEEK_SET); 392 lseek (fd, offset, SEEK_SET);
372 res = read (fd, buf, count); 393 res = read (fd, buf, count);
373 lseek (fd, ooffset, SEEK_SET); 394 lseek (fd, ooffset, SEEK_SET);
374 pthread_mutex_unlock (&iolock); 395 pthread_mutex_unlock (&iolock);
396 UNLOCK_FD (d);
375 397
376 return res; 398 return res;
377} 399}
378 400
379static ssize_t 401static ssize_t
380pwrite (int fd, void *buf, size_t count, off_t offset) 402pwrite (int fd, void *buf, size_t count, off_t offset)
381{ 403{
382 ssize_t res; 404 ssize_t res;
383 off_t ooffset; 405 off_t ooffset;
384 406
385 pthread_mutex_lock (&iolock); 407 LOCK_FD (fd);
408 pthread_mutex_lock (&iolock); /* replace by LOCK_FD and private buffer */
386 ooffset = lseek (fd, 0, SEEK_CUR); 409 ooffset = lseek (fd, 0, SEEK_CUR);
387 lseek (fd, offset, SEEK_SET); 410 lseek (fd, offset, SEEK_SET);
388 res = write (fd, buf, count); 411 res = write (fd, buf, count);
389 lseek (fd, offset, SEEK_SET); 412 lseek (fd, offset, SEEK_SET);
390 pthread_mutex_unlock (&iolock); 413 pthread_mutex_unlock (&iolock);
414 UNLOCK_FD (d);
391 415
392 return res; 416 return res;
393} 417}
394#endif 418#endif
395 419
… …
415 } 439 }
416 440
417 errno = 0; 441 errno = 0;
418} 442}
419#endif 443#endif
444
445/* sendfile always needs emulation */
446static ssize_t
447sendfile_ (int ofd, int ifd, off_t offset, size_t count)
448{
449 ssize_t res;
450
451 if (!count)
452 return 0;
453
454 LOCK_FD (ofd);
455
456#if HAVE_SENDFILE
457# if __linux
458 res = sendfile (ofd, ifd, &offset, count);
459
460# elif __freebsd
461 /*
462 * Of course, the freebsd sendfile is a dire hack with no thoughts
463 * wasted on making it similar to other I/O functions.
464 */
465 {
466 off_t sbytes;
467 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
468
469 if (res < 0 && sbytes)
470 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
471 res = sbytes;
472 }
473
474# elif __hpux
475 res = sendfile (ofd, ifd, offset, count, 0, 0);
476
477# elif __solaris
478 {
479 struct sendfilevec vec;
480 size_t sbytes;
481
482 vec.sfv_fd = ifd;
483 vec.sfv_flag = 0;
484 vec.sfv_off = offset;
485 vec.sfv_len = count;
486
487 res = sendfilev (ofd, &vec, 1, &sbytes);
488
489 if (res < 0 && sbytes)
490 res = sbytes;
491 }
492
493# else
494 res = -1;
495 errno = ENOSYS;
496# endif
497#endif
498
499 if (res < 0
500 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
501#if __solaris
502 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
503#endif
504 )
505 )
506 {
507 /* emulate sendfile. this is a major pain in the ass */
508 char *buf = malloc (4096);
509 res = 0;
510
511 for (;;)
512 {
513 ssize_t cnt;
514
515 cnt = pread (ifd, buf, 4096, offset);
516
517 if (cnt <= 0)
518 {
519 if (cnt && !res) res = -1;
520 break;
521 }
522
523 cnt = write (ofd, buf, cnt);
524
525 if (cnt <= 0)
526 {
527 if (cnt && !res) res = -1;
528 break;
529 }
530
531 offset += cnt;
532 res += cnt;
533 }
534
535 {
536 int errorno = errno;
537 free (buf);
538 errno = errorno;
539 }
540 }
541
542 UNLOCK_FD (ofd);
543
544 return res;
545}
420 546
421/*****************************************************************************/ 547/*****************************************************************************/
422 548
423static void * 549static void *
424aio_proc (void *thr_arg) 550aio_proc (void *thr_arg)
… …
456 { 582 {
457 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 583 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
458 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 584 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
459 585
460 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 586 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
587 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
461 588
462 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 589 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
463 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 590 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
464 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 591 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
465 592
… …
588 715
589void 716void
590aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 717aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
591 SV * fh 718 SV * fh
592 UV offset 719 UV offset
593 IV length 720 UV length
594 SV * data 721 SV * data
595 IV dataoffset 722 UV dataoffset
596 SV * callback 723 SV * callback
597 ALIAS: 724 ALIAS:
598 aio_read = REQ_READ 725 aio_read = REQ_READ
599 aio_write = REQ_WRITE 726 aio_write = REQ_WRITE
600 PROTOTYPE: $$$$$;$ 727 PROTOTYPE: $$$$$;$
… …
646 req->data2ptr = (void *)data; 773 req->data2ptr = (void *)data;
647 } 774 }
648 775
649 send_req (req); 776 send_req (req);
650 } 777 }
778}
779
780void
781aio_sendfile(out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
782 SV * out_fh
783 SV * in_fh
784 UV in_offset
785 UV length
786 SV * callback
787 PROTOTYPE: $$$$;$
788 CODE:
789{
790 dREQ;
791
792 req->type = REQ_SENDFILE;
793 req->fh = newSVsv (out_fh);
794 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
795 req->fh2 = newSVsv (in_fh);
796 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
797 req->offset = in_offset;
798 req->length = length;
799
800 send_req (req);
651} 801}
652 802
653void 803void
654aio_readahead(fh,offset,length,callback=&PL_sv_undef) 804aio_readahead(fh,offset,length,callback=&PL_sv_undef)
655 SV * fh 805 SV * fh

Diff Legend

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