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.81 by root, Fri Oct 27 20:10:06 2006 UTC vs.
Revision 1.113 by root, Wed Apr 16 16:45:18 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines