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.78 by root, Thu Oct 26 14:35:34 2006 UTC vs.
Revision 1.104 by root, Sun Jul 8 11:05:36 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines