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.151 by root, Tue Jul 14 00:13:36 2009 UTC vs.
Revision 1.159 by root, Thu Jan 7 18:08:21 2010 UTC

… …
11#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h> 12#include <stdlib.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/types.h> 14#include <sys/types.h>
15#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/statvfs.h>
16#include <limits.h> 17#include <limits.h>
17#include <fcntl.h> 18#include <fcntl.h>
18#include <sched.h> 19#include <sched.h>
19 20
20/* perl namespace pollution */ 21/* perl namespace pollution */
… …
99#define expect_false(expr) expect ((expr) != 0, 0) 100#define expect_false(expr) expect ((expr) != 0, 0)
100#define expect_true(expr) expect ((expr) != 0, 1) 101#define expect_true(expr) expect ((expr) != 0, 1)
101 102
102/*****************************************************************************/ 103/*****************************************************************************/
103 104
104static HV *stash;
105typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */ 106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */ 107typedef int aio_wfd; /* write file descriptor */
108 108
109#define AIO_REQ_KLASS "IO::AIO::REQ" 109static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
110#define AIO_GRP_KLASS "IO::AIO::GRP"
111 110
112#define EIO_REQ_MEMBERS \ 111#define EIO_REQ_MEMBERS \
113 SV *callback; \ 112 SV *callback; \
114 SV *sv1, *sv2; \ 113 SV *sv1, *sv2; \
115 STRLEN stroffset; \ 114 STRLEN stroffset; \
… …
142 141
143#ifndef POSIX_FADV_DONTNEED 142#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0 143# define POSIX_FADV_DONTNEED 0
145#endif 144#endif
146 145
146#ifndef ST_NODEV
147# define ST_NODEV 0
148#endif
149
150#ifndef ST_NOEXEC
151# define ST_NOEXEC 0
152#endif
153
154#ifndef ST_SYNCHRONOUS
155# define ST_SYNCHRONOUS 0
156#endif
157
158#ifndef ST_MANDLOCK
159# define ST_MANDLOCK 0
160#endif
161
162#ifndef ST_WRITE
163# define ST_WRITE 0
164#endif
165
166#ifndef ST_APPEND
167# define ST_APPEND 0
168#endif
169
170#ifndef ST_IMMUTABLE
171# define ST_IMMUTABLE 0
172#endif
173
174#ifndef ST_NOATIME
175# define ST_NOATIME 0
176#endif
177
178#ifndef ST_NODIRATIME
179# define ST_NODIRATIME 0
180#endif
181
182#ifndef ST_RELATIME
183# define ST_RELATIME 0
184#endif
185
147static int req_invoke (eio_req *req); 186static int req_invoke (eio_req *req);
148#define EIO_FINISH(req) req_invoke (req) 187#define EIO_FINISH(req) req_invoke (req)
149static void req_destroy (eio_req *grp); 188static void req_destroy (eio_req *grp);
150#define EIO_DESTROY(req) req_destroy (req) 189#define EIO_DESTROY(req) req_destroy (req)
151 190
… …
160 199
161static SV *on_next_submit; 200static SV *on_next_submit;
162static int next_pri = EIO_PRI_DEFAULT; 201static int next_pri = EIO_PRI_DEFAULT;
163static int max_outstanding; 202static int max_outstanding;
164 203
165static int respipe_osf [2], respipe [2] = { -1, -1 }; 204static s_epipe respipe;
166 205
167static void req_destroy (aio_req req); 206static void req_destroy (aio_req req);
168static void req_cancel (aio_req req); 207static void req_cancel (aio_req req);
169 208
170static void want_poll (void) 209static void want_poll (void)
171{ 210{
172 /* write a dummy byte to the pipe so fh becomes ready */ 211 /* write a dummy byte to the pipe so fh becomes ready */
173 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 212 s_epipe_signal (&respipe);
174} 213}
175 214
176static void done_poll (void) 215static void done_poll (void)
177{ 216{
178 /* read any signals sent by the worker threads */ 217 /* read any signals sent by the worker threads */
179 char buf [4]; 218 s_epipe_drain (&respipe);
180 while (respipe_read (respipe [0], buf, 4) == 4)
181 ;
182} 219}
183 220
184/* must be called at most once */ 221/* must be called at most once */
185static SV *req_sv (aio_req req, const char *klass) 222static SV *req_sv (aio_req req, HV *stash)
186{ 223{
187 if (!req->self) 224 if (!req->self)
188 { 225 {
189 req->self = (SV *)newHV (); 226 req->self = (SV *)newHV ();
190 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 227 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
191 } 228 }
192 229
193 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 230 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
194} 231}
195 232
196static aio_req SvAIO_REQ (SV *sv) 233static aio_req SvAIO_REQ (SV *sv)
197{ 234{
198 MAGIC *mg; 235 MAGIC *mg;
199 236
200 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 237 if (!SvROK (sv)
238 || (SvSTASH (SvRV (sv)) != aio_grp_stash
239 && SvSTASH (SvRV (sv)) != aio_req_stash
240 && !sv_derived_from (sv, "IO::AIO::REQ")))
201 croak ("object of class " AIO_REQ_KLASS " expected"); 241 croak ("object of class IO::AIO::REQ expected");
202 242
203 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 243 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
204 244
205 return mg ? (aio_req)mg->mg_ptr : 0; 245 return mg ? (aio_req)mg->mg_ptr : 0;
206} 246}
… …
212 dSP; 252 dSP;
213 253
214 ENTER; 254 ENTER;
215 SAVETMPS; 255 SAVETMPS;
216 PUSHMARK (SP); 256 PUSHMARK (SP);
217 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 257 XPUSHs (req_sv (grp, aio_grp_stash));
218 PUTBACK; 258 PUTBACK;
219 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 259 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
220 SPAGAIN; 260 SPAGAIN;
221 FREETMPS; 261 FREETMPS;
222 LEAVE; 262 LEAVE;
… …
328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 368 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
329 char sym [64]; 369 char sym [64];
330 int symlen; 370 int symlen;
331 371
332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result); 372 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
333 gv_init (gv, stash, sym, symlen, 0); 373 gv_init (gv, aio_stash, sym, symlen, 0);
334 374
335 symlen = snprintf ( 375 symlen = snprintf (
336 sym, 376 sym,
337 sizeof (sym), 377 sizeof (sym),
338 "%s&=%d", 378 "%s&=%d",
… …
344 fh = (SV *)gv; 384 fh = (SV *)gv;
345 } 385 }
346 386
347 PUSHs (fh); 387 PUSHs (fh);
348 } 388 }
389 break;
390
391 case EIO_STATVFS:
392 case EIO_FSTATVFS:
393 {
394 SV *rv = &PL_sv_undef;
395
396 if (req->result >= 0)
397 {
398 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
399 HV *hv = newHV ();
400
401 rv = sv_2mortal (newRV_noinc (hv));
402
403 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
404 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
405 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
406 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
407 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
408 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
409 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
410 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
411 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
412 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
413 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
414 }
415
416 PUSHs (rv);
417 }
418
349 break; 419 break;
350 420
351 case EIO_GROUP: 421 case EIO_GROUP:
352 req->int1 = 2; /* mark group as finished */ 422 req->int1 = 2; /* mark group as finished */
353 423
… …
441 grp->sv2 = 0; 511 grp->sv2 = 0;
442 512
443 eio_grp_cancel (grp); 513 eio_grp_cancel (grp);
444} 514}
445 515
446#ifdef USE_SOCKETS_AS_HANDLES
447# define TO_SOCKET(x) (win32_get_osfhandle (x))
448#else
449# define TO_SOCKET(x) (x)
450#endif
451
452static void 516static void
453create_respipe (void) 517create_respipe (void)
454{ 518{
455 int old_readfd = respipe [0];
456
457 if (respipe [1] >= 0)
458 respipe_close (TO_SOCKET (respipe [1]));
459
460#ifdef _WIN32
461 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
462#else
463 if (pipe (respipe)) 519 if (s_epipe_renew (&respipe))
464#endif
465 croak ("unable to initialize result pipe"); 520 croak ("IO::AIO: unable to initialize result pipe");
466
467 if (old_readfd >= 0)
468 {
469 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
470 croak ("unable to initialize result pipe(2)");
471
472 respipe_close (respipe [0]);
473 respipe [0] = old_readfd;
474 }
475
476#ifdef _WIN32
477 int arg = 1;
478 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
479 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
480#else
481 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
482 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
483#endif
484 croak ("unable to initialize result pipe(3)");
485
486 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]);
488} 521}
489 522
490static void poll_wait (void) 523static void poll_wait (void)
491{ 524{
492 fd_set rfd;
493
494 while (eio_nreqs ()) 525 while (eio_nreqs ())
495 { 526 {
496 int size; 527 int size;
497 528
498 X_LOCK (reslock); 529 X_LOCK (reslock);
… …
502 if (size) 533 if (size)
503 return; 534 return;
504 535
505 etp_maybe_start_thread (); 536 etp_maybe_start_thread ();
506 537
507 FD_ZERO (&rfd); 538 s_epipe_wait (&respipe);
508 FD_SET (respipe [0], &rfd);
509
510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
511 } 539 }
512} 540}
513 541
514static int poll_cb (void) 542static int poll_cb (void)
515{ 543{
… …
533} 561}
534 562
535static SV * 563static SV *
536get_cb (SV *cb_sv) 564get_cb (SV *cb_sv)
537{ 565{
538 HV *st; 566 SvGETMAGIC (cb_sv);
539 GV *gvp; 567 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
540 CV *cv;
541
542 if (!SvOK (cb_sv))
543 return 0;
544
545 cv = sv_2cv (cb_sv, &st, &gvp, 0);
546
547 if (!cv)
548 croak ("IO::AIO callback must be undef or a CODE reference");
549
550 return (SV *)cv;
551} 568}
552 569
553#define dREQ \ 570#define dREQ \
554 SV *cb_cv; \ 571 SV *cb_cv; \
555 aio_req req; \ 572 aio_req req; \
… …
569 PUTBACK; \ 586 PUTBACK; \
570 req_submit (req); \ 587 req_submit (req); \
571 SPAGAIN; \ 588 SPAGAIN; \
572 \ 589 \
573 if (GIMME_V != G_VOID) \ 590 if (GIMME_V != G_VOID) \
574 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 591 XPUSHs (req_sv (req, aio_req_stash));
575 592
576MODULE = IO::AIO PACKAGE = IO::AIO 593MODULE = IO::AIO PACKAGE = IO::AIO
577 594
578PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
579 596
… …
599 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM) 616 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
600 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 617 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
601 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 618 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
602 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED) 619 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
603 620
621 const_iv (ST_RDONLY , ST_RDONLY)
622 const_iv (ST_NOSUID , ST_NOSUID)
623 const_iv (ST_NODEV , ST_NODEV)
624 const_iv (ST_NOEXEC , ST_NOEXEC)
625 const_iv (ST_SYNCHRONOUS , ST_SYNCHRONOUS)
626 const_iv (ST_MANDLOCK , ST_MANDLOCK)
627 const_iv (ST_WRITE , ST_WRITE)
628 const_iv (ST_APPEND , ST_APPEND)
629 const_iv (ST_IMMUTABLE , ST_IMMUTABLE)
630 const_iv (ST_NOATIME , ST_NOATIME)
631 const_iv (ST_NODIRATIME , ST_NODIRATIME)
632 const_iv (ST_RELATIME , ST_RELATIME)
633
634 const_eio (MS_ASYNC)
635 const_eio (MS_INVALIDATE)
636 const_eio (MS_SYNC)
637
638 const_eio (MT_MODIFY)
639
604 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 640 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
605 const_eio (SYNC_FILE_RANGE_WRITE) 641 const_eio (SYNC_FILE_RANGE_WRITE)
606 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 642 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
607 643
608 const_eio (READDIR_DENTS) 644 const_eio (READDIR_DENTS)
… …
619 const_eio (DT_LNK) 655 const_eio (DT_LNK)
620 const_eio (DT_SOCK) 656 const_eio (DT_SOCK)
621 const_eio (DT_WHT) 657 const_eio (DT_WHT)
622 }; 658 };
623 659
624 stash = gv_stashpv ("IO::AIO", 1); 660 aio_stash = gv_stashpv ("IO::AIO" , 1);
661 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
662 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
625 663
626 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 664 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
627 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 665 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
628 666
629 create_respipe (); 667 create_respipe ();
630 668
631 if (eio_init (want_poll, done_poll) < 0) 669 if (eio_init (want_poll, done_poll) < 0)
632 croak ("IO::AIO: unable to initialise eio library"); 670 croak ("IO::AIO: unable to initialise eio library");
… …
859} 897}
860 898
861void 899void
862aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 900aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
863 ALIAS: 901 ALIAS:
864 aio_stat = EIO_STAT 902 aio_stat = EIO_STAT
865 aio_lstat = EIO_LSTAT 903 aio_lstat = EIO_LSTAT
904 aio_statvfs = EIO_STATVFS
866 PPCODE: 905 PPCODE:
867{ 906{
868 dREQ; 907 dREQ;
869 908
870 req->sv1 = newSVsv (fh_or_path); 909 req->sv1 = newSVsv (fh_or_path);
… …
874 req->type = ix; 913 req->type = ix;
875 req->ptr1 = SvPVbyte_nolen (req->sv1); 914 req->ptr1 = SvPVbyte_nolen (req->sv1);
876 } 915 }
877 else 916 else
878 { 917 {
879 req->type = EIO_FSTAT; 918 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
880 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 919 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
881 } 920 }
882 921
883 REQ_SEND; 922 REQ_SEND;
884} 923}
… …
1047 1086
1048 REQ_SEND; 1087 REQ_SEND;
1049} 1088}
1050 1089
1051void 1090void
1091aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1092 ALIAS:
1093 aio_mtouch = EIO_MTOUCH
1094 aio_msync = EIO_MSYNC
1095 PROTOTYPE: $$$$;$
1096 PPCODE:
1097{
1098 STRLEN svlen;
1099 UV len = SvUV (length);
1100 char *svptr = SvPVbyte (data, svlen);
1101
1102 if (offset < 0)
1103 offset += svlen;
1104
1105 if (offset < 0 || offset > svlen)
1106 croak ("offset outside of scalar");
1107
1108 if (!SvOK (length) || len + offset > svlen)
1109 len = svlen - offset;
1110
1111 {
1112 dREQ;
1113
1114 req->type = ix;
1115 req->size = len;
1116 req->sv2 = SvREFCNT_inc (data);
1117 req->ptr2 = (char *)svptr + offset;
1118 req->int1 = flags;
1119
1120 REQ_SEND;
1121 }
1122}
1123
1124void
1052aio_busy (double delay, SV *callback=&PL_sv_undef) 1125aio_busy (double delay, SV *callback=&PL_sv_undef)
1053 PPCODE: 1126 PPCODE:
1054{ 1127{
1055 dREQ; 1128 dREQ;
1056 1129
… …
1068 dREQ; 1141 dREQ;
1069 1142
1070 req->type = EIO_GROUP; 1143 req->type = EIO_GROUP;
1071 1144
1072 req_submit (req); 1145 req_submit (req);
1073 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1146 XPUSHs (req_sv (req, aio_grp_stash));
1074} 1147}
1075 1148
1076void 1149void
1077aio_nop (SV *callback=&PL_sv_undef) 1150aio_nop (SV *callback=&PL_sv_undef)
1078 ALIAS: 1151 ALIAS:
… …
1130 1203
1131int 1204int
1132poll_fileno() 1205poll_fileno()
1133 PROTOTYPE: 1206 PROTOTYPE:
1134 CODE: 1207 CODE:
1135 RETVAL = respipe [0]; 1208 RETVAL = s_epipe_fd (&respipe);
1136 OUTPUT: 1209 OUTPUT:
1137 RETVAL 1210 RETVAL
1138 1211
1139int 1212int
1140poll_cb(...) 1213poll_cb(...)
… …
1196 1269
1197ssize_t 1270ssize_t
1198sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1271sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1199 PROTOTYPE: $$$$ 1272 PROTOTYPE: $$$$
1200 CODE: 1273 CODE:
1201 eio_sendfile_sync (ofh, ifh, offset, count); 1274 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1275 OUTPUT:
1276 RETVAL
1202 1277
1203void _on_next_submit (SV *cb) 1278void _on_next_submit (SV *cb)
1204 CODE: 1279 CODE:
1205 SvREFCNT_dec (on_next_submit); 1280 SvREFCNT_dec (on_next_submit);
1206 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1281 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
… …
1221 if (GIMME_V != G_VOID) 1296 if (GIMME_V != G_VOID)
1222 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1297 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1223 1298
1224 if (items > 1) 1299 if (items > 1)
1225 { 1300 {
1226 SV *cb_cv = get_cb (callback); 1301 SV *cb_cv =get_cb (callback);
1227 1302
1228 SvREFCNT_dec (req->callback); 1303 SvREFCNT_dec (req->callback);
1229 req->callback = SvREFCNT_inc (cb_cv); 1304 req->callback = SvREFCNT_inc (cb_cv);
1230 } 1305 }
1231} 1306}

Diff Legend

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