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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines