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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.83 by root, Sat Oct 28 00:17:30 2006 UTC vs.
Revision 1.109 by root, Sat Oct 6 14:05:19 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h"
18
19#include <pthread.h>
20
21#include <stddef.h> 9#include <stddef.h>
10#include <stdlib.h>
22#include <errno.h> 11#include <errno.h>
23#include <sys/time.h>
24#include <sys/select.h>
25#include <sys/types.h> 12#include <sys/types.h>
26#include <sys/stat.h> 13#include <sys/stat.h>
27#include <limits.h> 14#include <limits.h>
28#include <unistd.h>
29#include <fcntl.h> 15#include <fcntl.h>
30#include <signal.h>
31#include <sched.h> 16#include <sched.h>
17
18#ifdef _WIN32
19
20# define SIGIO 0
21 typedef Direntry_t X_DIRENT;
22#undef malloc
23#undef free
24
25// perl overrides all those nice win32 functions
26# undef open
27# undef read
28# undef write
29# undef send
30# undef recv
31# undef stat
32# undef fstat
33# define lstat stat
34# undef truncate
35# undef ftruncate
36# undef open
37# undef close
38# undef unlink
39# undef rmdir
40# undef rename
41# undef lseek
42
43# define chown(a,b,c) (errno = ENOSYS, -1)
44# define fchown(a,b,c) (errno = ENOSYS, -1)
45# define fchmod(a,b) (errno = ENOSYS, -1)
46# define symlink(a,b) (errno = ENOSYS, -1)
47# define readlink(a,b,c) (errno = ENOSYS, -1)
48# define mknod(a,b,c) (errno = ENOSYS, -1)
49# define truncate(a,b) (errno = ENOSYS, -1)
50# define ftruncate(fd,o) chsize ((fd), (o))
51# define fsync(fd) _commit (fd)
52# define opendir(fd) (errno = ENOSYS, 0)
53# define readdir(fd) (errno = ENOSYS, -1)
54# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a)
56
57#else
58
59# include "autoconf/config.h"
60# include <sys/time.h>
61# include <sys/select.h>
62# include <unistd.h>
63# include <utime.h>
64# include <signal.h>
65 typedef struct dirent X_DIRENT;
66
67#endif
32 68
33#if HAVE_SENDFILE 69#if HAVE_SENDFILE
34# if __linux 70# if __linux
35# include <sys/sendfile.h> 71# include <sys/sendfile.h>
36# elif __freebsd 72# elif __freebsd
43# else 79# else
44# error sendfile support requested but not available 80# error sendfile support requested but not available
45# endif 81# endif
46#endif 82#endif
47 83
84/* number of seconds after which idle threads exit */
85#define IDLE_TIMEOUT 10
86
48/* used for struct dirent, AIX doesn't provide it */ 87/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 88#ifndef NAME_MAX
50# define NAME_MAX 4096 89# define NAME_MAX 4096
51#endif 90#endif
52 91
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
58#if __ia64
59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
62#else
63# define STACKSIZE 16384
64#endif
65
66/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes.
69 */
70#ifndef WORDREAD_UNSAFE
71# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0
73# else
74# define WORDREAD_UNSAFE 1
75# endif
76#endif
77
78/* buffer size for various temporary buffers */ 92/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 93#define AIO_BUFSIZE 65536
80 94
95/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8
97# define SvVAL64 SvIV
98#else
99# define SvVAL64 SvNV
100#endif
101
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_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 ()
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 ()
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 ()
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 ()
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 ()
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 ();
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 ()
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 ()
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 LOCK (reqlock); 758 X_LOCK (reqlock);
616 reqq_push (&req_queue, req); 759 reqq_push (&req_queue, req);
617 pthread_cond_signal (&reqwait); 760 X_COND_SIGNAL (reqwait);
618 UNLOCK (reqlock); 761 X_UNLOCK (reqlock);
619 762
620 LOCK (wrklock); 763 X_LOCK (wrklock);
621 --started; 764 --started;
622 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);
623} 773}
624 774
625static void min_parallel (int nthreads) 775static void min_parallel (int nthreads)
626{ 776{
627 if (wanted < nthreads) 777 if (wanted < nthreads)
642 fd_set rfd; 792 fd_set rfd;
643 793
644 while (nreqs) 794 while (nreqs)
645 { 795 {
646 int size; 796 int size;
647 if (WORDREAD_UNSAFE) LOCK (reslock); 797 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
648 size = res_queue.size; 798 size = res_queue.size;
649 if (WORDREAD_UNSAFE) UNLOCK (reslock); 799 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
650 800
651 if (size) 801 if (size)
652 return; 802 return;
653 803
654 maybe_start_thread (); 804 maybe_start_thread ();
655 805
656 FD_ZERO(&rfd); 806 FD_ZERO (&rfd);
657 FD_SET(respipe [0], &rfd); 807 FD_SET (respipe [0], &rfd);
658 808
659 select (respipe [0] + 1, &rfd, 0, 0, 0); 809 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
660 } 810 }
661} 811}
662 812
663static int poll_cb (int max) 813static int poll_cb ()
664{ 814{
665 dSP; 815 dSP;
666 int count = 0; 816 int count = 0;
817 int maxreqs = max_poll_reqs;
667 int do_croak = 0; 818 int do_croak = 0;
819 struct timeval tv_start, tv_now;
668 aio_req req; 820 aio_req req;
821
822 if (max_poll_time)
823 gettimeofday (&tv_start, 0);
824
825 block_sig ();
669 826
670 for (;;) 827 for (;;)
671 { 828 {
672 while (max <= 0 || count < max) 829 for (;;)
673 { 830 {
674 maybe_start_thread (); 831 maybe_start_thread ();
675 832
676 LOCK (reslock); 833 X_LOCK (reslock);
677 req = reqq_shift (&res_queue); 834 req = reqq_shift (&res_queue);
678 835
679 if (req) 836 if (req)
680 { 837 {
681 --npending; 838 --npending;
682 839
683 if (!res_queue.size) 840 if (!res_queue.size)
684 { 841 {
685 /* read any signals sent by the worker threads */ 842 /* read any signals sent by the worker threads */
686 char buf [32]; 843 char buf [4];
687 while (read (respipe [0], buf, 32) == 32) 844 while (respipe_read (respipe [0], buf, 4) == 4)
688 ; 845 ;
689 } 846 }
690 } 847 }
691 848
692 UNLOCK (reslock); 849 X_UNLOCK (reslock);
693 850
694 if (!req) 851 if (!req)
695 break; 852 break;
696 853
697 --nreqs; 854 --nreqs;
698 855
699 if (req->type == REQ_GROUP && req->length) 856 if (req->type == REQ_GROUP && req->size)
700 { 857 {
701 req->fd = 1; /* mark request as delayed */ 858 req->int1 = 1; /* mark request as delayed */
702 continue; 859 continue;
703 } 860 }
704 else 861 else
705 { 862 {
706 if (req->type == REQ_READ) 863 if (!req_invoke (req))
707 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
708
709 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
710 SvREADONLY_off (req->data);
711
712 if (req->statdata)
713 { 864 {
714 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 865 req_destroy (req);
715 PL_laststatval = req->result; 866 unblock_sig ();
716 PL_statcache = *(req->statdata); 867 croak (0);
717 } 868 }
718
719 req_invoke (req);
720 869
721 count++; 870 count++;
722 } 871 }
723 872
724 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 }
725 } 885 }
726 886
727 if (nreqs <= max_outstanding) 887 if (nreqs <= max_outstanding)
728 break; 888 break;
729 889
730 poll_wait (); 890 poll_wait ();
731 891
732 max = 0; 892 ++maxreqs;
733 } 893 }
734 894
895 unblock_sig ();
735 return count; 896 return count;
736}
737
738static void create_pipe ()
739{
740 if (pipe (respipe))
741 croak ("unable to initialize result pipe");
742
743 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
744 croak ("cannot set result pipe to nonblocking mode");
745
746 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
747 croak ("cannot set result pipe to nonblocking mode");
748} 897}
749 898
750/*****************************************************************************/ 899/*****************************************************************************/
751/* work around various missing functions */ 900/* work around various missing functions */
752 901
757/* 906/*
758 * make our pread/pwrite safe against themselves, but not against 907 * make our pread/pwrite safe against themselves, but not against
759 * 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,
760 * but that's your problem, not mine. 909 * but that's your problem, not mine.
761 */ 910 */
762static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 911static mutex_t preadwritelock = X_MUTEX_INIT;
763 912
764static 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)
765{ 914{
766 ssize_t res; 915 ssize_t res;
767 off_t ooffset; 916 off_t ooffset;
768 917
769 LOCK (preadwritelock); 918 X_LOCK (preadwritelock);
770 ooffset = lseek (fd, 0, SEEK_CUR); 919 ooffset = lseek (fd, 0, SEEK_CUR);
771 lseek (fd, offset, SEEK_SET); 920 lseek (fd, offset, SEEK_SET);
772 res = read (fd, buf, count); 921 res = read (fd, buf, count);
773 lseek (fd, ooffset, SEEK_SET); 922 lseek (fd, ooffset, SEEK_SET);
774 UNLOCK (preadwritelock); 923 X_UNLOCK (preadwritelock);
775 924
776 return res; 925 return res;
777} 926}
778 927
779static 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)
780{ 929{
781 ssize_t res; 930 ssize_t res;
782 off_t ooffset; 931 off_t ooffset;
783 932
784 LOCK (preadwritelock); 933 X_LOCK (preadwritelock);
785 ooffset = lseek (fd, 0, SEEK_CUR); 934 ooffset = lseek (fd, 0, SEEK_CUR);
786 lseek (fd, offset, SEEK_SET); 935 lseek (fd, offset, SEEK_SET);
787 res = write (fd, buf, count); 936 res = write (fd, buf, count);
788 lseek (fd, offset, SEEK_SET); 937 lseek (fd, offset, SEEK_SET);
789 UNLOCK (preadwritelock); 938 X_UNLOCK (preadwritelock);
790 939
791 return res; 940 return res;
792} 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
793#endif 970#endif
794 971
795#if !HAVE_FDATASYNC 972#if !HAVE_FDATASYNC
796# define fdatasync fsync 973# define fdatasync fsync
797#endif 974#endif
799#if !HAVE_READAHEAD 976#if !HAVE_READAHEAD
800# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 977# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
801 978
802static 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)
803{ 980{
981 size_t todo = count;
804 dBUF; 982 dBUF;
805 983
806 while (count > 0) 984 while (todo > 0)
807 { 985 {
808 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 986 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
809 987
810 pread (fd, aio_buf, len, offset); 988 pread (fd, aio_buf, len, offset);
811 offset += len; 989 offset += len;
812 count -= len; 990 todo -= len;
813 } 991 }
814 992
815 errno = 0; 993 errno = 0;
994 return count;
816} 995}
817 996
818#endif 997#endif
819 998
820#if !HAVE_READDIR_R 999#if !HAVE_READDIR_R
821# define readdir_r aio_readdir_r 1000# define readdir_r aio_readdir_r
822 1001
823static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 1002static mutex_t readdirlock = X_MUTEX_INIT;
824 1003
825static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 1004static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
826{ 1005{
827 struct dirent *e; 1006 X_DIRENT *e;
828 int errorno; 1007 int errorno;
829 1008
830 LOCK (readdirlock); 1009 X_LOCK (readdirlock);
831 1010
832 e = readdir (dirp); 1011 e = readdir (dirp);
833 errorno = errno; 1012 errorno = errno;
834 1013
835 if (e) 1014 if (e)
838 strcpy (ent->d_name, e->d_name); 1017 strcpy (ent->d_name, e->d_name);
839 } 1018 }
840 else 1019 else
841 *res = 0; 1020 *res = 0;
842 1021
843 UNLOCK (readdirlock); 1022 X_UNLOCK (readdirlock);
844 1023
845 errno = errorno; 1024 errno = errorno;
846 return e ? 0 : -1; 1025 return e ? 0 : -1;
847} 1026}
848#endif 1027#endif
944static void scandir_ (aio_req req, worker *self) 1123static void scandir_ (aio_req req, worker *self)
945{ 1124{
946 DIR *dirp; 1125 DIR *dirp;
947 union 1126 union
948 { 1127 {
949 struct dirent d; 1128 X_DIRENT d;
950 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1129 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
951 } *u; 1130 } *u;
952 struct dirent *entp; 1131 X_DIRENT *entp;
953 char *name, *names; 1132 char *name, *names;
954 int memlen = 4096; 1133 int memlen = 4096;
955 int memofs = 0; 1134 int memofs = 0;
956 int res = 0; 1135 int res = 0;
957 int errorno;
958 1136
959 LOCK (wrklock); 1137 X_LOCK (wrklock);
960 self->dirp = dirp = opendir (req->dataptr); 1138 self->dirp = dirp = opendir (req->ptr1);
961 self->dbuf = u = malloc (sizeof (*u)); 1139 self->dbuf = u = malloc (sizeof (*u));
1140 req->flags |= FLAG_PTR2_FREE;
962 req->data2ptr = names = malloc (memlen); 1141 req->ptr2 = names = malloc (memlen);
963 UNLOCK (wrklock); 1142 X_UNLOCK (wrklock);
964 1143
965 if (dirp && u && names) 1144 if (dirp && u && names)
966 for (;;) 1145 for (;;)
967 { 1146 {
968 errno = 0; 1147 errno = 0;
980 res++; 1159 res++;
981 1160
982 while (memofs + len > memlen) 1161 while (memofs + len > memlen)
983 { 1162 {
984 memlen *= 2; 1163 memlen *= 2;
985 LOCK (wrklock); 1164 X_LOCK (wrklock);
986 req->data2ptr = names = realloc (names, memlen); 1165 req->ptr2 = names = realloc (names, memlen);
987 UNLOCK (wrklock); 1166 X_UNLOCK (wrklock);
988 1167
989 if (!names) 1168 if (!names)
990 break; 1169 break;
991 } 1170 }
992 1171
1001 req->result = res; 1180 req->result = res;
1002} 1181}
1003 1182
1004/*****************************************************************************/ 1183/*****************************************************************************/
1005 1184
1006static void *aio_proc (void *thr_arg) 1185X_THREAD_PROC (aio_proc)
1007{ 1186{
1187 {//D
1008 aio_req req; 1188 aio_req req;
1189 struct timespec ts;
1009 worker *self = (worker *)thr_arg; 1190 worker *self = (worker *)thr_arg;
1191
1192 /* try to distribute timeouts somewhat randomly */
1193 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1010 1194
1011 for (;;) 1195 for (;;)
1012 { 1196 {
1197 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1198
1013 LOCK (reqlock); 1199 X_LOCK (reqlock);
1014 1200
1015 for (;;) 1201 for (;;)
1016 { 1202 {
1017 self->req = req = reqq_shift (&req_queue); 1203 self->req = req = reqq_shift (&req_queue);
1018 1204
1019 if (req) 1205 if (req)
1020 break; 1206 break;
1021 1207
1022 pthread_cond_wait (&reqwait, &reqlock); 1208 ++idle;
1209
1210 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1211 == ETIMEDOUT)
1212 {
1213 if (idle > max_idle)
1214 {
1215 --idle;
1216 X_UNLOCK (reqlock);
1217 X_LOCK (wrklock);
1218 --started;
1219 X_UNLOCK (wrklock);
1220 goto quit;
1221 }
1222
1223 /* we are allowed to idle, so do so without any timeout */
1224 X_COND_WAIT (reqwait, reqlock);
1225 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1226 }
1227
1228 --idle;
1023 } 1229 }
1024 1230
1025 --nready; 1231 --nready;
1026 1232
1027 UNLOCK (reqlock); 1233 X_UNLOCK (reqlock);
1028 1234
1029 errno = 0; /* strictly unnecessary */ 1235 errno = 0; /* strictly unnecessary */
1030 1236
1031 if (!(req->flags & FLAG_CANCELLED)) 1237 if (!(req->flags & FLAG_CANCELLED))
1032 switch (req->type) 1238 switch (req->type)
1033 { 1239 {
1034 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1240 case REQ_READ: req->result = req->offs >= 0
1035 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1241 ? pread (req->int1, req->ptr1, req->size, req->offs)
1242 : read (req->int1, req->ptr1, req->size); break;
1243 case REQ_WRITE: req->result = req->offs >= 0
1244 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1245 : write (req->int1, req->ptr1, req->size); break;
1036 1246
1037 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1247 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1038 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1248 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1039 1249
1040 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1250 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1041 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1251 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1042 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1252 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1043 1253
1254 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1255 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1256 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1257 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1258 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1259 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1260
1044 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1261 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1045 case REQ_CLOSE: req->result = close (req->fd); break; 1262 case REQ_CLOSE: req->result = close (req->int1); break;
1046 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1263 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1047 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1264 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1265 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1048 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1266 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1049 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1267 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1050 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1268 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1051 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1269 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1270 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1052 1271
1053 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1272 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1054 case REQ_FSYNC: req->result = fsync (req->fd); break; 1273 case REQ_FSYNC: req->result = fsync (req->int1); break;
1055 case REQ_READDIR: scandir_ (req, self); break; 1274 case REQ_READDIR: scandir_ (req, self); break;
1056 1275
1057 case REQ_BUSY: 1276 case REQ_BUSY:
1277#ifdef _WIN32
1278 Sleep (req->nv1 * 1000.);
1279#else
1058 { 1280 {
1059 struct timeval tv; 1281 struct timeval tv;
1060 1282
1061 tv.tv_sec = req->fd; 1283 tv.tv_sec = req->nv1;
1062 tv.tv_usec = req->fd2; 1284 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1063 1285
1064 req->result = select (0, 0, 0, 0, &tv); 1286 req->result = select (0, 0, 0, 0, &tv);
1287 }
1288#endif
1289 break;
1290
1291 case REQ_UTIME:
1292 case REQ_FUTIME:
1293 {
1294 struct timeval tv[2];
1295 struct timeval *times;
1296
1297 if (req->nv1 != -1. || req->nv2 != -1.)
1298 {
1299 tv[0].tv_sec = req->nv1;
1300 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1301 tv[1].tv_sec = req->nv2;
1302 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1303
1304 times = tv;
1305 }
1306 else
1307 times = 0;
1308
1309
1310 req->result = req->type == REQ_FUTIME
1311 ? futimes (req->int1, times)
1312 : utimes (req->ptr1, times);
1065 } 1313 }
1066 1314
1067 case REQ_GROUP: 1315 case REQ_GROUP:
1068 case REQ_NOP: 1316 case REQ_NOP:
1069 break; 1317 break;
1070 1318
1071 case REQ_QUIT: 1319 case REQ_QUIT:
1072 LOCK (wrklock); 1320 goto quit;
1073 worker_free (self);
1074 --started;
1075 UNLOCK (wrklock);
1076 return 0;
1077 1321
1078 default: 1322 default:
1079 req->result = ENOSYS; 1323 req->result = -1;
1080 break; 1324 break;
1081 } 1325 }
1082 1326
1083 req->errorno = errno; 1327 req->errorno = errno;
1084 1328
1085 LOCK (reslock); 1329 X_LOCK (reslock);
1086 1330
1087 ++npending; 1331 ++npending;
1088 1332
1089 if (!reqq_push (&res_queue, req)) 1333 if (!reqq_push (&res_queue, req))
1334 {
1090 /* write a dummy byte to the pipe so fh becomes ready */ 1335 /* write a dummy byte to the pipe so fh becomes ready */
1091 write (respipe [1], &respipe, 1); 1336 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1337
1338 /* optionally signal the main thread asynchronously */
1339 if (main_sig)
1340 pthread_kill (main_tid, main_sig);
1341 }
1092 1342
1093 self->req = 0; 1343 self->req = 0;
1094 worker_clear (self); 1344 worker_clear (self);
1095 1345
1096 UNLOCK (reslock); 1346 X_UNLOCK (reslock);
1097 } 1347 }
1348
1349quit:
1350 X_LOCK (wrklock);
1351 worker_free (self);
1352 X_UNLOCK (wrklock);
1353
1354 return 0;
1355 }//D
1098} 1356}
1099 1357
1100/*****************************************************************************/ 1358/*****************************************************************************/
1101 1359
1102static void atfork_prepare (void) 1360static void atfork_prepare (void)
1103{ 1361{
1104 LOCK (wrklock); 1362 X_LOCK (wrklock);
1105 LOCK (reqlock); 1363 X_LOCK (reqlock);
1106 LOCK (reslock); 1364 X_LOCK (reslock);
1107#if !HAVE_PREADWRITE 1365#if !HAVE_PREADWRITE
1108 LOCK (preadwritelock); 1366 X_LOCK (preadwritelock);
1109#endif 1367#endif
1110#if !HAVE_READDIR_R 1368#if !HAVE_READDIR_R
1111 LOCK (readdirlock); 1369 X_LOCK (readdirlock);
1112#endif 1370#endif
1113} 1371}
1114 1372
1115static void atfork_parent (void) 1373static void atfork_parent (void)
1116{ 1374{
1117#if !HAVE_READDIR_R 1375#if !HAVE_READDIR_R
1118 UNLOCK (readdirlock); 1376 X_UNLOCK (readdirlock);
1119#endif 1377#endif
1120#if !HAVE_PREADWRITE 1378#if !HAVE_PREADWRITE
1121 UNLOCK (preadwritelock); 1379 X_UNLOCK (preadwritelock);
1122#endif 1380#endif
1123 UNLOCK (reslock); 1381 X_UNLOCK (reslock);
1124 UNLOCK (reqlock); 1382 X_UNLOCK (reqlock);
1125 UNLOCK (wrklock); 1383 X_UNLOCK (wrklock);
1126} 1384}
1127 1385
1128static void atfork_child (void) 1386static void atfork_child (void)
1129{ 1387{
1130 aio_req prv; 1388 aio_req prv;
1131 1389
1132 while (prv = reqq_shift (&req_queue)) 1390 while (prv = reqq_shift (&req_queue))
1133 req_free (prv); 1391 req_destroy (prv);
1134 1392
1135 while (prv = reqq_shift (&res_queue)) 1393 while (prv = reqq_shift (&res_queue))
1136 req_free (prv); 1394 req_destroy (prv);
1137 1395
1138 while (wrk_first.next != &wrk_first) 1396 while (wrk_first.next != &wrk_first)
1139 { 1397 {
1140 worker *wrk = wrk_first.next; 1398 worker *wrk = wrk_first.next;
1141 1399
1142 if (wrk->req) 1400 if (wrk->req)
1143 req_free (wrk->req); 1401 req_destroy (wrk->req);
1144 1402
1145 worker_clear (wrk); 1403 worker_clear (wrk);
1146 worker_free (wrk); 1404 worker_free (wrk);
1147 } 1405 }
1148 1406
1149 started = 0; 1407 started = 0;
1408 idle = 0;
1150 nreqs = 0; 1409 nreqs = 0;
1410 nready = 0;
1411 npending = 0;
1151 1412
1152 close (respipe [0]);
1153 close (respipe [1]);
1154 create_pipe (); 1413 create_respipe ();
1155 1414
1156 atfork_parent (); 1415 atfork_parent ();
1157} 1416}
1158 1417
1159#define dREQ \ 1418#define dREQ \
1181 1440
1182PROTOTYPES: ENABLE 1441PROTOTYPES: ENABLE
1183 1442
1184BOOT: 1443BOOT:
1185{ 1444{
1186 HV *stash = gv_stashpv ("IO::AIO", 1); 1445 stash = gv_stashpv ("IO::AIO", 1);
1187 1446
1188 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1189 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1190 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1191 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1192 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1452#ifdef _WIN32
1453 X_MUTEX_CHECK (wrklock);
1454 X_MUTEX_CHECK (reslock);
1455 X_MUTEX_CHECK (reqlock);
1456 X_MUTEX_CHECK (reqwait);
1457 X_MUTEX_CHECK (preadwritelock);
1458 X_MUTEX_CHECK (readdirlock);
1459
1460 X_COND_CHECK (reqwait);
1461#else
1193 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1463 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1464#endif
1194 1465
1195 create_pipe (); 1466 create_respipe ();
1467
1196 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1468 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1197
1198 start_thread ();
1199} 1469}
1470
1471void
1472max_poll_reqs (int nreqs)
1473 PROTOTYPE: $
1474 CODE:
1475 max_poll_reqs = nreqs;
1476
1477void
1478max_poll_time (double nseconds)
1479 PROTOTYPE: $
1480 CODE:
1481 max_poll_time = nseconds * AIO_TICKS;
1200 1482
1201void 1483void
1202min_parallel (int nthreads) 1484min_parallel (int nthreads)
1203 PROTOTYPE: $ 1485 PROTOTYPE: $
1204 1486
1205void 1487void
1206max_parallel (int nthreads) 1488max_parallel (int nthreads)
1207 PROTOTYPE: $ 1489 PROTOTYPE: $
1490
1491void
1492max_idle (int nthreads)
1493 PROTOTYPE: $
1494 CODE:
1495 set_max_idle (nthreads);
1208 1496
1209int 1497int
1210max_outstanding (int maxreqs) 1498max_outstanding (int maxreqs)
1211 PROTOTYPE: $ 1499 PROTOTYPE: $
1212 CODE: 1500 CODE:
1214 max_outstanding = maxreqs; 1502 max_outstanding = maxreqs;
1215 OUTPUT: 1503 OUTPUT:
1216 RETVAL 1504 RETVAL
1217 1505
1218void 1506void
1219aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1507aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1220 SV * pathname
1221 int flags
1222 int mode
1223 SV * callback
1224 PROTOTYPE: $$$;$ 1508 PROTOTYPE: $$$;$
1225 PPCODE: 1509 PPCODE:
1226{ 1510{
1227 dREQ; 1511 dREQ;
1228 1512
1229 req->type = REQ_OPEN; 1513 req->type = REQ_OPEN;
1230 req->data = newSVsv (pathname); 1514 req->sv1 = newSVsv (pathname);
1231 req->dataptr = SvPVbyte_nolen (req->data); 1515 req->ptr1 = SvPVbyte_nolen (req->sv1);
1232 req->fd = flags; 1516 req->int1 = flags;
1233 req->mode = mode; 1517 req->mode = mode;
1234 1518
1235 REQ_SEND; 1519 REQ_SEND;
1236} 1520}
1237 1521
1238void 1522void
1239aio_close (fh,callback=&PL_sv_undef) 1523aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1240 SV * fh
1241 SV * callback
1242 PROTOTYPE: $;$ 1524 PROTOTYPE: $;$
1243 ALIAS: 1525 ALIAS:
1244 aio_close = REQ_CLOSE
1245 aio_fsync = REQ_FSYNC 1526 aio_fsync = REQ_FSYNC
1246 aio_fdatasync = REQ_FDATASYNC 1527 aio_fdatasync = REQ_FDATASYNC
1247 PPCODE: 1528 PPCODE:
1248{ 1529{
1249 dREQ; 1530 dREQ;
1250 1531
1251 req->type = ix; 1532 req->type = ix;
1252 req->fh = newSVsv (fh); 1533 req->sv1 = newSVsv (fh);
1253 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1534 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1254 1535
1255 REQ_SEND (req); 1536 REQ_SEND (req);
1256} 1537}
1257 1538
1539int
1540_dup (int fd)
1541 PROTOTYPE: $
1542 CODE:
1543 RETVAL = dup (fd);
1544 OUTPUT:
1545 RETVAL
1546
1258void 1547void
1548_aio_close (int fd, SV *callback=&PL_sv_undef)
1549 PROTOTYPE: $;$
1550 PPCODE:
1551{
1552 dREQ;
1553
1554 req->type = REQ_CLOSE;
1555 req->int1 = fd;
1556
1557 REQ_SEND (req);
1558}
1559
1560void
1259aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1561aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1260 SV * fh
1261 UV offset
1262 UV length
1263 SV * data
1264 UV dataoffset
1265 SV * callback
1266 ALIAS: 1562 ALIAS:
1267 aio_read = REQ_READ 1563 aio_read = REQ_READ
1268 aio_write = REQ_WRITE 1564 aio_write = REQ_WRITE
1269 PROTOTYPE: $$$$$;$ 1565 PROTOTYPE: $$$$$;$
1270 PPCODE: 1566 PPCODE:
1271{ 1567{
1272 aio_req req;
1273 STRLEN svlen; 1568 STRLEN svlen;
1274 char *svptr = SvPVbyte (data, svlen); 1569 char *svptr = SvPVbyte (data, svlen);
1570 UV len = SvUV (length);
1275 1571
1276 SvUPGRADE (data, SVt_PV); 1572 SvUPGRADE (data, SVt_PV);
1277 SvPOK_on (data); 1573 SvPOK_on (data);
1278 1574
1279 if (dataoffset < 0) 1575 if (dataoffset < 0)
1280 dataoffset += svlen; 1576 dataoffset += svlen;
1281 1577
1282 if (dataoffset < 0 || dataoffset > svlen) 1578 if (dataoffset < 0 || dataoffset > svlen)
1283 croak ("data offset outside of string"); 1579 croak ("dataoffset outside of data scalar");
1284 1580
1285 if (ix == REQ_WRITE) 1581 if (ix == REQ_WRITE)
1286 { 1582 {
1287 /* write: check length and adjust. */ 1583 /* write: check length and adjust. */
1288 if (length < 0 || length + dataoffset > svlen) 1584 if (!SvOK (length) || len + dataoffset > svlen)
1289 length = svlen - dataoffset; 1585 len = svlen - dataoffset;
1290 } 1586 }
1291 else 1587 else
1292 { 1588 {
1293 /* read: grow scalar as necessary */ 1589 /* read: grow scalar as necessary */
1294 svptr = SvGROW (data, length + dataoffset); 1590 svptr = SvGROW (data, len + dataoffset + 1);
1295 } 1591 }
1296 1592
1297 if (length < 0) 1593 if (len < 0)
1298 croak ("length must not be negative"); 1594 croak ("length must not be negative");
1299 1595
1300 { 1596 {
1301 dREQ; 1597 dREQ;
1302 1598
1303 req->type = ix; 1599 req->type = ix;
1304 req->fh = newSVsv (fh); 1600 req->sv1 = newSVsv (fh);
1305 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1601 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1306 : IoOFP (sv_2io (fh))); 1602 : IoOFP (sv_2io (fh)));
1603 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1307 req->offset = offset; 1604 req->size = len;
1308 req->length = length;
1309 req->data = SvREFCNT_inc (data); 1605 req->sv2 = SvREFCNT_inc (data);
1310 req->dataptr = (char *)svptr + dataoffset; 1606 req->ptr1 = (char *)svptr + dataoffset;
1607 req->stroffset = dataoffset;
1311 1608
1312 if (!SvREADONLY (data)) 1609 if (!SvREADONLY (data))
1313 { 1610 {
1314 SvREADONLY_on (data); 1611 SvREADONLY_on (data);
1315 req->data2ptr = (void *)data; 1612 req->flags |= FLAG_SV2_RO_OFF;
1316 } 1613 }
1317 1614
1318 REQ_SEND; 1615 REQ_SEND;
1319 } 1616 }
1320} 1617}
1321 1618
1322void 1619void
1620aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1621 PROTOTYPE: $$;$
1622 PPCODE:
1623{
1624 SV *data;
1625 dREQ;
1626
1627 data = newSV (NAME_MAX);
1628 SvPOK_on (data);
1629
1630 req->type = REQ_READLINK;
1631 req->sv1 = newSVsv (path);
1632 req->ptr2 = SvPVbyte_nolen (req->sv1);
1633 req->sv2 = data;
1634 req->ptr1 = SvPVbyte_nolen (data);
1635
1636 REQ_SEND;
1637}
1638
1639void
1323aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1640aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1324 SV * out_fh
1325 SV * in_fh
1326 UV in_offset
1327 UV length
1328 SV * callback
1329 PROTOTYPE: $$$$;$ 1641 PROTOTYPE: $$$$;$
1330 PPCODE: 1642 PPCODE:
1331{ 1643{
1332 dREQ; 1644 dREQ;
1333 1645
1334 req->type = REQ_SENDFILE; 1646 req->type = REQ_SENDFILE;
1335 req->fh = newSVsv (out_fh); 1647 req->sv1 = newSVsv (out_fh);
1336 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1648 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1337 req->fh2 = newSVsv (in_fh); 1649 req->sv2 = newSVsv (in_fh);
1338 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1650 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1339 req->offset = in_offset; 1651 req->offs = SvVAL64 (in_offset);
1340 req->length = length; 1652 req->size = length;
1341 1653
1342 REQ_SEND; 1654 REQ_SEND;
1343} 1655}
1344 1656
1345void 1657void
1346aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1658aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1347 SV * fh
1348 UV offset
1349 IV length
1350 SV * callback
1351 PROTOTYPE: $$$;$ 1659 PROTOTYPE: $$$;$
1352 PPCODE: 1660 PPCODE:
1353{ 1661{
1354 dREQ; 1662 dREQ;
1355 1663
1356 req->type = REQ_READAHEAD; 1664 req->type = REQ_READAHEAD;
1357 req->fh = newSVsv (fh); 1665 req->sv1 = newSVsv (fh);
1358 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1666 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1359 req->offset = offset; 1667 req->offs = SvVAL64 (offset);
1360 req->length = length; 1668 req->size = length;
1361 1669
1362 REQ_SEND; 1670 REQ_SEND;
1363} 1671}
1364 1672
1365void 1673void
1366aio_stat (fh_or_path,callback=&PL_sv_undef) 1674aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1367 SV * fh_or_path
1368 SV * callback
1369 ALIAS: 1675 ALIAS:
1370 aio_stat = REQ_STAT 1676 aio_stat = REQ_STAT
1371 aio_lstat = REQ_LSTAT 1677 aio_lstat = REQ_LSTAT
1372 PPCODE: 1678 PPCODE:
1373{ 1679{
1374 dREQ; 1680 dREQ;
1375 1681
1376 New (0, req->statdata, 1, Stat_t); 1682 req->ptr2 = malloc (sizeof (Stat_t));
1377 if (!req->statdata) 1683 if (!req->ptr2)
1378 { 1684 {
1379 req_free (req); 1685 req_destroy (req);
1380 croak ("out of memory during aio_req->statdata allocation"); 1686 croak ("out of memory during aio_stat statdata allocation");
1381 } 1687 }
1688
1689 req->flags |= FLAG_PTR2_FREE;
1690 req->sv1 = newSVsv (fh_or_path);
1382 1691
1383 if (SvPOK (fh_or_path)) 1692 if (SvPOK (fh_or_path))
1384 { 1693 {
1385 req->type = ix; 1694 req->type = ix;
1386 req->data = newSVsv (fh_or_path);
1387 req->dataptr = SvPVbyte_nolen (req->data); 1695 req->ptr1 = SvPVbyte_nolen (req->sv1);
1388 } 1696 }
1389 else 1697 else
1390 { 1698 {
1391 req->type = REQ_FSTAT; 1699 req->type = REQ_FSTAT;
1392 req->fh = newSVsv (fh_or_path);
1393 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1394 } 1701 }
1395 1702
1396 REQ_SEND; 1703 REQ_SEND;
1397} 1704}
1398 1705
1399void 1706void
1707aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1708 PPCODE:
1709{
1710 dREQ;
1711
1712 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1713 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1714 req->sv1 = newSVsv (fh_or_path);
1715
1716 if (SvPOK (fh_or_path))
1717 {
1718 req->type = REQ_UTIME;
1719 req->ptr1 = SvPVbyte_nolen (req->sv1);
1720 }
1721 else
1722 {
1723 req->type = REQ_FUTIME;
1724 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1725 }
1726
1727 REQ_SEND;
1728}
1729
1730void
1731aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1732 PPCODE:
1733{
1734 dREQ;
1735
1736 req->sv1 = newSVsv (fh_or_path);
1737 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1738
1739 if (SvPOK (fh_or_path))
1740 {
1741 req->type = REQ_TRUNCATE;
1742 req->ptr1 = SvPVbyte_nolen (req->sv1);
1743 }
1744 else
1745 {
1746 req->type = REQ_FTRUNCATE;
1747 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1748 }
1749
1750 REQ_SEND;
1751}
1752
1753void
1754aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1755 PPCODE:
1756{
1757 dREQ;
1758
1759 req->mode = mode;
1760 req->sv1 = newSVsv (fh_or_path);
1761
1762 if (SvPOK (fh_or_path))
1763 {
1764 req->type = REQ_CHMOD;
1765 req->ptr1 = SvPVbyte_nolen (req->sv1);
1766 }
1767 else
1768 {
1769 req->type = REQ_FCHMOD;
1770 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1771 }
1772
1773 REQ_SEND;
1774}
1775
1776void
1777aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1778 PPCODE:
1779{
1780 dREQ;
1781
1782 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1783 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1784 req->sv1 = newSVsv (fh_or_path);
1785
1786 if (SvPOK (fh_or_path))
1787 {
1788 req->type = REQ_CHOWN;
1789 req->ptr1 = SvPVbyte_nolen (req->sv1);
1790 }
1791 else
1792 {
1793 req->type = REQ_FCHOWN;
1794 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1795 }
1796
1797 REQ_SEND;
1798}
1799
1800void
1400aio_unlink (pathname,callback=&PL_sv_undef) 1801aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1401 SV * pathname
1402 SV * callback
1403 ALIAS: 1802 ALIAS:
1404 aio_unlink = REQ_UNLINK 1803 aio_unlink = REQ_UNLINK
1405 aio_rmdir = REQ_RMDIR 1804 aio_rmdir = REQ_RMDIR
1406 aio_readdir = REQ_READDIR 1805 aio_readdir = REQ_READDIR
1407 PPCODE: 1806 PPCODE:
1408{ 1807{
1409 dREQ; 1808 dREQ;
1410 1809
1411 req->type = ix; 1810 req->type = ix;
1412 req->data = newSVsv (pathname); 1811 req->sv1 = newSVsv (pathname);
1413 req->dataptr = SvPVbyte_nolen (req->data); 1812 req->ptr1 = SvPVbyte_nolen (req->sv1);
1813
1814 REQ_SEND;
1815}
1816
1817void
1818aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1819 PPCODE:
1820{
1821 dREQ;
1414 1822
1823 req->type = REQ_MKDIR;
1824 req->sv1 = newSVsv (pathname);
1825 req->ptr1 = SvPVbyte_nolen (req->sv1);
1826 req->mode = mode;
1827
1415 REQ_SEND; 1828 REQ_SEND;
1416} 1829}
1417 1830
1418void 1831void
1419aio_link (oldpath,newpath,callback=&PL_sv_undef) 1832aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1420 SV * oldpath
1421 SV * newpath
1422 SV * callback
1423 ALIAS: 1833 ALIAS:
1424 aio_link = REQ_LINK 1834 aio_link = REQ_LINK
1425 aio_symlink = REQ_SYMLINK 1835 aio_symlink = REQ_SYMLINK
1426 aio_rename = REQ_RENAME 1836 aio_rename = REQ_RENAME
1427 PPCODE: 1837 PPCODE:
1428{ 1838{
1429 dREQ; 1839 dREQ;
1430 1840
1431 req->type = ix; 1841 req->type = ix;
1432 req->fh = newSVsv (oldpath); 1842 req->sv2 = newSVsv (oldpath);
1433 req->data2ptr = SvPVbyte_nolen (req->fh); 1843 req->ptr2 = SvPVbyte_nolen (req->sv2);
1434 req->data = newSVsv (newpath); 1844 req->sv1 = newSVsv (newpath);
1435 req->dataptr = SvPVbyte_nolen (req->data); 1845 req->ptr1 = SvPVbyte_nolen (req->sv1);
1436 1846
1437 REQ_SEND; 1847 REQ_SEND;
1438} 1848}
1439 1849
1440void 1850void
1441aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1851aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1442 SV * pathname
1443 SV * callback
1444 UV mode
1445 UV dev
1446 PPCODE: 1852 PPCODE:
1447{ 1853{
1448 dREQ; 1854 dREQ;
1449 1855
1450 req->type = REQ_MKNOD; 1856 req->type = REQ_MKNOD;
1451 req->data = newSVsv (pathname); 1857 req->sv1 = newSVsv (pathname);
1452 req->dataptr = SvPVbyte_nolen (req->data); 1858 req->ptr1 = SvPVbyte_nolen (req->sv1);
1453 req->mode = (mode_t)mode; 1859 req->mode = (mode_t)mode;
1454 req->offset = dev; 1860 req->offs = dev;
1455 1861
1456 REQ_SEND; 1862 REQ_SEND;
1457} 1863}
1458 1864
1459void 1865void
1460aio_busy (delay,callback=&PL_sv_undef) 1866aio_busy (double delay, SV *callback=&PL_sv_undef)
1461 double delay
1462 SV * callback
1463 PPCODE: 1867 PPCODE:
1464{ 1868{
1465 dREQ; 1869 dREQ;
1466 1870
1467 req->type = REQ_BUSY; 1871 req->type = REQ_BUSY;
1468 req->fd = delay < 0. ? 0 : delay; 1872 req->nv1 = delay < 0. ? 0. : delay;
1469 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1470 1873
1471 REQ_SEND; 1874 REQ_SEND;
1472} 1875}
1473 1876
1474void 1877void
1475aio_group (callback=&PL_sv_undef) 1878aio_group (SV *callback=&PL_sv_undef)
1476 SV * callback
1477 PROTOTYPE: ;$ 1879 PROTOTYPE: ;$
1478 PPCODE: 1880 PPCODE:
1479{ 1881{
1480 dREQ; 1882 dREQ;
1481 1883
1482 req->type = REQ_GROUP; 1884 req->type = REQ_GROUP;
1885
1483 req_send (req); 1886 req_send (req);
1484
1485 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1887 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1486} 1888}
1487 1889
1488void 1890void
1489aio_nop (callback=&PL_sv_undef) 1891aio_nop (SV *callback=&PL_sv_undef)
1490 SV * callback
1491 PPCODE: 1892 PPCODE:
1492{ 1893{
1493 dREQ; 1894 dREQ;
1494 1895
1495 req->type = REQ_NOP; 1896 req->type = REQ_NOP;
1524 PROTOTYPE: 1925 PROTOTYPE:
1525 CODE: 1926 CODE:
1526 while (nreqs) 1927 while (nreqs)
1527 { 1928 {
1528 poll_wait (); 1929 poll_wait ();
1529 poll_cb (0); 1930 poll_cb ();
1530 } 1931 }
1531 1932
1532void 1933int
1533poll() 1934poll()
1534 PROTOTYPE: 1935 PROTOTYPE:
1535 CODE: 1936 CODE:
1536 if (nreqs)
1537 {
1538 poll_wait (); 1937 poll_wait ();
1539 poll_cb (0); 1938 RETVAL = poll_cb ();
1540 } 1939 OUTPUT:
1940 RETVAL
1541 1941
1542int 1942int
1543poll_fileno() 1943poll_fileno()
1544 PROTOTYPE: 1944 PROTOTYPE:
1545 CODE: 1945 CODE:
1549 1949
1550int 1950int
1551poll_cb(...) 1951poll_cb(...)
1552 PROTOTYPE: 1952 PROTOTYPE:
1553 CODE: 1953 CODE:
1554 RETVAL = poll_cb (0); 1954 RETVAL = poll_cb ();
1555 OUTPUT:
1556 RETVAL
1557
1558int
1559poll_some(int max = 0)
1560 PROTOTYPE: $
1561 CODE:
1562 RETVAL = poll_cb (max);
1563 OUTPUT: 1955 OUTPUT:
1564 RETVAL 1956 RETVAL
1565 1957
1566void 1958void
1567poll_wait() 1959poll_wait()
1568 PROTOTYPE: 1960 PROTOTYPE:
1569 CODE: 1961 CODE:
1570 if (nreqs)
1571 poll_wait (); 1962 poll_wait ();
1963
1964void
1965setsig (int signum = SIGIO)
1966 PROTOTYPE: ;$
1967 CODE:
1968{
1969 if (block_sig_level)
1970 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1971
1972 X_LOCK (reslock);
1973 main_tid = pthread_self ();
1974 main_sig = signum;
1975 X_UNLOCK (reslock);
1976
1977 if (main_sig && npending)
1978 pthread_kill (main_tid, main_sig);
1979}
1980
1981void
1982aio_block (SV *cb)
1983 PROTOTYPE: &
1984 PPCODE:
1985{
1986 int count;
1987
1988 block_sig ();
1989 PUSHMARK (SP);
1990 PUTBACK;
1991 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1992 SPAGAIN;
1993 unblock_sig ();
1994
1995 if (SvTRUE (ERRSV))
1996 croak (0);
1997
1998 XSRETURN (count);
1999}
1572 2000
1573int 2001int
1574nreqs() 2002nreqs()
1575 PROTOTYPE: 2003 PROTOTYPE:
1576 CODE: 2004 CODE:
1592 CODE: 2020 CODE:
1593 RETVAL = get_npending (); 2021 RETVAL = get_npending ();
1594 OUTPUT: 2022 OUTPUT:
1595 RETVAL 2023 RETVAL
1596 2024
2025int
2026nthreads()
2027 PROTOTYPE:
2028 CODE:
2029 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
2030 RETVAL = started;
2031 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
2032 OUTPUT:
2033 RETVAL
2034
1597PROTOTYPES: DISABLE 2035PROTOTYPES: DISABLE
1598 2036
1599MODULE = IO::AIO PACKAGE = IO::AIO::REQ 2037MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1600 2038
1601void 2039void
1616 PPCODE: 2054 PPCODE:
1617{ 2055{
1618 int i; 2056 int i;
1619 aio_req req; 2057 aio_req req;
1620 2058
2059 if (main_sig && !block_sig_level)
2060 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
2061
1621 if (grp->fd == 2) 2062 if (grp->int1 == 2)
1622 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 2063 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1623 2064
1624 for (i = 1; i < items; ++i ) 2065 for (i = 1; i < items; ++i )
1625 { 2066 {
1626 if (GIMME_V != G_VOID) 2067 if (GIMME_V != G_VOID)
1628 2069
1629 req = SvAIO_REQ (ST (i)); 2070 req = SvAIO_REQ (ST (i));
1630 2071
1631 if (req) 2072 if (req)
1632 { 2073 {
1633 ++grp->length; 2074 ++grp->size;
1634 req->grp = grp; 2075 req->grp = grp;
1635 2076
1636 req->grp_prev = 0; 2077 req->grp_prev = 0;
1637 req->grp_next = grp->grp_first; 2078 req->grp_next = grp->grp_first;
1638 2079
1661 av = newAV (); 2102 av = newAV ();
1662 2103
1663 for (i = 1; i < items; ++i ) 2104 for (i = 1; i < items; ++i )
1664 av_push (av, newSVsv (ST (i))); 2105 av_push (av, newSVsv (ST (i)));
1665 2106
1666 SvREFCNT_dec (grp->data); 2107 SvREFCNT_dec (grp->sv1);
1667 grp->data = (SV *)av; 2108 grp->sv1 = (SV *)av;
1668} 2109}
1669 2110
1670void 2111void
1671errno (aio_req grp, int errorno = errno) 2112errno (aio_req grp, int errorno = errno)
1672 CODE: 2113 CODE:
1673 grp->errorno = errorno; 2114 grp->errorno = errorno;
1674 2115
1675void 2116void
1676limit (aio_req grp, int limit) 2117limit (aio_req grp, int limit)
1677 CODE: 2118 CODE:
1678 grp->fd2 = limit; 2119 grp->int2 = limit;
1679 aio_grp_feed (grp); 2120 aio_grp_feed (grp);
1680 2121
1681void 2122void
1682feed (aio_req grp, SV *callback=&PL_sv_undef) 2123feed (aio_req grp, SV *callback=&PL_sv_undef)
1683 CODE: 2124 CODE:
1684{ 2125{
1685 SvREFCNT_dec (grp->fh2); 2126 SvREFCNT_dec (grp->sv2);
1686 grp->fh2 = newSVsv (callback); 2127 grp->sv2 = newSVsv (callback);
1687 2128
1688 if (grp->fd2 <= 0) 2129 if (grp->int2 <= 0)
1689 grp->fd2 = 2; 2130 grp->int2 = 2;
1690 2131
1691 aio_grp_feed (grp); 2132 aio_grp_feed (grp);
1692} 2133}
1693 2134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines