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.32 by root, Mon Aug 22 23:20:37 2005 UTC vs.
Revision 1.39 by root, Mon Feb 6 23:54:12 2006 UTC

… …
7 7
8#include "autoconf/config.h" 8#include "autoconf/config.h"
9 9
10#include <pthread.h> 10#include <pthread.h>
11 11
12#include <stddef.h>
12#include <sys/types.h> 13#include <sys/types.h>
13#include <sys/stat.h> 14#include <sys/stat.h>
14 15#include <limits.h>
15#include <unistd.h> 16#include <unistd.h>
16#include <fcntl.h> 17#include <fcntl.h>
17#include <signal.h> 18#include <signal.h>
18#include <sched.h> 19#include <sched.h>
19 20
… …
23# elif __freebsd 24# elif __freebsd
24# include <sys/socket.h> 25# include <sys/socket.h>
25# include <sys/uio.h> 26# include <sys/uio.h>
26# elif __hpux 27# elif __hpux
27# include <sys/socket.h> 28# include <sys/socket.h>
29# elif __solaris /* not yet */
30# include <sys/sendfile.h>
31# else
32# error sendfile support requested but not available
28# endif 33# endif
34#endif
35
36/* used for struct dirent, AIX doesn't provide it */
37#ifndef NAME_MAX
38# define NAME_MAX 4096
29#endif 39#endif
30 40
31#if __ia64 41#if __ia64
32# define STACKSIZE 65536 42# define STACKSIZE 65536
33#else 43#else
34# define STACKSIZE 4096 44# define STACKSIZE 8192
35#endif 45#endif
36 46
37enum { 47enum {
38 REQ_QUIT, 48 REQ_QUIT,
39 REQ_OPEN, REQ_CLOSE, 49 REQ_OPEN, REQ_CLOSE,
40 REQ_READ, REQ_WRITE, REQ_READAHEAD, 50 REQ_READ, REQ_WRITE, REQ_READAHEAD,
41 REQ_SENDFILE, 51 REQ_SENDFILE,
42 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 52 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
43 REQ_FSYNC, REQ_FDATASYNC, 53 REQ_FSYNC, REQ_FDATASYNC,
44 REQ_UNLINK, REQ_RMDIR, 54 REQ_UNLINK, REQ_RMDIR,
55 REQ_READDIR,
45 REQ_SYMLINK, 56 REQ_SYMLINK,
46}; 57};
47 58
48typedef struct aio_cb { 59typedef struct aio_cb {
49 struct aio_cb *volatile next; 60 struct aio_cb *volatile next;
50 61
51 int type; 62 int type;
52 63
64 /* should receive a cleanup, with unions */
53 int fd, fd2; 65 int fd, fd2;
54 off_t offset; 66 off_t offset;
55 size_t length; 67 size_t length;
56 ssize_t result; 68 ssize_t result;
57 mode_t mode; /* open */ 69 mode_t mode; /* open */
… …
93 Safefree (req->statdata); 105 Safefree (req->statdata);
94 106
95 if (req->callback) 107 if (req->callback)
96 SvREFCNT_dec (req->callback); 108 SvREFCNT_dec (req->callback);
97 109
110 if (req->type == REQ_READDIR && req->result >= 0)
111 free (req->data2ptr);
112
98 Safefree (req); 113 Safefree (req);
99} 114}
100 115
101static void 116static void
102poll_wait () 117poll_wait ()
… …
166 PL_statcache = *(req->statdata); 181 PL_statcache = *(req->statdata);
167 } 182 }
168 183
169 ENTER; 184 ENTER;
170 PUSHMARK (SP); 185 PUSHMARK (SP);
171 XPUSHs (sv_2mortal (newSViv (req->result)));
172 186
173 if (req->type == REQ_OPEN) 187 if (req->type == REQ_READDIR)
174 { 188 {
189 SV *rv = &PL_sv_undef;
190
191 if (req->result >= 0)
192 {
193 char *buf = req->data2ptr;
194 AV *av = newAV ();
195
196 while (req->result)
197 {
198 SV *sv = newSVpv (buf, 0);
199
200 av_push (av, sv);
201 buf += SvCUR (sv) + 1;
202 req->result--;
203 }
204
205 rv = sv_2mortal (newRV_noinc ((SV *)av));
206 }
207
208 XPUSHs (rv);
209 }
210 else
211 {
212 XPUSHs (sv_2mortal (newSViv (req->result)));
213
214 if (req->type == REQ_OPEN)
215 {
175 /* convert fd to fh */ 216 /* convert fd to fh */
176 SV *fh; 217 SV *fh;
177 218
178 PUTBACK; 219 PUTBACK;
179 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 220 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
180 SPAGAIN; 221 SPAGAIN;
181 222
182 fh = SvREFCNT_inc (POPs); 223 fh = SvREFCNT_inc (POPs);
183 224
184 PUSHMARK (SP); 225 PUSHMARK (SP);
185 XPUSHs (sv_2mortal (fh)); 226 XPUSHs (sv_2mortal (fh));
227 }
186 } 228 }
187 229
188 if (SvOK (req->callback)) 230 if (SvOK (req->callback))
189 { 231 {
190 PUTBACK; 232 PUTBACK;
… …
313 355
314 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 356 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
315 croak ("cannot set result pipe to nonblocking mode"); 357 croak ("cannot set result pipe to nonblocking mode");
316} 358}
317 359
318static void atfork_prepare (void)
319{
320 pthread_mutex_lock (&reqlock);
321 pthread_mutex_lock (&reslock);
322}
323
324static void atfork_parent (void)
325{
326 pthread_mutex_unlock (&reslock);
327 pthread_mutex_unlock (&reqlock);
328}
329
330static void atfork_child (void)
331{
332 aio_req prv;
333
334 started = 0;
335
336 while (reqs)
337 {
338 prv = reqs;
339 reqs = prv->next;
340 free_req (prv);
341 }
342
343 reqs = reqe = 0;
344
345 while (ress)
346 {
347 prv = ress;
348 ress = prv->next;
349 free_req (prv);
350 }
351
352 ress = rese = 0;
353
354 close (respipe [0]);
355 close (respipe [1]);
356 create_pipe ();
357
358 atfork_parent ();
359}
360
361/*****************************************************************************/ 360/*****************************************************************************/
362/* work around various missing functions */ 361/* work around various missing functions */
363 362
364#if !HAVE_PREADWRITE 363#if !HAVE_PREADWRITE
365# define pread aio_pread 364# define pread aio_pread
… …
368/* 367/*
369 * make our pread/pwrite safe against themselves, but not against 368 * make our pread/pwrite safe against themselves, but not against
370 * normal read/write by using a mutex. slows down execution a lot, 369 * normal read/write by using a mutex. slows down execution a lot,
371 * but that's your problem, not mine. 370 * but that's your problem, not mine.
372 */ 371 */
373static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER; 372static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
374 373
375static ssize_t 374static ssize_t
376pread (int fd, void *buf, size_t count, off_t offset) 375pread (int fd, void *buf, size_t count, off_t offset)
377{ 376{
378 ssize_t res; 377 ssize_t res;
379 off_t ooffset; 378 off_t ooffset;
380 379
381 pthread_mutex_lock (&iolock); 380 pthread_mutex_lock (&preadwritelock);
382 ooffset = lseek (fd, 0, SEEK_CUR); 381 ooffset = lseek (fd, 0, SEEK_CUR);
383 lseek (fd, offset, SEEK_SET); 382 lseek (fd, offset, SEEK_SET);
384 res = read (fd, buf, count); 383 res = read (fd, buf, count);
385 lseek (fd, ooffset, SEEK_SET); 384 lseek (fd, ooffset, SEEK_SET);
386 pthread_mutex_unlock (&iolock); 385 pthread_mutex_unlock (&preadwritelock);
387 386
388 return res; 387 return res;
389} 388}
390 389
391static ssize_t 390static ssize_t
392pwrite (int fd, void *buf, size_t count, off_t offset) 391pwrite (int fd, void *buf, size_t count, off_t offset)
393{ 392{
394 ssize_t res; 393 ssize_t res;
395 off_t ooffset; 394 off_t ooffset;
396 395
397 pthread_mutex_lock (&iolock); 396 pthread_mutex_lock (&preadwritelock);
398 ooffset = lseek (fd, 0, SEEK_CUR); 397 ooffset = lseek (fd, 0, SEEK_CUR);
399 lseek (fd, offset, SEEK_SET); 398 lseek (fd, offset, SEEK_SET);
400 res = write (fd, buf, count); 399 res = write (fd, buf, count);
401 lseek (fd, offset, SEEK_SET); 400 lseek (fd, offset, SEEK_SET);
402 pthread_mutex_unlock (&iolock); 401 pthread_mutex_unlock (&preadwritelock);
403 402
404 return res; 403 return res;
405} 404}
406#endif 405#endif
407 406
… …
410#endif 409#endif
411 410
412#if !HAVE_READAHEAD 411#if !HAVE_READAHEAD
413# define readahead aio_readahead 412# define readahead aio_readahead
414 413
415static char readahead_buf[4096];
416
417static ssize_t 414static ssize_t
418readahead (int fd, off_t offset, size_t count) 415readahead (int fd, off_t offset, size_t count)
419{ 416{
417 char readahead_buf[4096];
418
420 while (count > 0) 419 while (count > 0)
421 { 420 {
422 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 421 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
423 422
424 pread (fd, readahead_buf, len, offset); 423 pread (fd, readahead_buf, len, offset);
… …
428 427
429 errno = 0; 428 errno = 0;
430} 429}
431#endif 430#endif
432 431
432#if !HAVE_READDIR_R
433# define readdir_r aio_readdir_r
434
435static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
436
437static int
438readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
439{
440 struct dirent *e;
441 int errorno;
442
443 pthread_mutex_lock (&readdirlock);
444
445 e = readdir (dirp);
446 errorno = errno;
447
448 if (e)
449 {
450 *res = ent;
451 strcpy (ent->d_name, e->d_name);
452 }
453 else
454 *res = 0;
455
456 pthread_mutex_unlock (&readdirlock);
457
458 errno = errorno;
459 return e ? 0 : -1;
460}
461#endif
462
433/* sendfile always needs emulation */ 463/* sendfile always needs emulation */
434static ssize_t 464static ssize_t
435sendfile_ (int ofd, int ifd, off_t offset, size_t count) 465sendfile_ (int ofd, int ifd, off_t offset, size_t count)
436{ 466{
437 ssize_t res; 467 ssize_t res;
438 468
439 if (!count) 469 if (!count)
440 return 0; 470 return 0;
441 471
472#if HAVE_SENDFILE
442#if __linux 473# if __linux
443 res = sendfile (ofd, ifd, &offset, count); 474 res = sendfile (ofd, ifd, &offset, count);
444 475
445#elif __freebsd 476# elif __freebsd
446 /* 477 /*
447 * Of course, the freebsd sendfile is a dire hack with no thoughts 478 * Of course, the freebsd sendfile is a dire hack with no thoughts
448 * wasted on making it similar to other i/o functions. 479 * wasted on making it similar to other I/O functions.
449 */ 480 */
450 { 481 {
451 off_t sbytes; 482 off_t sbytes;
452 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 483 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
453 484
454 if (!res && errno == EAGAIN) 485 if (res < 0 && sbytes)
486 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
455 res = sbytes; 487 res = sbytes;
456 } 488 }
457 489
458#elif __hpux 490# elif __hpux
459 res = sendfile (ofd, ifd, offset, count, 0, 0); 491 res = sendfile (ofd, ifd, offset, count, 0, 0);
460 492
493# elif __solaris
494 {
495 struct sendfilevec vec;
496 size_t sbytes;
497
498 vec.sfv_fd = ifd;
499 vec.sfv_flag = 0;
500 vec.sfv_off = offset;
501 vec.sfv_len = count;
502
503 res = sendfilev (ofd, &vec, 1, &sbytes);
504
505 if (res < 0 && sbytes)
506 res = sbytes;
507 }
508
509# endif
461#else 510#else
462 res = -1; 511 res = -1;
463 errno = ENOSYS; 512 errno = ENOSYS;
464#endif 513#endif
465 514
515 if (res < 0
466 if (res < 0 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK)) 516 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
517#if __solaris
518 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
519#endif
520 )
521 )
467 { 522 {
468 /* emulate sendfile. this is a major pain in the ass */ 523 /* emulate sendfile. this is a major pain in the ass */
469 char *buf = malloc (4096); 524 char buf[4096];
470 res = 0; 525 res = 0;
471 526
472 for (;;) 527 while (count)
473 { 528 {
474 ssize_t cnt; 529 ssize_t cnt;
475 530
476 cnt = pread (ifd, buf, 4096, offset); 531 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);
477 532
478 if (cnt <= 0) 533 if (cnt <= 0)
479 { 534 {
480 if (cnt && !res) res = -1; 535 if (cnt && !res) res = -1;
481 break; 536 break;
482 } 537 }
483 538
484 cnt = write (ofd, buf, cnt); 539 cnt = write (ofd, buf, cnt);
485 540
486 if (cnt <= 0) 541 if (cnt <= 0)
487 { 542 {
488 if (cnt && !res) res = -1; 543 if (cnt && !res) res = -1;
489 break; 544 break;
490 } 545 }
491 546
492 offset += cnt; 547 offset += cnt;
493 res += cnt; 548 res += cnt;
549 count -= cnt;
494 } 550 }
495
496 {
497 int errorno = errno;
498 free (buf);
499 errno = errorno;
500 }
501 } 551 }
502 552
503 return res; 553 return res;
554}
555
556/* read a full directory */
557static int
558scandir_ (const char *path, void **namesp)
559{
560 DIR *dirp = opendir (path);
561 union
562 {
563 struct dirent d;
564 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
565 } u;
566 struct dirent *entp;
567 char *name, *names;
568 int memlen = 4096;
569 int memofs = 0;
570 int res = 0;
571 int errorno;
572
573 if (!dirp)
574 return -1;
575
576 names = malloc (memlen);
577
578 for (;;)
579 {
580 errno = 0, readdir_r (dirp, &u.d, &entp);
581
582 if (!entp)
583 break;
584
585 name = entp->d_name;
586
587 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
588 {
589 int len = strlen (name) + 1;
590
591 res++;
592
593 while (memofs + len > memlen)
594 {
595 memlen *= 2;
596 names = realloc (names, memlen);
597 if (!names)
598 break;
599 }
600
601 memcpy (names + memofs, name, len);
602 memofs += len;
603 }
604 }
605
606 errorno = errno;
607 closedir (dirp);
608
609 if (errorno)
610 {
611 free (names);
612 errno = errorno;
613 res = -1;
614 }
615
616 *namesp = (void *)names;
617 return res;
504} 618}
505 619
506/*****************************************************************************/ 620/*****************************************************************************/
507 621
508static void * 622static void *
… …
555 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 669 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
556 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 670 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
557 671
558 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 672 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
559 case REQ_FSYNC: req->result = fsync (req->fd); break; 673 case REQ_FSYNC: req->result = fsync (req->fd); break;
674 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
560 675
561 case REQ_QUIT: 676 case REQ_QUIT:
562 break; 677 break;
563 678
564 default: 679 default:
… …
588 pthread_mutex_unlock (&reslock); 703 pthread_mutex_unlock (&reslock);
589 } 704 }
590 while (type != REQ_QUIT); 705 while (type != REQ_QUIT);
591 706
592 return 0; 707 return 0;
708}
709
710/*****************************************************************************/
711
712static void atfork_prepare (void)
713{
714 pthread_mutex_lock (&reqlock);
715 pthread_mutex_lock (&reslock);
716#if !HAVE_PREADWRITE
717 pthread_mutex_lock (&preadwritelock);
718#endif
719#if !HAVE_READDIR_R
720 pthread_mutex_lock (&readdirlock);
721#endif
722}
723
724static void atfork_parent (void)
725{
726#if !HAVE_READDIR_R
727 pthread_mutex_unlock (&readdirlock);
728#endif
729#if !HAVE_PREADWRITE
730 pthread_mutex_unlock (&preadwritelock);
731#endif
732 pthread_mutex_unlock (&reslock);
733 pthread_mutex_unlock (&reqlock);
734}
735
736static void atfork_child (void)
737{
738 aio_req prv;
739
740 started = 0;
741
742 while (reqs)
743 {
744 prv = reqs;
745 reqs = prv->next;
746 free_req (prv);
747 }
748
749 reqs = reqe = 0;
750
751 while (ress)
752 {
753 prv = ress;
754 ress = prv->next;
755 free_req (prv);
756 }
757
758 ress = rese = 0;
759
760 close (respipe [0]);
761 close (respipe [1]);
762 create_pipe ();
763
764 atfork_parent ();
593} 765}
594 766
595#define dREQ \ 767#define dREQ \
596 aio_req req; \ 768 aio_req req; \
597 \ 769 \
… …
848 1020
849 send_req (req); 1021 send_req (req);
850} 1022}
851 1023
852void 1024void
1025aio_readdir(pathname,callback=&PL_sv_undef)
1026 SV * pathname
1027 SV * callback
1028 CODE:
1029{
1030 dREQ;
1031
1032 req->type = REQ_READDIR;
1033 req->data = newSVsv (pathname);
1034 req->dataptr = SvPVbyte_nolen (req->data);
1035
1036 send_req (req);
1037}
1038
1039void
853flush() 1040flush()
854 PROTOTYPE: 1041 PROTOTYPE:
855 CODE: 1042 CODE:
856 while (nreqs) 1043 while (nreqs)
857 { 1044 {

Diff Legend

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