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.84 by root, Sat Oct 28 01:24:19 2006 UTC vs.
Revision 1.104 by root, Sun Jul 8 11:05:36 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h"
18
19#include <pthread.h>
20
21#include <stddef.h> 9#include <stddef.h>
10#include <stdlib.h>
22#include <errno.h> 11#include <errno.h>
23#include <sys/time.h>
24#include <sys/select.h>
25#include <sys/types.h> 12#include <sys/types.h>
26#include <sys/stat.h> 13#include <sys/stat.h>
27#include <limits.h> 14#include <limits.h>
28#include <unistd.h>
29#include <fcntl.h> 15#include <fcntl.h>
30#include <signal.h>
31#include <sched.h> 16#include <sched.h>
17
18#ifdef _WIN32
19
20# define SIGIO 0
21 typedef Direntry_t X_DIRENT;
22#undef malloc
23#undef free
24
25// perl overrides all those nice win32 functions
26# undef open
27# undef read
28# undef write
29# undef send
30# undef recv
31# undef stat
32# undef fstat
33# define lstat stat
34# undef truncate
35# undef ftruncate
36# undef open
37# undef close
38# undef unlink
39# undef rmdir
40# undef rename
41# undef lseek
42
43# define chown(a,b,c) (errno = ENOSYS, -1)
44# define fchown(a,b,c) (errno = ENOSYS, -1)
45# define fchmod(a,b) (errno = ENOSYS, -1)
46# define symlink(a,b) (errno = ENOSYS, -1)
47# define readlink(a,b,c) (errno = ENOSYS, -1)
48# define mknod(a,b,c) (errno = ENOSYS, -1)
49# define truncate(a,b) (errno = ENOSYS, -1)
50# define ftruncate(fd,o) chsize ((fd), (o))
51# define fsync(fd) _commit (fd)
52# define opendir(fd) (errno = ENOSYS, 0)
53# define readdir(fd) (errno = ENOSYS, -1)
54# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a)
56
57#else
58
59# include "autoconf/config.h"
60# include <sys/time.h>
61# include <sys/select.h>
62# include <unistd.h>
63# include <utime.h>
64# include <signal.h>
65 typedef struct dirent X_DIRENT;
66
67#endif
32 68
33#if HAVE_SENDFILE 69#if HAVE_SENDFILE
34# if __linux 70# if __linux
35# include <sys/sendfile.h> 71# include <sys/sendfile.h>
36# elif __freebsd 72# elif __freebsd
… …
51/* used for struct dirent, AIX doesn't provide it */ 87/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 88#ifndef NAME_MAX
53# define NAME_MAX 4096 89# define NAME_MAX 4096
54#endif 90#endif
55 91
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
61#if __ia64
62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
65#else
66# define STACKSIZE 16384
67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDREAD_UNSAFE
74# if __i386 || __x86_64
75# define WORDREAD_UNSAFE 0
76# else
77# define WORDREAD_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */ 92/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 93#define AIO_BUFSIZE 65536
83 94
95/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8
97# define SvVAL64 SvIV
98#else
99# define SvVAL64 SvNV
100#endif
101
84#define dBUF \ 102#define dBUF \
85 char *aio_buf; \ 103 char *aio_buf; \
86 LOCK (wrklock); \ 104 X_LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 105 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 106 X_UNLOCK (wrklock); \
89 if (!aio_buf) \ 107 if (!aio_buf) \
90 return -1; 108 return -1;
109
110typedef SV SV8; /* byte-sv, used for argument-checking */
91 111
92enum { 112enum {
93 REQ_QUIT, 113 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 114 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 115 REQ_READ, REQ_WRITE,
96 REQ_SENDFILE, 116 REQ_READAHEAD, REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 117 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
118 REQ_TRUNCATE, REQ_FTRUNCATE,
119 REQ_UTIME, REQ_FUTIME,
120 REQ_CHMOD, REQ_FCHMOD,
121 REQ_CHOWN, REQ_FCHOWN,
98 REQ_FSYNC, REQ_FDATASYNC, 122 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 123 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 124 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 125 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 126 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 127 REQ_BUSY,
104}; 128};
105 129
106#define AIO_REQ_KLASS "IO::AIO::REQ" 130#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 132
109typedef struct aio_cb 133typedef struct aio_cb
110{ 134{
111 struct aio_cb *volatile next; 135 struct aio_cb *volatile next;
112 136
113 SV *data, *callback; 137 SV *callback;
114 SV *fh, *fh2; 138 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 139 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 140 off_t offs;
118 size_t length; 141 size_t size;
119 ssize_t result; 142 ssize_t result;
143 double nv1, nv2;
120 144
121 STRLEN dataoffset; 145 STRLEN stroffset;
122 int type; 146 int type;
123 int fd, fd2; 147 int int1, int2, int3;
124 int errorno; 148 int errorno;
125 mode_t mode; /* open */ 149 mode_t mode; /* open */
126 150
127 unsigned char flags; 151 unsigned char flags;
128 unsigned char pri; 152 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 154 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 155 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 156} aio_cb;
133 157
134enum { 158enum {
135 FLAG_CANCELLED = 0x01, 159 FLAG_CANCELLED = 0x01, /* request was cancelled */
160 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
161 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 162};
137 163
138typedef aio_cb *aio_req; 164typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 165typedef aio_cb *aio_req_ornot;
140 166
… …
145 DEFAULT_PRI = 0, 171 DEFAULT_PRI = 0,
146 PRI_BIAS = -PRI_MIN, 172 PRI_BIAS = -PRI_MIN,
147 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 173 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
148}; 174};
149 175
176#define AIO_TICKS ((1000000 + 1023) >> 10)
177
178static unsigned int max_poll_time = 0;
179static unsigned int max_poll_reqs = 0;
180
181/* calculcate time difference in ~1/AIO_TICKS of a second */
182static int tvdiff (struct timeval *tv1, struct timeval *tv2)
183{
184 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
185 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
186}
187
188static thread_t main_tid;
189static int main_sig;
190static int block_sig_level;
191
192void block_sig ()
193{
194 sigset_t ss;
195
196 if (block_sig_level++)
197 return;
198
199 if (!main_sig)
200 return;
201
202 sigemptyset (&ss);
203 sigaddset (&ss, main_sig);
204 pthread_sigmask (SIG_BLOCK, &ss, 0);
205}
206
207void unblock_sig ()
208{
209 sigset_t ss;
210
211 if (--block_sig_level)
212 return;
213
214 if (!main_sig)
215 return;
216
217 sigemptyset (&ss);
218 sigaddset (&ss, main_sig);
219 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
220}
221
150static int next_pri = DEFAULT_PRI + PRI_BIAS; 222static int next_pri = DEFAULT_PRI + PRI_BIAS;
151 223
152static unsigned int started, idle, wanted; 224static unsigned int started, idle, wanted;
153 225
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
158#endif
159
160#define LOCK(mutex) pthread_mutex_lock (&(mutex))
161#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
162
163/* worker threads management */ 226/* worker threads management */
164static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 227static mutex_t wrklock = X_MUTEX_INIT;
165 228
166typedef struct worker { 229typedef struct worker {
167 /* locked by wrklock */ 230 /* locked by wrklock */
168 struct worker *prev, *next; 231 struct worker *prev, *next;
169 232
170 pthread_t tid; 233 thread_t tid;
171 234
172 /* locked by reslock, reqlock or wrklock */ 235 /* locked by reslock, reqlock or wrklock */
173 aio_req req; /* currently processed request */ 236 aio_req req; /* currently processed request */
174 void *dbuf; 237 void *dbuf;
175 DIR *dirp; 238 DIR *dirp;
… …
201} 264}
202 265
203static volatile unsigned int nreqs, nready, npending; 266static volatile unsigned int nreqs, nready, npending;
204static volatile unsigned int max_idle = 4; 267static volatile unsigned int max_idle = 4;
205static volatile unsigned int max_outstanding = 0xffffffff; 268static volatile unsigned int max_outstanding = 0xffffffff;
206static int respipe [2]; 269static int respipe [2], respipe_osf [2];
207 270
208static pthread_mutex_t reslock = AIO_MUTEX_INIT; 271static mutex_t reslock = X_MUTEX_INIT;
209static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 272static mutex_t reqlock = X_MUTEX_INIT;
210static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 273static cond_t reqwait = X_COND_INIT;
211 274
212#if WORDREAD_UNSAFE 275#if WORDACCESS_UNSAFE
213 276
214static unsigned int get_nready () 277static unsigned int get_nready ()
215{ 278{
216 unsigned int retval; 279 unsigned int retval;
217 280
218 LOCK (reqlock); 281 X_LOCK (reqlock);
219 retval = nready; 282 retval = nready;
220 UNLOCK (reqlock); 283 X_UNLOCK (reqlock);
221 284
222 return retval; 285 return retval;
223} 286}
224 287
225static unsigned int get_npending () 288static unsigned int get_npending ()
226{ 289{
227 unsigned int retval; 290 unsigned int retval;
228 291
229 LOCK (reslock); 292 X_LOCK (reslock);
230 retval = npending; 293 retval = npending;
231 UNLOCK (reslock); 294 X_UNLOCK (reslock);
295
296 return retval;
297}
298
299static unsigned int get_nthreads ()
300{
301 unsigned int retval;
302
303 X_LOCK (wrklock);
304 retval = started;
305 X_UNLOCK (wrklock);
232 306
233 return retval; 307 return retval;
234} 308}
235 309
236#else 310#else
237 311
238# define get_nready() nready 312# define get_nready() nready
239# define get_npending() npending 313# define get_npending() npending
314# define get_nthreads() started
240 315
241#endif 316#endif
242 317
243/* 318/*
244 * a somewhat faster data structure might be nice, but 319 * a somewhat faster data structure might be nice, but
… …
292 } 367 }
293 368
294 abort (); 369 abort ();
295} 370}
296 371
297static int poll_cb (int max); 372static int poll_cb ();
298static void req_invoke (aio_req req); 373static int req_invoke (aio_req req);
299static void req_free (aio_req req); 374static void req_destroy (aio_req req);
300static void req_cancel (aio_req req); 375static void req_cancel (aio_req req);
301 376
302/* must be called at most once */ 377/* must be called at most once */
303static SV *req_sv (aio_req req, const char *klass) 378static SV *req_sv (aio_req req, const char *klass)
304{ 379{
… …
323 return mg ? (aio_req)mg->mg_ptr : 0; 398 return mg ? (aio_req)mg->mg_ptr : 0;
324} 399}
325 400
326static void aio_grp_feed (aio_req grp) 401static void aio_grp_feed (aio_req grp)
327{ 402{
403 block_sig ();
404
328 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 405 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
329 { 406 {
330 int old_len = grp->length; 407 int old_len = grp->size;
331 408
332 if (grp->fh2 && SvOK (grp->fh2)) 409 if (grp->sv2 && SvOK (grp->sv2))
333 { 410 {
334 dSP; 411 dSP;
335 412
336 ENTER; 413 ENTER;
337 SAVETMPS; 414 SAVETMPS;
338 PUSHMARK (SP); 415 PUSHMARK (SP);
339 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 416 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
340 PUTBACK; 417 PUTBACK;
341 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 418 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
342 SPAGAIN; 419 SPAGAIN;
343 FREETMPS; 420 FREETMPS;
344 LEAVE; 421 LEAVE;
345 } 422 }
346 423
347 /* stop if no progress has been made */ 424 /* stop if no progress has been made */
348 if (old_len == grp->length) 425 if (old_len == grp->size)
349 { 426 {
350 SvREFCNT_dec (grp->fh2); 427 SvREFCNT_dec (grp->sv2);
351 grp->fh2 = 0; 428 grp->sv2 = 0;
352 break; 429 break;
353 } 430 }
354 } 431 }
432
433 unblock_sig ();
355} 434}
356 435
357static void aio_grp_dec (aio_req grp) 436static void aio_grp_dec (aio_req grp)
358{ 437{
359 --grp->length; 438 --grp->size;
360 439
361 /* call feeder, if applicable */ 440 /* call feeder, if applicable */
362 aio_grp_feed (grp); 441 aio_grp_feed (grp);
363 442
364 /* finish, if done */ 443 /* finish, if done */
365 if (!grp->length && grp->fd) 444 if (!grp->size && grp->int1)
366 { 445 {
446 block_sig ();
447
367 req_invoke (grp); 448 if (!req_invoke (grp))
449 {
450 req_destroy (grp);
451 unblock_sig ();
452 croak (0);
453 }
454
368 req_free (grp); 455 req_destroy (grp);
456 unblock_sig ();
369 } 457 }
370} 458}
371 459
372static void req_invoke (aio_req req) 460static int req_invoke (aio_req req)
373{ 461{
374 dSP; 462 dSP;
463
464 if (req->flags & FLAG_SV2_RO_OFF)
465 SvREADONLY_off (req->sv2);
375 466
376 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 467 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
377 { 468 {
378 ENTER; 469 ENTER;
379 SAVETMPS; 470 SAVETMPS;
… …
387 SV *rv = &PL_sv_undef; 478 SV *rv = &PL_sv_undef;
388 479
389 if (req->result >= 0) 480 if (req->result >= 0)
390 { 481 {
391 int i; 482 int i;
392 char *buf = req->data2ptr; 483 char *buf = req->ptr2;
393 AV *av = newAV (); 484 AV *av = newAV ();
394 485
395 av_extend (av, req->result - 1); 486 av_extend (av, req->result - 1);
396 487
397 for (i = 0; i < req->result; ++i) 488 for (i = 0; i < req->result; ++i)
… …
417 PUSHs (sv_2mortal (newSViv (req->result))); 508 PUSHs (sv_2mortal (newSViv (req->result)));
418 PUTBACK; 509 PUTBACK;
419 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 510 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
420 SPAGAIN; 511 SPAGAIN;
421 512
422 fh = SvREFCNT_inc (POPs); 513 fh = POPs;
423
424 PUSHMARK (SP); 514 PUSHMARK (SP);
425 XPUSHs (sv_2mortal (fh)); 515 XPUSHs (fh);
426 } 516 }
427 break; 517 break;
428 518
429 case REQ_GROUP: 519 case REQ_GROUP:
430 req->fd = 2; /* mark group as finished */ 520 req->int1 = 2; /* mark group as finished */
431 521
432 if (req->data) 522 if (req->sv1)
433 { 523 {
434 int i; 524 int i;
435 AV *av = (AV *)req->data; 525 AV *av = (AV *)req->sv1;
436 526
437 EXTEND (SP, AvFILL (av) + 1); 527 EXTEND (SP, AvFILL (av) + 1);
438 for (i = 0; i <= AvFILL (av); ++i) 528 for (i = 0; i <= AvFILL (av); ++i)
439 PUSHs (*av_fetch (av, i, 0)); 529 PUSHs (*av_fetch (av, i, 0));
440 } 530 }
… …
442 532
443 case REQ_NOP: 533 case REQ_NOP:
444 case REQ_BUSY: 534 case REQ_BUSY:
445 break; 535 break;
446 536
537 case REQ_READLINK:
538 if (req->result > 0)
539 {
540 SvCUR_set (req->sv2, req->result);
541 *SvEND (req->sv2) = 0;
542 PUSHs (req->sv2);
543 }
544 break;
545
546 case REQ_STAT:
547 case REQ_LSTAT:
548 case REQ_FSTAT:
549 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
550 PL_laststatval = req->result;
551 PL_statcache = *(Stat_t *)(req->ptr2);
552 PUSHs (sv_2mortal (newSViv (req->result)));
553 break;
554
555 case REQ_READ:
556 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
557 *SvEND (req->sv2) = 0;
558 PUSHs (sv_2mortal (newSViv (req->result)));
559 break;
560
447 default: 561 default:
448 PUSHs (sv_2mortal (newSViv (req->result))); 562 PUSHs (sv_2mortal (newSViv (req->result)));
449 break; 563 break;
450 } 564 }
451 565
… …
471 grp->grp_first = req->grp_next; 585 grp->grp_first = req->grp_next;
472 586
473 aio_grp_dec (grp); 587 aio_grp_dec (grp);
474 } 588 }
475 589
476 if (SvTRUE (ERRSV)) 590 return !SvTRUE (ERRSV);
477 {
478 req_free (req);
479 croak (0);
480 }
481} 591}
482 592
483static void req_free (aio_req req) 593static void req_destroy (aio_req req)
484{ 594{
485 if (req->self) 595 if (req->self)
486 { 596 {
487 sv_unmagic (req->self, PERL_MAGIC_ext); 597 sv_unmagic (req->self, PERL_MAGIC_ext);
488 SvREFCNT_dec (req->self); 598 SvREFCNT_dec (req->self);
489 } 599 }
490 600
491 SvREFCNT_dec (req->data);
492 SvREFCNT_dec (req->fh); 601 SvREFCNT_dec (req->sv1);
493 SvREFCNT_dec (req->fh2); 602 SvREFCNT_dec (req->sv2);
494 SvREFCNT_dec (req->callback); 603 SvREFCNT_dec (req->callback);
495 Safefree (req->statdata);
496 604
497 if (req->type == REQ_READDIR) 605 if (req->flags & FLAG_PTR2_FREE)
498 free (req->data2ptr); 606 free (req->ptr2);
499 607
500 Safefree (req); 608 Safefree (req);
501} 609}
502 610
503static void req_cancel_subs (aio_req grp) 611static void req_cancel_subs (aio_req grp)
… …
505 aio_req sub; 613 aio_req sub;
506 614
507 if (grp->type != REQ_GROUP) 615 if (grp->type != REQ_GROUP)
508 return; 616 return;
509 617
510 SvREFCNT_dec (grp->fh2); 618 SvREFCNT_dec (grp->sv2);
511 grp->fh2 = 0; 619 grp->sv2 = 0;
512 620
513 for (sub = grp->grp_first; sub; sub = sub->grp_next) 621 for (sub = grp->grp_first; sub; sub = sub->grp_next)
514 req_cancel (sub); 622 req_cancel (sub);
515} 623}
516 624
… …
519 req->flags |= FLAG_CANCELLED; 627 req->flags |= FLAG_CANCELLED;
520 628
521 req_cancel_subs (req); 629 req_cancel_subs (req);
522} 630}
523 631
524static void *aio_proc(void *arg); 632#ifdef USE_SOCKETS_AS_HANDLES
633# define TO_SOCKET(x) (win32_get_osfhandle (x))
634#else
635# define TO_SOCKET(x) (x)
636#endif
637
638static void
639create_pipe (int fd[2])
640{
641#ifdef _WIN32
642 int arg = 1;
643 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, fd)
644 || ioctlsocket (TO_SOCKET (fd [0]), FIONBIO, &arg)
645 || ioctlsocket (TO_SOCKET (fd [1]), FIONBIO, &arg))
646#else
647 if (pipe (fd)
648 || fcntl (fd [0], F_SETFL, O_NONBLOCK)
649 || fcntl (fd [1], F_SETFL, O_NONBLOCK))
650#endif
651 croak ("unable to initialize result pipe");
652
653 respipe_osf [0] = TO_SOCKET (respipe [0]);
654 respipe_osf [1] = TO_SOCKET (respipe [1]);
655}
656
657X_THREAD_PROC (aio_proc);
525 658
526static void start_thread (void) 659static void start_thread (void)
527{ 660{
528 sigset_t fullsigset, oldsigset;
529 pthread_attr_t attr;
530
531 worker *wrk = calloc (1, sizeof (worker)); 661 worker *wrk = calloc (1, sizeof (worker));
532 662
533 if (!wrk) 663 if (!wrk)
534 croak ("unable to allocate worker thread data"); 664 croak ("unable to allocate worker thread data");
535 665
536 pthread_attr_init (&attr);
537 pthread_attr_setstacksize (&attr, STACKSIZE);
538 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
539#ifdef PTHREAD_SCOPE_PROCESS
540 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
541#endif
542
543 sigfillset (&fullsigset);
544
545 LOCK (wrklock); 666 X_LOCK (wrklock);
546 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
547 667
548 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 668 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
549 { 669 {
550 wrk->prev = &wrk_first; 670 wrk->prev = &wrk_first;
551 wrk->next = wrk_first.next; 671 wrk->next = wrk_first.next;
552 wrk_first.next->prev = wrk; 672 wrk_first.next->prev = wrk;
553 wrk_first.next = wrk; 673 wrk_first.next = wrk;
554 ++started; 674 ++started;
555 } 675 }
556 else 676 else
557 free (wrk); 677 free (wrk);
558 678
559 sigprocmask (SIG_SETMASK, &oldsigset, 0);
560 UNLOCK (wrklock); 679 X_UNLOCK (wrklock);
561} 680}
562 681
563static void maybe_start_thread () 682static void maybe_start_thread ()
564{ 683{
565 if (started >= wanted) 684 if (get_nthreads () >= wanted)
566 return; 685 return;
567 686
568 /* todo: maybe use idle here, but might be less exact */ 687 /* todo: maybe use idle here, but might be less exact */
569 if ((int)nready <= (int)started - (int)(nreqs - get_nready () - get_npending ())) 688 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 689 return;
571 690
572 start_thread (); 691 start_thread ();
573} 692}
574 693
575static void req_send (aio_req req) 694static void req_send (aio_req req)
576{ 695{
696 block_sig ();
697
577 ++nreqs; 698 ++nreqs;
578 699
579 LOCK (reqlock); 700 X_LOCK (reqlock);
580 ++nready; 701 ++nready;
581 reqq_push (&req_queue, req); 702 reqq_push (&req_queue, req);
582 pthread_cond_signal (&reqwait); 703 X_COND_SIGNAL (reqwait);
583 UNLOCK (reqlock); 704 X_UNLOCK (reqlock);
705
706 unblock_sig ();
584 707
585 maybe_start_thread (); 708 maybe_start_thread ();
586} 709}
587 710
588static void end_thread (void) 711static void end_thread (void)
… …
592 Newz (0, req, 1, aio_cb); 715 Newz (0, req, 1, aio_cb);
593 716
594 req->type = REQ_QUIT; 717 req->type = REQ_QUIT;
595 req->pri = PRI_MAX + PRI_BIAS; 718 req->pri = PRI_MAX + PRI_BIAS;
596 719
597 LOCK (reqlock); 720 X_LOCK (reqlock);
598 reqq_push (&req_queue, req); 721 reqq_push (&req_queue, req);
599 pthread_cond_signal (&reqwait); 722 X_COND_SIGNAL (reqwait);
600 UNLOCK (reqlock); 723 X_UNLOCK (reqlock);
601 724
602 LOCK (wrklock); 725 X_LOCK (wrklock);
603 --started; 726 --started;
604 UNLOCK (wrklock); 727 X_UNLOCK (wrklock);
728}
729
730static void set_max_idle (int nthreads)
731{
732 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
733 max_idle = nthreads <= 0 ? 1 : nthreads;
734 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
605} 735}
606 736
607static void min_parallel (int nthreads) 737static void min_parallel (int nthreads)
608{ 738{
609 if (wanted < nthreads) 739 if (wanted < nthreads)
… …
624 fd_set rfd; 754 fd_set rfd;
625 755
626 while (nreqs) 756 while (nreqs)
627 { 757 {
628 int size; 758 int size;
629 if (WORDREAD_UNSAFE) LOCK (reslock); 759 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
630 size = res_queue.size; 760 size = res_queue.size;
631 if (WORDREAD_UNSAFE) UNLOCK (reslock); 761 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
632 762
633 if (size) 763 if (size)
634 return; 764 return;
635 765
636 maybe_start_thread (); 766 maybe_start_thread ();
637 767
638 FD_ZERO(&rfd); 768 FD_ZERO (&rfd);
639 FD_SET(respipe [0], &rfd); 769 FD_SET (respipe [0], &rfd);
640 770
641 select (respipe [0] + 1, &rfd, 0, 0, 0); 771 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 772 }
643} 773}
644 774
645static int poll_cb (int max) 775static int poll_cb ()
646{ 776{
647 dSP; 777 dSP;
648 int count = 0; 778 int count = 0;
779 int maxreqs = max_poll_reqs;
649 int do_croak = 0; 780 int do_croak = 0;
781 struct timeval tv_start, tv_now;
650 aio_req req; 782 aio_req req;
783
784 if (max_poll_time)
785 gettimeofday (&tv_start, 0);
786
787 block_sig ();
651 788
652 for (;;) 789 for (;;)
653 { 790 {
654 while (max <= 0 || count < max) 791 for (;;)
655 { 792 {
656 maybe_start_thread (); 793 maybe_start_thread ();
657 794
658 LOCK (reslock); 795 X_LOCK (reslock);
659 req = reqq_shift (&res_queue); 796 req = reqq_shift (&res_queue);
660 797
661 if (req) 798 if (req)
662 { 799 {
663 --npending; 800 --npending;
664 801
665 if (!res_queue.size) 802 if (!res_queue.size)
666 { 803 {
667 /* read any signals sent by the worker threads */ 804 /* read any signals sent by the worker threads */
668 char buf [32]; 805 char buf [4];
669 while (read (respipe [0], buf, 32) == 32) 806 while (PerlSock_recv (respipe [0], buf, 4, 0) == 4)
670 ; 807 ;
671 } 808 }
672 } 809 }
673 810
674 UNLOCK (reslock); 811 X_UNLOCK (reslock);
675 812
676 if (!req) 813 if (!req)
677 break; 814 break;
678 815
679 --nreqs; 816 --nreqs;
680 817
681 if (req->type == REQ_GROUP && req->length) 818 if (req->type == REQ_GROUP && req->size)
682 { 819 {
683 req->fd = 1; /* mark request as delayed */ 820 req->int1 = 1; /* mark request as delayed */
684 continue; 821 continue;
685 } 822 }
686 else 823 else
687 { 824 {
688 if (req->type == REQ_READ) 825 if (!req_invoke (req))
689 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
690
691 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
692 SvREADONLY_off (req->data);
693
694 if (req->statdata)
695 { 826 {
696 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 827 req_destroy (req);
697 PL_laststatval = req->result; 828 unblock_sig ();
698 PL_statcache = *(req->statdata); 829 croak (0);
699 } 830 }
700
701 req_invoke (req);
702 831
703 count++; 832 count++;
704 } 833 }
705 834
706 req_free (req); 835 req_destroy (req);
836
837 if (maxreqs && !--maxreqs)
838 break;
839
840 if (max_poll_time)
841 {
842 gettimeofday (&tv_now, 0);
843
844 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
845 break;
846 }
707 } 847 }
708 848
709 if (nreqs <= max_outstanding) 849 if (nreqs <= max_outstanding)
710 break; 850 break;
711 851
712 poll_wait (); 852 poll_wait ();
713 853
714 max = 0; 854 ++maxreqs;
715 } 855 }
716 856
857 unblock_sig ();
717 return count; 858 return count;
718}
719
720static void create_pipe ()
721{
722 if (pipe (respipe))
723 croak ("unable to initialize result pipe");
724
725 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
726 croak ("cannot set result pipe to nonblocking mode");
727
728 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
729 croak ("cannot set result pipe to nonblocking mode");
730} 859}
731 860
732/*****************************************************************************/ 861/*****************************************************************************/
733/* work around various missing functions */ 862/* work around various missing functions */
734 863
… …
739/* 868/*
740 * make our pread/pwrite safe against themselves, but not against 869 * make our pread/pwrite safe against themselves, but not against
741 * normal read/write by using a mutex. slows down execution a lot, 870 * normal read/write by using a mutex. slows down execution a lot,
742 * but that's your problem, not mine. 871 * but that's your problem, not mine.
743 */ 872 */
744static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 873static mutex_t preadwritelock = X_MUTEX_INIT;
745 874
746static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 875static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
747{ 876{
748 ssize_t res; 877 ssize_t res;
749 off_t ooffset; 878 off_t ooffset;
750 879
751 LOCK (preadwritelock); 880 X_LOCK (preadwritelock);
752 ooffset = lseek (fd, 0, SEEK_CUR); 881 ooffset = lseek (fd, 0, SEEK_CUR);
753 lseek (fd, offset, SEEK_SET); 882 lseek (fd, offset, SEEK_SET);
754 res = read (fd, buf, count); 883 res = read (fd, buf, count);
755 lseek (fd, ooffset, SEEK_SET); 884 lseek (fd, ooffset, SEEK_SET);
756 UNLOCK (preadwritelock); 885 X_UNLOCK (preadwritelock);
757 886
758 return res; 887 return res;
759} 888}
760 889
761static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 890static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
762{ 891{
763 ssize_t res; 892 ssize_t res;
764 off_t ooffset; 893 off_t ooffset;
765 894
766 LOCK (preadwritelock); 895 X_LOCK (preadwritelock);
767 ooffset = lseek (fd, 0, SEEK_CUR); 896 ooffset = lseek (fd, 0, SEEK_CUR);
768 lseek (fd, offset, SEEK_SET); 897 lseek (fd, offset, SEEK_SET);
769 res = write (fd, buf, count); 898 res = write (fd, buf, count);
770 lseek (fd, offset, SEEK_SET); 899 lseek (fd, offset, SEEK_SET);
771 UNLOCK (preadwritelock); 900 X_UNLOCK (preadwritelock);
772 901
773 return res; 902 return res;
774} 903}
904#endif
905
906#ifndef HAVE_FUTIMES
907
908# define utimes(path,times) aio_utimes (path, times)
909# define futimes(fd,times) aio_futimes (fd, times)
910
911int aio_utimes (const char *filename, const struct timeval times[2])
912{
913 if (times)
914 {
915 struct utimbuf buf;
916
917 buf.actime = times[0].tv_sec;
918 buf.modtime = times[1].tv_sec;
919
920 return utime (filename, &buf);
921 }
922 else
923 return utime (filename, 0);
924}
925
926int aio_futimes (int fd, const struct timeval tv[2])
927{
928 errno = ENOSYS;
929 return -1;
930}
931
775#endif 932#endif
776 933
777#if !HAVE_FDATASYNC 934#if !HAVE_FDATASYNC
778# define fdatasync fsync 935# define fdatasync fsync
779#endif 936#endif
… …
781#if !HAVE_READAHEAD 938#if !HAVE_READAHEAD
782# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 939# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
783 940
784static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self) 941static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
785{ 942{
943 size_t todo = count;
786 dBUF; 944 dBUF;
787 945
788 while (count > 0) 946 while (todo > 0)
789 { 947 {
790 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 948 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
791 949
792 pread (fd, aio_buf, len, offset); 950 pread (fd, aio_buf, len, offset);
793 offset += len; 951 offset += len;
794 count -= len; 952 todo -= len;
795 } 953 }
796 954
797 errno = 0; 955 errno = 0;
956 return count;
798} 957}
799 958
800#endif 959#endif
801 960
802#if !HAVE_READDIR_R 961#if !HAVE_READDIR_R
803# define readdir_r aio_readdir_r 962# define readdir_r aio_readdir_r
804 963
805static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 964static mutex_t readdirlock = X_MUTEX_INIT;
806 965
807static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 966static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
808{ 967{
809 struct dirent *e; 968 X_DIRENT *e;
810 int errorno; 969 int errorno;
811 970
812 LOCK (readdirlock); 971 X_LOCK (readdirlock);
813 972
814 e = readdir (dirp); 973 e = readdir (dirp);
815 errorno = errno; 974 errorno = errno;
816 975
817 if (e) 976 if (e)
… …
820 strcpy (ent->d_name, e->d_name); 979 strcpy (ent->d_name, e->d_name);
821 } 980 }
822 else 981 else
823 *res = 0; 982 *res = 0;
824 983
825 UNLOCK (readdirlock); 984 X_UNLOCK (readdirlock);
826 985
827 errno = errorno; 986 errno = errorno;
828 return e ? 0 : -1; 987 return e ? 0 : -1;
829} 988}
830#endif 989#endif
… …
926static void scandir_ (aio_req req, worker *self) 1085static void scandir_ (aio_req req, worker *self)
927{ 1086{
928 DIR *dirp; 1087 DIR *dirp;
929 union 1088 union
930 { 1089 {
931 struct dirent d; 1090 X_DIRENT d;
932 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1091 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
933 } *u; 1092 } *u;
934 struct dirent *entp; 1093 X_DIRENT *entp;
935 char *name, *names; 1094 char *name, *names;
936 int memlen = 4096; 1095 int memlen = 4096;
937 int memofs = 0; 1096 int memofs = 0;
938 int res = 0; 1097 int res = 0;
939 int errorno;
940 1098
941 LOCK (wrklock); 1099 X_LOCK (wrklock);
942 self->dirp = dirp = opendir (req->dataptr); 1100 self->dirp = dirp = opendir (req->ptr1);
943 self->dbuf = u = malloc (sizeof (*u)); 1101 self->dbuf = u = malloc (sizeof (*u));
1102 req->flags |= FLAG_PTR2_FREE;
944 req->data2ptr = names = malloc (memlen); 1103 req->ptr2 = names = malloc (memlen);
945 UNLOCK (wrklock); 1104 X_UNLOCK (wrklock);
946 1105
947 if (dirp && u && names) 1106 if (dirp && u && names)
948 for (;;) 1107 for (;;)
949 { 1108 {
950 errno = 0; 1109 errno = 0;
… …
962 res++; 1121 res++;
963 1122
964 while (memofs + len > memlen) 1123 while (memofs + len > memlen)
965 { 1124 {
966 memlen *= 2; 1125 memlen *= 2;
967 LOCK (wrklock); 1126 X_LOCK (wrklock);
968 req->data2ptr = names = realloc (names, memlen); 1127 req->ptr2 = names = realloc (names, memlen);
969 UNLOCK (wrklock); 1128 X_UNLOCK (wrklock);
970 1129
971 if (!names) 1130 if (!names)
972 break; 1131 break;
973 } 1132 }
974 1133
… …
983 req->result = res; 1142 req->result = res;
984} 1143}
985 1144
986/*****************************************************************************/ 1145/*****************************************************************************/
987 1146
988static void *aio_proc (void *thr_arg) 1147X_THREAD_PROC (aio_proc)
989{ 1148{
1149 {//D
990 aio_req req; 1150 aio_req req;
991 struct timespec ts; 1151 struct timespec ts;
992 worker *self = (worker *)thr_arg; 1152 worker *self = (worker *)thr_arg;
993 1153
994 /* try to distribute timeouts somewhat evenly */ 1154 /* try to distribute timeouts somewhat randomly */
995 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1155 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
996 * (1000000000UL / 1024UL);
997 1156
998 for (;;) 1157 for (;;)
999 { 1158 {
1000 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1159 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1001 1160
1002 LOCK (reqlock); 1161 X_LOCK (reqlock);
1003 1162
1004 for (;;) 1163 for (;;)
1005 { 1164 {
1006 self->req = req = reqq_shift (&req_queue); 1165 self->req = req = reqq_shift (&req_queue);
1007 1166
1008 if (req) 1167 if (req)
1009 break; 1168 break;
1010 1169
1011 ++idle; 1170 ++idle;
1012 1171
1013 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1172 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1014 == ETIMEDOUT) 1173 == ETIMEDOUT)
1015 { 1174 {
1016 if (idle > max_idle) 1175 if (idle > max_idle)
1017 { 1176 {
1018 --idle; 1177 --idle;
1019 UNLOCK (reqlock); 1178 X_UNLOCK (reqlock);
1020 LOCK (wrklock); 1179 X_LOCK (wrklock);
1021 --started; 1180 --started;
1022 UNLOCK (wrklock); 1181 X_UNLOCK (wrklock);
1023 goto quit; 1182 goto quit;
1024 } 1183 }
1025 1184
1026 /* we are allowed to idle, so do so without any timeout */ 1185 /* we are allowed to idle, so do so without any timeout */
1027 pthread_cond_wait (&reqwait, &reqlock); 1186 X_COND_WAIT (reqwait, reqlock);
1028 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1187 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1029 } 1188 }
1030 1189
1031 --idle; 1190 --idle;
1032 } 1191 }
1033 1192
1034 --nready; 1193 --nready;
1035 1194
1036 UNLOCK (reqlock); 1195 X_UNLOCK (reqlock);
1037 1196
1038 errno = 0; /* strictly unnecessary */ 1197 errno = 0; /* strictly unnecessary */
1039 1198
1040 if (!(req->flags & FLAG_CANCELLED)) 1199 if (!(req->flags & FLAG_CANCELLED))
1041 switch (req->type) 1200 switch (req->type)
1042 { 1201 {
1043 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1202 case REQ_READ: req->result = req->offs >= 0
1044 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1203 ? pread (req->int1, req->ptr1, req->size, req->offs)
1204 : read (req->int1, req->ptr1, req->size); break;
1205 case REQ_WRITE: req->result = req->offs >= 0
1206 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1207 : write (req->int1, req->ptr1, req->size); break;
1045 1208
1046 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1209 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1047 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1210 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1048 1211
1049 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1212 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1050 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1213 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1051 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1214 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1052 1215
1216 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1217 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1218 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1219 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1220 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1221 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1222
1053 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1223 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1054 case REQ_CLOSE: req->result = close (req->fd); break; 1224 case REQ_CLOSE: req->result = close (req->int1); break;
1055 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1225 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1056 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1226 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1227 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1057 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1228 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1058 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1229 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1059 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1230 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1060 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1231 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1232 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1061 1233
1062 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1234 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1063 case REQ_FSYNC: req->result = fsync (req->fd); break; 1235 case REQ_FSYNC: req->result = fsync (req->int1); break;
1064 case REQ_READDIR: scandir_ (req, self); break; 1236 case REQ_READDIR: scandir_ (req, self); break;
1065 1237
1066 case REQ_BUSY: 1238 case REQ_BUSY:
1239#ifdef _WIN32
1240 Sleep (req->nv1 * 1000.);
1241#else
1067 { 1242 {
1068 struct timeval tv; 1243 struct timeval tv;
1069 1244
1070 tv.tv_sec = req->fd; 1245 tv.tv_sec = req->nv1;
1071 tv.tv_usec = req->fd2; 1246 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1072 1247
1073 req->result = select (0, 0, 0, 0, &tv); 1248 req->result = select (0, 0, 0, 0, &tv);
1249 }
1250#endif
1251 break;
1252
1253 case REQ_UTIME:
1254 case REQ_FUTIME:
1255 {
1256 struct timeval tv[2];
1257 struct timeval *times;
1258
1259 if (req->nv1 != -1. || req->nv2 != -1.)
1260 {
1261 tv[0].tv_sec = req->nv1;
1262 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1263 tv[1].tv_sec = req->nv2;
1264 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1265
1266 times = tv;
1267 }
1268 else
1269 times = 0;
1270
1271
1272 req->result = req->type == REQ_FUTIME
1273 ? futimes (req->int1, times)
1274 : utimes (req->ptr1, times);
1074 } 1275 }
1075 1276
1076 case REQ_GROUP: 1277 case REQ_GROUP:
1077 case REQ_NOP: 1278 case REQ_NOP:
1078 break; 1279 break;
1079 1280
1080 case REQ_QUIT: 1281 case REQ_QUIT:
1081 goto quit; 1282 goto quit;
1082 1283
1083 default: 1284 default:
1084 req->result = ENOSYS; 1285 req->result = -1;
1085 break; 1286 break;
1086 } 1287 }
1087 1288
1088 req->errorno = errno; 1289 req->errorno = errno;
1089 1290
1090 LOCK (reslock); 1291 X_LOCK (reslock);
1091 1292
1092 ++npending; 1293 ++npending;
1093 1294
1094 if (!reqq_push (&res_queue, req)) 1295 if (!reqq_push (&res_queue, req))
1296 {
1095 /* write a dummy byte to the pipe so fh becomes ready */ 1297 /* write a dummy byte to the pipe so fh becomes ready */
1096 write (respipe [1], &respipe, 1); 1298 send (respipe_osf [1], (const void *)&respipe_osf, 1, 0);
1299
1300 /* optionally signal the main thread asynchronously */
1301 if (main_sig)
1302 pthread_kill (main_tid, main_sig);
1303 }
1097 1304
1098 self->req = 0; 1305 self->req = 0;
1099 worker_clear (self); 1306 worker_clear (self);
1100 1307
1101 UNLOCK (reslock); 1308 X_UNLOCK (reslock);
1102 } 1309 }
1103 1310
1104quit: 1311quit:
1105 LOCK (wrklock); 1312 X_LOCK (wrklock);
1106 worker_free (self); 1313 worker_free (self);
1107 UNLOCK (wrklock); 1314 X_UNLOCK (wrklock);
1108 1315
1109 return 0; 1316 return 0;
1317 }//D
1110} 1318}
1111 1319
1112/*****************************************************************************/ 1320/*****************************************************************************/
1113 1321
1114static void atfork_prepare (void) 1322static void atfork_prepare (void)
1115{ 1323{
1116 LOCK (wrklock); 1324 X_LOCK (wrklock);
1117 LOCK (reqlock); 1325 X_LOCK (reqlock);
1118 LOCK (reslock); 1326 X_LOCK (reslock);
1119#if !HAVE_PREADWRITE 1327#if !HAVE_PREADWRITE
1120 LOCK (preadwritelock); 1328 X_LOCK (preadwritelock);
1121#endif 1329#endif
1122#if !HAVE_READDIR_R 1330#if !HAVE_READDIR_R
1123 LOCK (readdirlock); 1331 X_LOCK (readdirlock);
1124#endif 1332#endif
1125} 1333}
1126 1334
1127static void atfork_parent (void) 1335static void atfork_parent (void)
1128{ 1336{
1129#if !HAVE_READDIR_R 1337#if !HAVE_READDIR_R
1130 UNLOCK (readdirlock); 1338 X_UNLOCK (readdirlock);
1131#endif 1339#endif
1132#if !HAVE_PREADWRITE 1340#if !HAVE_PREADWRITE
1133 UNLOCK (preadwritelock); 1341 X_UNLOCK (preadwritelock);
1134#endif 1342#endif
1135 UNLOCK (reslock); 1343 X_UNLOCK (reslock);
1136 UNLOCK (reqlock); 1344 X_UNLOCK (reqlock);
1137 UNLOCK (wrklock); 1345 X_UNLOCK (wrklock);
1138} 1346}
1139 1347
1140static void atfork_child (void) 1348static void atfork_child (void)
1141{ 1349{
1142 aio_req prv; 1350 aio_req prv;
1143 1351
1144 while (prv = reqq_shift (&req_queue)) 1352 while (prv = reqq_shift (&req_queue))
1145 req_free (prv); 1353 req_destroy (prv);
1146 1354
1147 while (prv = reqq_shift (&res_queue)) 1355 while (prv = reqq_shift (&res_queue))
1148 req_free (prv); 1356 req_destroy (prv);
1149 1357
1150 while (wrk_first.next != &wrk_first) 1358 while (wrk_first.next != &wrk_first)
1151 { 1359 {
1152 worker *wrk = wrk_first.next; 1360 worker *wrk = wrk_first.next;
1153 1361
1154 if (wrk->req) 1362 if (wrk->req)
1155 req_free (wrk->req); 1363 req_destroy (wrk->req);
1156 1364
1157 worker_clear (wrk); 1365 worker_clear (wrk);
1158 worker_free (wrk); 1366 worker_free (wrk);
1159 } 1367 }
1160 1368
… …
1162 idle = 0; 1370 idle = 0;
1163 nreqs = 0; 1371 nreqs = 0;
1164 nready = 0; 1372 nready = 0;
1165 npending = 0; 1373 npending = 0;
1166 1374
1167 close (respipe [0]); 1375 PerlSock_closesocket (respipe [0]);
1168 close (respipe [1]); 1376 PerlSock_closesocket (respipe [1]);
1377
1169 create_pipe (); 1378 create_pipe (respipe);
1170 1379
1171 atfork_parent (); 1380 atfork_parent ();
1172} 1381}
1173 1382
1174#define dREQ \ 1383#define dREQ \
… …
1203 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1412 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1204 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1413 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1205 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1414 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1206 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1415 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1207 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1416 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1417#ifdef _WIN32
1418 X_MUTEX_CHECK (wrklock);
1419 X_MUTEX_CHECK (reslock);
1420 X_MUTEX_CHECK (reqlock);
1421 X_MUTEX_CHECK (reqwait);
1422 X_MUTEX_CHECK (preadwritelock);
1423 X_MUTEX_CHECK (readdirlock);
1424
1425 X_COND_CHECK (reqwait);
1426#else
1208 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1427 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1428 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1429#endif
1209 1430
1210 create_pipe (); 1431 create_pipe (respipe);
1432
1211 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1433 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1212} 1434}
1435
1436void
1437max_poll_reqs (int nreqs)
1438 PROTOTYPE: $
1439 CODE:
1440 max_poll_reqs = nreqs;
1441
1442void
1443max_poll_time (double nseconds)
1444 PROTOTYPE: $
1445 CODE:
1446 max_poll_time = nseconds * AIO_TICKS;
1213 1447
1214void 1448void
1215min_parallel (int nthreads) 1449min_parallel (int nthreads)
1216 PROTOTYPE: $ 1450 PROTOTYPE: $
1217 1451
1218void 1452void
1219max_parallel (int nthreads) 1453max_parallel (int nthreads)
1220 PROTOTYPE: $ 1454 PROTOTYPE: $
1455
1456void
1457max_idle (int nthreads)
1458 PROTOTYPE: $
1459 CODE:
1460 set_max_idle (nthreads);
1221 1461
1222int 1462int
1223max_outstanding (int maxreqs) 1463max_outstanding (int maxreqs)
1224 PROTOTYPE: $ 1464 PROTOTYPE: $
1225 CODE: 1465 CODE:
… …
1227 max_outstanding = maxreqs; 1467 max_outstanding = maxreqs;
1228 OUTPUT: 1468 OUTPUT:
1229 RETVAL 1469 RETVAL
1230 1470
1231void 1471void
1232aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1472aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1233 SV * pathname
1234 int flags
1235 int mode
1236 SV * callback
1237 PROTOTYPE: $$$;$ 1473 PROTOTYPE: $$$;$
1238 PPCODE: 1474 PPCODE:
1239{ 1475{
1240 dREQ; 1476 dREQ;
1241 1477
1242 req->type = REQ_OPEN; 1478 req->type = REQ_OPEN;
1243 req->data = newSVsv (pathname); 1479 req->sv1 = newSVsv (pathname);
1244 req->dataptr = SvPVbyte_nolen (req->data); 1480 req->ptr1 = SvPVbyte_nolen (req->sv1);
1245 req->fd = flags; 1481 req->int1 = flags;
1246 req->mode = mode; 1482 req->mode = mode;
1247 1483
1248 REQ_SEND; 1484 REQ_SEND;
1249} 1485}
1250 1486
1251void 1487void
1252aio_close (fh,callback=&PL_sv_undef) 1488aio_close (SV *fh, SV *callback=&PL_sv_undef)
1253 SV * fh
1254 SV * callback
1255 PROTOTYPE: $;$ 1489 PROTOTYPE: $;$
1256 ALIAS: 1490 ALIAS:
1257 aio_close = REQ_CLOSE 1491 aio_close = REQ_CLOSE
1258 aio_fsync = REQ_FSYNC 1492 aio_fsync = REQ_FSYNC
1259 aio_fdatasync = REQ_FDATASYNC 1493 aio_fdatasync = REQ_FDATASYNC
1260 PPCODE: 1494 PPCODE:
1261{ 1495{
1262 dREQ; 1496 dREQ;
1263 1497
1264 req->type = ix; 1498 req->type = ix;
1265 req->fh = newSVsv (fh); 1499 req->sv1 = newSVsv (fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1500 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1267 1501
1268 REQ_SEND (req); 1502 REQ_SEND (req);
1269} 1503}
1270 1504
1271void 1505void
1272aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1506aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1273 SV * fh
1274 UV offset
1275 UV length
1276 SV * data
1277 UV dataoffset
1278 SV * callback
1279 ALIAS: 1507 ALIAS:
1280 aio_read = REQ_READ 1508 aio_read = REQ_READ
1281 aio_write = REQ_WRITE 1509 aio_write = REQ_WRITE
1282 PROTOTYPE: $$$$$;$ 1510 PROTOTYPE: $$$$$;$
1283 PPCODE: 1511 PPCODE:
1284{ 1512{
1285 aio_req req;
1286 STRLEN svlen; 1513 STRLEN svlen;
1287 char *svptr = SvPVbyte (data, svlen); 1514 char *svptr = SvPVbyte (data, svlen);
1515 UV len = SvUV (length);
1288 1516
1289 SvUPGRADE (data, SVt_PV); 1517 SvUPGRADE (data, SVt_PV);
1290 SvPOK_on (data); 1518 SvPOK_on (data);
1291 1519
1292 if (dataoffset < 0) 1520 if (dataoffset < 0)
1293 dataoffset += svlen; 1521 dataoffset += svlen;
1294 1522
1295 if (dataoffset < 0 || dataoffset > svlen) 1523 if (dataoffset < 0 || dataoffset > svlen)
1296 croak ("data offset outside of string"); 1524 croak ("dataoffset outside of data scalar");
1297 1525
1298 if (ix == REQ_WRITE) 1526 if (ix == REQ_WRITE)
1299 { 1527 {
1300 /* write: check length and adjust. */ 1528 /* write: check length and adjust. */
1301 if (length < 0 || length + dataoffset > svlen) 1529 if (!SvOK (length) || len + dataoffset > svlen)
1302 length = svlen - dataoffset; 1530 len = svlen - dataoffset;
1303 } 1531 }
1304 else 1532 else
1305 { 1533 {
1306 /* read: grow scalar as necessary */ 1534 /* read: grow scalar as necessary */
1307 svptr = SvGROW (data, length + dataoffset); 1535 svptr = SvGROW (data, len + dataoffset + 1);
1308 } 1536 }
1309 1537
1310 if (length < 0) 1538 if (len < 0)
1311 croak ("length must not be negative"); 1539 croak ("length must not be negative");
1312 1540
1313 { 1541 {
1314 dREQ; 1542 dREQ;
1315 1543
1316 req->type = ix; 1544 req->type = ix;
1317 req->fh = newSVsv (fh); 1545 req->sv1 = newSVsv (fh);
1318 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1546 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1319 : IoOFP (sv_2io (fh))); 1547 : IoOFP (sv_2io (fh)));
1548 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1320 req->offset = offset; 1549 req->size = len;
1321 req->length = length;
1322 req->data = SvREFCNT_inc (data); 1550 req->sv2 = SvREFCNT_inc (data);
1323 req->dataptr = (char *)svptr + dataoffset; 1551 req->ptr1 = (char *)svptr + dataoffset;
1552 req->stroffset = dataoffset;
1324 1553
1325 if (!SvREADONLY (data)) 1554 if (!SvREADONLY (data))
1326 { 1555 {
1327 SvREADONLY_on (data); 1556 SvREADONLY_on (data);
1328 req->data2ptr = (void *)data; 1557 req->flags |= FLAG_SV2_RO_OFF;
1329 } 1558 }
1330 1559
1331 REQ_SEND; 1560 REQ_SEND;
1332 } 1561 }
1333} 1562}
1334 1563
1335void 1564void
1565aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1566 PROTOTYPE: $$;$
1567 PPCODE:
1568{
1569 SV *data;
1570 dREQ;
1571
1572 data = newSV (NAME_MAX);
1573 SvPOK_on (data);
1574
1575 req->type = REQ_READLINK;
1576 req->sv1 = newSVsv (path);
1577 req->ptr2 = SvPVbyte_nolen (req->sv1);
1578 req->sv2 = data;
1579 req->ptr1 = SvPVbyte_nolen (data);
1580
1581 REQ_SEND;
1582}
1583
1584void
1336aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1585aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1337 SV * out_fh
1338 SV * in_fh
1339 UV in_offset
1340 UV length
1341 SV * callback
1342 PROTOTYPE: $$$$;$ 1586 PROTOTYPE: $$$$;$
1343 PPCODE: 1587 PPCODE:
1344{ 1588{
1345 dREQ; 1589 dREQ;
1346 1590
1347 req->type = REQ_SENDFILE; 1591 req->type = REQ_SENDFILE;
1348 req->fh = newSVsv (out_fh); 1592 req->sv1 = newSVsv (out_fh);
1349 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1593 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1350 req->fh2 = newSVsv (in_fh); 1594 req->sv2 = newSVsv (in_fh);
1351 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1595 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1352 req->offset = in_offset; 1596 req->offs = SvVAL64 (in_offset);
1353 req->length = length; 1597 req->size = length;
1354 1598
1355 REQ_SEND; 1599 REQ_SEND;
1356} 1600}
1357 1601
1358void 1602void
1359aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1603aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1360 SV * fh
1361 UV offset
1362 IV length
1363 SV * callback
1364 PROTOTYPE: $$$;$ 1604 PROTOTYPE: $$$;$
1365 PPCODE: 1605 PPCODE:
1366{ 1606{
1367 dREQ; 1607 dREQ;
1368 1608
1369 req->type = REQ_READAHEAD; 1609 req->type = REQ_READAHEAD;
1370 req->fh = newSVsv (fh); 1610 req->sv1 = newSVsv (fh);
1371 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1611 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1372 req->offset = offset; 1612 req->offs = SvVAL64 (offset);
1373 req->length = length; 1613 req->size = length;
1374 1614
1375 REQ_SEND; 1615 REQ_SEND;
1376} 1616}
1377 1617
1378void 1618void
1379aio_stat (fh_or_path,callback=&PL_sv_undef) 1619aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1380 SV * fh_or_path
1381 SV * callback
1382 ALIAS: 1620 ALIAS:
1383 aio_stat = REQ_STAT 1621 aio_stat = REQ_STAT
1384 aio_lstat = REQ_LSTAT 1622 aio_lstat = REQ_LSTAT
1385 PPCODE: 1623 PPCODE:
1386{ 1624{
1387 dREQ; 1625 dREQ;
1388 1626
1389 New (0, req->statdata, 1, Stat_t); 1627 req->ptr2 = malloc (sizeof (Stat_t));
1390 if (!req->statdata) 1628 if (!req->ptr2)
1391 { 1629 {
1392 req_free (req); 1630 req_destroy (req);
1393 croak ("out of memory during aio_req->statdata allocation"); 1631 croak ("out of memory during aio_stat statdata allocation");
1394 } 1632 }
1633
1634 req->flags |= FLAG_PTR2_FREE;
1635 req->sv1 = newSVsv (fh_or_path);
1395 1636
1396 if (SvPOK (fh_or_path)) 1637 if (SvPOK (fh_or_path))
1397 { 1638 {
1398 req->type = ix; 1639 req->type = ix;
1399 req->data = newSVsv (fh_or_path);
1400 req->dataptr = SvPVbyte_nolen (req->data); 1640 req->ptr1 = SvPVbyte_nolen (req->sv1);
1401 } 1641 }
1402 else 1642 else
1403 { 1643 {
1404 req->type = REQ_FSTAT; 1644 req->type = REQ_FSTAT;
1405 req->fh = newSVsv (fh_or_path);
1406 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1645 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1407 } 1646 }
1408 1647
1409 REQ_SEND; 1648 REQ_SEND;
1410} 1649}
1411 1650
1412void 1651void
1652aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1653 PPCODE:
1654{
1655 dREQ;
1656
1657 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1658 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1659 req->sv1 = newSVsv (fh_or_path);
1660
1661 if (SvPOK (fh_or_path))
1662 {
1663 req->type = REQ_UTIME;
1664 req->ptr1 = SvPVbyte_nolen (req->sv1);
1665 }
1666 else
1667 {
1668 req->type = REQ_FUTIME;
1669 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1670 }
1671
1672 REQ_SEND;
1673}
1674
1675void
1676aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1677 PPCODE:
1678{
1679 dREQ;
1680
1681 req->sv1 = newSVsv (fh_or_path);
1682 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1683
1684 if (SvPOK (fh_or_path))
1685 {
1686 req->type = REQ_TRUNCATE;
1687 req->ptr1 = SvPVbyte_nolen (req->sv1);
1688 }
1689 else
1690 {
1691 req->type = REQ_FTRUNCATE;
1692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1693 }
1694
1695 REQ_SEND;
1696}
1697
1698void
1699aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1700 PPCODE:
1701{
1702 dREQ;
1703
1704 req->mode = mode;
1705 req->sv1 = newSVsv (fh_or_path);
1706
1707 if (SvPOK (fh_or_path))
1708 {
1709 req->type = REQ_CHMOD;
1710 req->ptr1 = SvPVbyte_nolen (req->sv1);
1711 }
1712 else
1713 {
1714 req->type = REQ_FCHMOD;
1715 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1716 }
1717
1718 REQ_SEND;
1719}
1720
1721void
1722aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1723 PPCODE:
1724{
1725 dREQ;
1726
1727 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1728 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1729 req->sv1 = newSVsv (fh_or_path);
1730
1731 if (SvPOK (fh_or_path))
1732 {
1733 req->type = REQ_CHOWN;
1734 req->ptr1 = SvPVbyte_nolen (req->sv1);
1735 }
1736 else
1737 {
1738 req->type = REQ_FCHOWN;
1739 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1740 }
1741
1742 REQ_SEND;
1743}
1744
1745void
1413aio_unlink (pathname,callback=&PL_sv_undef) 1746aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1414 SV * pathname
1415 SV * callback
1416 ALIAS: 1747 ALIAS:
1417 aio_unlink = REQ_UNLINK 1748 aio_unlink = REQ_UNLINK
1418 aio_rmdir = REQ_RMDIR 1749 aio_rmdir = REQ_RMDIR
1419 aio_readdir = REQ_READDIR 1750 aio_readdir = REQ_READDIR
1420 PPCODE: 1751 PPCODE:
1421{ 1752{
1422 dREQ; 1753 dREQ;
1423 1754
1424 req->type = ix; 1755 req->type = ix;
1425 req->data = newSVsv (pathname); 1756 req->sv1 = newSVsv (pathname);
1426 req->dataptr = SvPVbyte_nolen (req->data); 1757 req->ptr1 = SvPVbyte_nolen (req->sv1);
1758
1759 REQ_SEND;
1760}
1761
1762void
1763aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1764 PPCODE:
1765{
1766 dREQ;
1427 1767
1768 req->type = REQ_MKDIR;
1769 req->sv1 = newSVsv (pathname);
1770 req->ptr1 = SvPVbyte_nolen (req->sv1);
1771 req->mode = mode;
1772
1428 REQ_SEND; 1773 REQ_SEND;
1429} 1774}
1430 1775
1431void 1776void
1432aio_link (oldpath,newpath,callback=&PL_sv_undef) 1777aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1433 SV * oldpath
1434 SV * newpath
1435 SV * callback
1436 ALIAS: 1778 ALIAS:
1437 aio_link = REQ_LINK 1779 aio_link = REQ_LINK
1438 aio_symlink = REQ_SYMLINK 1780 aio_symlink = REQ_SYMLINK
1439 aio_rename = REQ_RENAME 1781 aio_rename = REQ_RENAME
1440 PPCODE: 1782 PPCODE:
1441{ 1783{
1442 dREQ; 1784 dREQ;
1443 1785
1444 req->type = ix; 1786 req->type = ix;
1445 req->fh = newSVsv (oldpath); 1787 req->sv2 = newSVsv (oldpath);
1446 req->data2ptr = SvPVbyte_nolen (req->fh); 1788 req->ptr2 = SvPVbyte_nolen (req->sv2);
1447 req->data = newSVsv (newpath); 1789 req->sv1 = newSVsv (newpath);
1448 req->dataptr = SvPVbyte_nolen (req->data); 1790 req->ptr1 = SvPVbyte_nolen (req->sv1);
1449 1791
1450 REQ_SEND; 1792 REQ_SEND;
1451} 1793}
1452 1794
1453void 1795void
1454aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1796aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1455 SV * pathname
1456 SV * callback
1457 UV mode
1458 UV dev
1459 PPCODE: 1797 PPCODE:
1460{ 1798{
1461 dREQ; 1799 dREQ;
1462 1800
1463 req->type = REQ_MKNOD; 1801 req->type = REQ_MKNOD;
1464 req->data = newSVsv (pathname); 1802 req->sv1 = newSVsv (pathname);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1803 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 req->mode = (mode_t)mode; 1804 req->mode = (mode_t)mode;
1467 req->offset = dev; 1805 req->offs = dev;
1468 1806
1469 REQ_SEND; 1807 REQ_SEND;
1470} 1808}
1471 1809
1472void 1810void
1473aio_busy (delay,callback=&PL_sv_undef) 1811aio_busy (double delay, SV *callback=&PL_sv_undef)
1474 double delay
1475 SV * callback
1476 PPCODE: 1812 PPCODE:
1477{ 1813{
1478 dREQ; 1814 dREQ;
1479 1815
1480 req->type = REQ_BUSY; 1816 req->type = REQ_BUSY;
1481 req->fd = delay < 0. ? 0 : delay; 1817 req->nv1 = delay < 0. ? 0. : delay;
1482 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1483 1818
1484 REQ_SEND; 1819 REQ_SEND;
1485} 1820}
1486 1821
1487void 1822void
1488aio_group (callback=&PL_sv_undef) 1823aio_group (SV *callback=&PL_sv_undef)
1489 SV * callback
1490 PROTOTYPE: ;$ 1824 PROTOTYPE: ;$
1491 PPCODE: 1825 PPCODE:
1492{ 1826{
1493 dREQ; 1827 dREQ;
1494 1828
1495 req->type = REQ_GROUP; 1829 req->type = REQ_GROUP;
1830
1496 req_send (req); 1831 req_send (req);
1497
1498 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1832 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1499} 1833}
1500 1834
1501void 1835void
1502aio_nop (callback=&PL_sv_undef) 1836aio_nop (SV *callback=&PL_sv_undef)
1503 SV * callback
1504 PPCODE: 1837 PPCODE:
1505{ 1838{
1506 dREQ; 1839 dREQ;
1507 1840
1508 req->type = REQ_NOP; 1841 req->type = REQ_NOP;
… …
1537 PROTOTYPE: 1870 PROTOTYPE:
1538 CODE: 1871 CODE:
1539 while (nreqs) 1872 while (nreqs)
1540 { 1873 {
1541 poll_wait (); 1874 poll_wait ();
1542 poll_cb (0); 1875 poll_cb ();
1543 } 1876 }
1544 1877
1545void 1878int
1546poll() 1879poll()
1547 PROTOTYPE: 1880 PROTOTYPE:
1548 CODE: 1881 CODE:
1549 if (nreqs)
1550 {
1551 poll_wait (); 1882 poll_wait ();
1552 poll_cb (0); 1883 RETVAL = poll_cb ();
1553 } 1884 OUTPUT:
1885 RETVAL
1554 1886
1555int 1887int
1556poll_fileno() 1888poll_fileno()
1557 PROTOTYPE: 1889 PROTOTYPE:
1558 CODE: 1890 CODE:
… …
1562 1894
1563int 1895int
1564poll_cb(...) 1896poll_cb(...)
1565 PROTOTYPE: 1897 PROTOTYPE:
1566 CODE: 1898 CODE:
1567 RETVAL = poll_cb (0); 1899 RETVAL = poll_cb ();
1568 OUTPUT:
1569 RETVAL
1570
1571int
1572poll_some(int max = 0)
1573 PROTOTYPE: $
1574 CODE:
1575 RETVAL = poll_cb (max);
1576 OUTPUT: 1900 OUTPUT:
1577 RETVAL 1901 RETVAL
1578 1902
1579void 1903void
1580poll_wait() 1904poll_wait()
1581 PROTOTYPE: 1905 PROTOTYPE:
1582 CODE: 1906 CODE:
1583 if (nreqs)
1584 poll_wait (); 1907 poll_wait ();
1908
1909void
1910setsig (int signum = SIGIO)
1911 PROTOTYPE: ;$
1912 CODE:
1913{
1914 if (block_sig_level)
1915 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1916
1917 X_LOCK (reslock);
1918 main_tid = pthread_self ();
1919 main_sig = signum;
1920 X_UNLOCK (reslock);
1921
1922 if (main_sig && npending)
1923 pthread_kill (main_tid, main_sig);
1924}
1925
1926void
1927aio_block (SV *cb)
1928 PROTOTYPE: &
1929 PPCODE:
1930{
1931 int count;
1932
1933 block_sig ();
1934 PUSHMARK (SP);
1935 PUTBACK;
1936 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1937 SPAGAIN;
1938 unblock_sig ();
1939
1940 if (SvTRUE (ERRSV))
1941 croak (0);
1942
1943 XSRETURN (count);
1944}
1585 1945
1586int 1946int
1587nreqs() 1947nreqs()
1588 PROTOTYPE: 1948 PROTOTYPE:
1589 CODE: 1949 CODE:
… …
1605 CODE: 1965 CODE:
1606 RETVAL = get_npending (); 1966 RETVAL = get_npending ();
1607 OUTPUT: 1967 OUTPUT:
1608 RETVAL 1968 RETVAL
1609 1969
1970int
1971nthreads()
1972 PROTOTYPE:
1973 CODE:
1974 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1975 RETVAL = started;
1976 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1977 OUTPUT:
1978 RETVAL
1979
1610PROTOTYPES: DISABLE 1980PROTOTYPES: DISABLE
1611 1981
1612MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1982MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1613 1983
1614void 1984void
… …
1629 PPCODE: 1999 PPCODE:
1630{ 2000{
1631 int i; 2001 int i;
1632 aio_req req; 2002 aio_req req;
1633 2003
2004 if (main_sig && !block_sig_level)
2005 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2006
1634 if (grp->fd == 2) 2007 if (grp->int1 == 2)
1635 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 2008 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1636 2009
1637 for (i = 1; i < items; ++i ) 2010 for (i = 1; i < items; ++i )
1638 { 2011 {
1639 if (GIMME_V != G_VOID) 2012 if (GIMME_V != G_VOID)
… …
1641 2014
1642 req = SvAIO_REQ (ST (i)); 2015 req = SvAIO_REQ (ST (i));
1643 2016
1644 if (req) 2017 if (req)
1645 { 2018 {
1646 ++grp->length; 2019 ++grp->size;
1647 req->grp = grp; 2020 req->grp = grp;
1648 2021
1649 req->grp_prev = 0; 2022 req->grp_prev = 0;
1650 req->grp_next = grp->grp_first; 2023 req->grp_next = grp->grp_first;
1651 2024
… …
1674 av = newAV (); 2047 av = newAV ();
1675 2048
1676 for (i = 1; i < items; ++i ) 2049 for (i = 1; i < items; ++i )
1677 av_push (av, newSVsv (ST (i))); 2050 av_push (av, newSVsv (ST (i)));
1678 2051
1679 SvREFCNT_dec (grp->data); 2052 SvREFCNT_dec (grp->sv1);
1680 grp->data = (SV *)av; 2053 grp->sv1 = (SV *)av;
1681} 2054}
1682 2055
1683void 2056void
1684errno (aio_req grp, int errorno = errno) 2057errno (aio_req grp, int errorno = errno)
1685 CODE: 2058 CODE:
1686 grp->errorno = errorno; 2059 grp->errorno = errorno;
1687 2060
1688void 2061void
1689limit (aio_req grp, int limit) 2062limit (aio_req grp, int limit)
1690 CODE: 2063 CODE:
1691 grp->fd2 = limit; 2064 grp->int2 = limit;
1692 aio_grp_feed (grp); 2065 aio_grp_feed (grp);
1693 2066
1694void 2067void
1695feed (aio_req grp, SV *callback=&PL_sv_undef) 2068feed (aio_req grp, SV *callback=&PL_sv_undef)
1696 CODE: 2069 CODE:
1697{ 2070{
1698 SvREFCNT_dec (grp->fh2); 2071 SvREFCNT_dec (grp->sv2);
1699 grp->fh2 = newSVsv (callback); 2072 grp->sv2 = newSVsv (callback);
1700 2073
1701 if (grp->fd2 <= 0) 2074 if (grp->int2 <= 0)
1702 grp->fd2 = 2; 2075 grp->int2 = 2;
1703 2076
1704 aio_grp_feed (grp); 2077 aio_grp_feed (grp);
1705} 2078}
1706 2079

Diff Legend

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