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.85 by root, Sat Oct 28 23:32:29 2006 UTC vs.
Revision 1.103 by root, Sun Jul 8 09:09:34 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines