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.119 by root, Sun May 11 19:11:05 2008 UTC vs.
Revision 1.127 by root, Tue Sep 30 13:17:32 2008 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
84 103
85#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
86 SV *callback; \ 105 SV *callback; \
87 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 107 STRLEN stroffset; \
89 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
90 111
91#include "libeio/eio.h" 112#include "libeio/eio.h"
92 113
93static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
… …
105 126
106typedef eio_req *aio_req; 127typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 128typedef eio_req *aio_req_ornot;
108 129
109static SV *on_next_submit; 130static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 131static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 132static int max_outstanding;
112 133
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 134static int respipe_osf [2], respipe [2] = { -1, -1 };
114 135
115static void req_destroy (aio_req req); 136static void req_destroy (aio_req req);
… …
173 194
174static void req_submit (eio_req *req) 195static void req_submit (eio_req *req)
175{ 196{
176 eio_submit (req); 197 eio_submit (req);
177 198
178 if (on_next_submit) 199 if (expect_false (on_next_submit))
179 { 200 {
180 dSP; 201 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 202 SV *cb = sv_2mortal (on_next_submit);
182 203
183 on_next_submit = 0; 204 on_next_submit = 0;
… …
410 X_UNLOCK (reslock); 431 X_UNLOCK (reslock);
411 432
412 if (size) 433 if (size)
413 return; 434 return;
414 435
415 maybe_start_thread (); 436 etp_maybe_start_thread ();
416 437
417 FD_ZERO (&rfd); 438 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 439 FD_SET (respipe [0], &rfd);
419 440
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 442 }
422} 443}
423 444
424static int poll_cb (void) 445static int poll_cb (void)
425{ 446{
426 int res; 447 for (;;)
427
428 do
429 { 448 {
430 res = eio_poll (); 449 int res = eio_poll ();
431 450
432 if (res > 0) 451 if (res > 0)
433 croak (0); 452 croak (0);
453
454 if (!max_outstanding || max_outstanding > eio_nreqs ())
455 return res;
456
457 poll_wait ();
434 } 458 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 459}
439 460
440static void atfork_child (void) 461static void atfork_child (void)
441{ 462{
442 create_respipe (); 463 create_respipe ();
443} 464}
444 465
445#define dREQ \ 466#define dREQ \
446 aio_req req; \ 467 aio_req req; \
447 int req_pri = next_pri; \ 468 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 469 next_pri = EIO_PRI_DEFAULT; \
449 \ 470 \
450 if (SvOK (callback) && !SvROK (callback)) \ 471 if (SvOK (callback) && !SvROK (callback)) \
451 croak ("callback must be undef or of reference type"); \ 472 croak ("callback must be undef or of reference type"); \
452 \ 473 \
453 Newz (0, req, 1, eio_req); \ 474 Newz (0, req, 1, eio_req); \
… …
456 \ 477 \
457 req->callback = newSVsv (callback); \ 478 req->callback = newSVsv (callback); \
458 req->pri = req_pri 479 req->pri = req_pri
459 480
460#define REQ_SEND \ 481#define REQ_SEND \
482 PUTBACK; \
461 req_submit (req); \ 483 req_submit (req); \
484 SPAGAIN; \
462 \ 485 \
463 if (GIMME_V != G_VOID) \ 486 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 487 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 488
466MODULE = IO::AIO PACKAGE = IO::AIO 489MODULE = IO::AIO PACKAGE = IO::AIO
… …
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 497 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 498 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 499 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 500 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 501 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
479#ifdef _WIN32 502#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock);
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 503 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#endif 504#endif
491 505
492 create_respipe (); 506 create_respipe ();
493 507
… …
787 req->int2 = mode; 801 req->int2 = mode;
788 req->sv1 = newSVsv (fh_or_path); 802 req->sv1 = newSVsv (fh_or_path);
789 803
790 if (SvPOK (req->sv1)) 804 if (SvPOK (req->sv1))
791 { 805 {
806 req->type = ix;
807 req->ptr1 = SvPVbyte_nolen (req->sv1);
808 }
809 else
810 {
792 req->type = EIO_FCHMOD; 811 req->type = EIO_FCHMOD;
793 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 812 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
794 }
795 else
796 {
797 req->type = ix;
798 req->ptr1 = SvPVbyte_nolen (req->sv1);
799 } 813 }
800 814
801 REQ_SEND; 815 REQ_SEND;
802} 816}
803 817
… …
895{ 909{
896 dREQ; 910 dREQ;
897 911
898 req->type = EIO_GROUP; 912 req->type = EIO_GROUP;
899 913
900 eio_submit (req); 914 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 915 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 916}
903 917
904void 918void
905aio_nop (SV *callback=&PL_sv_undef) 919aio_nop (SV *callback=&PL_sv_undef)
… …
917 931
918int 932int
919aioreq_pri (int pri = 0) 933aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 934 PROTOTYPE: ;$
921 CODE: 935 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 936 RETVAL = next_pri;
923 if (items > 0) 937 if (items > 0)
924 { 938 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 939 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 940 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 941 next_pri = pri;
928 } 942 }
929 OUTPUT: 943 OUTPUT:
930 RETVAL 944 RETVAL
931 945
932void 946void
933aioreq_nice (int nice = 0) 947aioreq_nice (int nice = 0)
934 CODE: 948 CODE:
935 nice = next_pri - nice; 949 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 950 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 951 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 952 next_pri = nice;
939 953
940void 954void
941flush () 955flush ()
942 PROTOTYPE: 956 PROTOTYPE:
943 CODE: 957 CODE:
… …
1004 1018
1005int 1019int
1006nthreads() 1020nthreads()
1007 PROTOTYPE: 1021 PROTOTYPE:
1008 CODE: 1022 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1023 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1024 OUTPUT:
1013 RETVAL 1025 RETVAL
1014 1026
1015void _on_next_submit (SV *cb) 1027void _on_next_submit (SV *cb)
1016 CODE: 1028 CODE:

Diff Legend

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