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

Diff Legend

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