ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines