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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines