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.65 by root, Tue Oct 24 00:26:32 2006 UTC vs.
Revision 1.89 by root, Tue Oct 31 00:11:52 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
… …
39# else 43# else
40# error sendfile support requested but not available 44# error sendfile support requested but not available
41# endif 45# endif
42#endif 46#endif
43 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
44/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 52#ifndef NAME_MAX
46# define NAME_MAX 4096 53# define NAME_MAX 4096
54#endif
55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
47#endif 59#endif
48 60
49#if __ia64 61#if __ia64
50# define STACKSIZE 65536 62# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
53#else 65#else
54# define STACKSIZE 16384 66# define STACKSIZE 16384
55#endif 67#endif
56 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
57/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
59 83
60#define dBUF \ 84#define dBUF \
85 char *aio_buf; \
86 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \
62 if (!aio_buf) \ 89 if (!aio_buf) \
63 return -1; 90 return -1;
64
65#define fBUF free (aio_buf)
66 91
67enum { 92enum {
68 REQ_QUIT, 93 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 94 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
71 REQ_SENDFILE, 96 REQ_SENDFILE,
72 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
73 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
77 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP, 103 REQ_BUSY,
79}; 104};
80 105
81#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP" 107#define AIO_GRP_KLASS "IO::AIO::GRP"
83 108
84typedef struct aio_cb 109typedef struct aio_cb
85{ 110{
86 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
87 112
88 SV *data, *callback; 113 SV *callback, *fh;
89 SV *fh, *fh2; 114 SV *sv1, *sv2;
90 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
91 Stat_t *statdata;
92 off_t offset; 116 off_t offs;
93 size_t length; 117 size_t size;
94 ssize_t result; 118 ssize_t result;
95 119
96 STRLEN dataoffset; 120 STRLEN stroffset;
97 int type; 121 int type;
98 int fd, fd2; 122 int int1, int2;
99 int errorno; 123 int errorno;
100 mode_t mode; /* open */ 124 mode_t mode; /* open */
101 125
102 unsigned char flags; 126 unsigned char flags;
103 unsigned char pri; 127 unsigned char pri;
… …
105 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
106 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
107} aio_cb; 131} aio_cb;
108 132
109enum { 133enum {
110 FLAG_CANCELLED = 0x01, 134 FLAG_CANCELLED = 0x01, /* request was cancelled */
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
111}; 137};
112 138
113typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
114typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
115 141
… …
117 PRI_MIN = -4, 143 PRI_MIN = -4,
118 PRI_MAX = 4, 144 PRI_MAX = 4,
119 145
120 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
121 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122}; 149};
123 150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
124static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
125 164
126static int started, wanted; 165static unsigned int started, idle, wanted;
127static volatile int nreqs;
128static int max_outstanding = 1<<30;
129static int respipe [2];
130 166
131#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133#else 169#else
134# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135#endif 171#endif
136 172
173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
175
176/* worker threads management */
177static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
178
179typedef struct worker {
180 /* locked by wrklock */
181 struct worker *prev, *next;
182
183 pthread_t tid;
184
185 /* locked by reslock, reqlock or wrklock */
186 aio_req req; /* currently processed request */
187 void *dbuf;
188 DIR *dirp;
189} worker;
190
191static worker wrk_first = { &wrk_first, &wrk_first, 0 };
192
193static void worker_clear (worker *wrk)
194{
195 if (wrk->dirp)
196 {
197 closedir (wrk->dirp);
198 wrk->dirp = 0;
199 }
200
201 if (wrk->dbuf)
202 {
203 free (wrk->dbuf);
204 wrk->dbuf = 0;
205 }
206}
207
208static void worker_free (worker *wrk)
209{
210 wrk->next->prev = wrk->prev;
211 wrk->prev->next = wrk->next;
212
213 free (wrk);
214}
215
216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff;
219static int respipe [2];
220
137static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140 224
141static volatile aio_req reqs, reqe; /* queue start, queue end */ 225#if WORDACCESS_UNSAFE
142static volatile aio_req ress, rese; /* queue start, queue end */
143 226
227static unsigned int get_nready ()
228{
229 unsigned int retval;
230
231 LOCK (reqlock);
232 retval = nready;
233 UNLOCK (reqlock);
234
235 return retval;
236}
237
238static unsigned int get_npending ()
239{
240 unsigned int retval;
241
242 LOCK (reslock);
243 retval = npending;
244 UNLOCK (reslock);
245
246 return retval;
247}
248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
260#else
261
262# define get_nready() nready
263# define get_npending() npending
264# define get_nthreads() started
265
266#endif
267
268/*
269 * a somewhat faster data structure might be nice, but
270 * with 8 priorities this actually needs <20 insns
271 * per shift, the most expensive operation.
272 */
273typedef struct {
274 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
275 int size;
276} reqq;
277
278static reqq req_queue;
279static reqq res_queue;
280
281int reqq_push (reqq *q, aio_req req)
282{
283 int pri = req->pri;
284 req->next = 0;
285
286 if (q->qe[pri])
287 {
288 q->qe[pri]->next = req;
289 q->qe[pri] = req;
290 }
291 else
292 q->qe[pri] = q->qs[pri] = req;
293
294 return q->size++;
295}
296
297aio_req reqq_shift (reqq *q)
298{
299 int pri;
300
301 if (!q->size)
302 return 0;
303
304 --q->size;
305
306 for (pri = NUM_PRI; pri--; )
307 {
308 aio_req req = q->qs[pri];
309
310 if (req)
311 {
312 if (!(q->qs[pri] = req->next))
313 q->qe[pri] = 0;
314
315 return req;
316 }
317 }
318
319 abort ();
320}
321
322static int poll_cb ();
144static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
145static void req_free (aio_req req); 324static void req_free (aio_req req);
325static void req_cancel (aio_req req);
146 326
147/* must be called at most once */ 327/* must be called at most once */
148static SV *req_sv (aio_req req, const char *klass) 328static SV *req_sv (aio_req req, const char *klass)
149{ 329{
150 if (!req->self) 330 if (!req->self)
… …
168 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
169} 349}
170 350
171static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
172{ 352{
173 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
174 { 354 {
175 int old_len = grp->length; 355 int old_len = grp->size;
176 356
177 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
178 { 358 {
179 dSP; 359 dSP;
180 360
181 ENTER; 361 ENTER;
182 SAVETMPS; 362 SAVETMPS;
183 PUSHMARK (SP); 363 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK; 365 PUTBACK;
186 call_sv (grp->fh2, G_VOID | G_EVAL); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 367 SPAGAIN;
188 FREETMPS; 368 FREETMPS;
189 LEAVE; 369 LEAVE;
190 } 370 }
191 371
192 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
193 if (old_len == grp->length) 373 if (old_len == grp->size)
194 { 374 {
195 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
196 grp->fh2 = 0; 376 grp->sv2 = 0;
197 break; 377 break;
198 } 378 }
199 } 379 }
200} 380}
201 381
202static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
203{ 383{
204 --grp->length; 384 --grp->size;
205 385
206 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
207 aio_grp_feed (grp); 387 aio_grp_feed (grp);
208 388
209 /* finish, if done */ 389 /* finish, if done */
210 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
211 { 391 {
212 req_invoke (grp); 392 req_invoke (grp);
213 req_free (grp); 393 req_free (grp);
214 } 394 }
215} 395}
216 396
217static void poll_wait () 397static void req_invoke (aio_req req)
218{ 398{
219 fd_set rfd; 399 dSP;
220 400
221 while (nreqs) 401 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1);
403
404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
222 { 405 {
223 aio_req req; 406 ENTER;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 407 SAVETMPS;
225 pthread_mutex_lock (&reslock); 408 PUSHMARK (SP);
226#endif 409 EXTEND (SP, 1);
227 req = ress;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
229 pthread_mutex_unlock (&reslock);
230#endif
231 410
232 if (req) 411 switch (req->type)
233 return; 412 {
413 case REQ_READDIR:
414 {
415 SV *rv = &PL_sv_undef;
234 416
235 FD_ZERO(&rfd); 417 if (req->result >= 0)
236 FD_SET(respipe [0], &rfd); 418 {
419 int i;
420 char *buf = req->ptr2;
421 AV *av = newAV ();
237 422
238 select (respipe [0] + 1, &rfd, 0, 0, 0); 423 av_extend (av, req->result - 1);
424
425 for (i = 0; i < req->result; ++i)
426 {
427 SV *sv = newSVpv (buf, 0);
428
429 av_store (av, i, sv);
430 buf += SvCUR (sv) + 1;
431 }
432
433 rv = sv_2mortal (newRV_noinc ((SV *)av));
434 }
435
436 PUSHs (rv);
437 }
438 break;
439
440 case REQ_OPEN:
441 {
442 /* convert fd to fh */
443 SV *fh;
444
445 PUSHs (sv_2mortal (newSViv (req->result)));
446 PUTBACK;
447 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
448 SPAGAIN;
449
450 fh = SvREFCNT_inc (POPs);
451
452 PUSHMARK (SP);
453 XPUSHs (sv_2mortal (fh));
454 }
455 break;
456
457 case REQ_GROUP:
458 req->int1 = 2; /* mark group as finished */
459
460 if (req->sv1)
461 {
462 int i;
463 AV *av = (AV *)req->sv1;
464
465 EXTEND (SP, AvFILL (av) + 1);
466 for (i = 0; i <= AvFILL (av); ++i)
467 PUSHs (*av_fetch (av, i, 0));
468 }
469 break;
470
471 case REQ_NOP:
472 case REQ_BUSY:
473 break;
474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
499 default:
500 PUSHs (sv_2mortal (newSViv (req->result)));
501 break;
502 }
503
504 errno = req->errorno;
505
506 PUTBACK;
507 call_sv (req->callback, G_VOID | G_EVAL);
508 SPAGAIN;
509
510 FREETMPS;
511 LEAVE;
239 } 512 }
240}
241 513
242static void req_invoke (aio_req req) 514 if (req->grp)
243{
244 dSP;
245 int errorno = errno;
246
247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
248 return;
249
250 errno = req->errorno;
251
252 ENTER;
253 SAVETMPS;
254 PUSHMARK (SP);
255 EXTEND (SP, 1);
256
257 switch (req->type)
258 { 515 {
259 case REQ_READDIR: 516 aio_req grp = req->grp;
260 {
261 SV *rv = &PL_sv_undef;
262 517
263 if (req->result >= 0) 518 /* unlink request */
264 { 519 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
265 char *buf = req->data2ptr; 520 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
266 AV *av = newAV ();
267 521
268 while (req->result) 522 if (grp->grp_first == req)
269 { 523 grp->grp_first = req->grp_next;
270 SV *sv = newSVpv (buf, 0);
271 524
272 av_push (av, sv); 525 aio_grp_dec (grp);
273 buf += SvCUR (sv) + 1;
274 req->result--;
275 }
276
277 rv = sv_2mortal (newRV_noinc ((SV *)av));
278 }
279
280 PUSHs (rv);
281 }
282 break;
283
284 case REQ_OPEN:
285 {
286 /* convert fd to fh */
287 SV *fh;
288
289 PUSHs (sv_2mortal (newSViv (req->result)));
290 PUTBACK;
291 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
292 SPAGAIN;
293
294 fh = SvREFCNT_inc (POPs);
295
296 PUSHMARK (SP);
297 XPUSHs (sv_2mortal (fh));
298 }
299 break;
300
301 case REQ_GROUP:
302 req->fd = 2; /* mark group as finished */
303
304 if (req->data)
305 {
306 int i;
307 AV *av = (AV *)req->data;
308
309 EXTEND (SP, AvFILL (av) + 1);
310 for (i = 0; i <= AvFILL (av); ++i)
311 PUSHs (*av_fetch (av, i, 0));
312 }
313 break;
314
315 case REQ_NOP:
316 case REQ_SLEEP:
317 break;
318
319 default:
320 PUSHs (sv_2mortal (newSViv (req->result)));
321 break;
322 } 526 }
323
324
325 PUTBACK;
326 call_sv (req->callback, G_VOID | G_EVAL);
327 SPAGAIN;
328
329 FREETMPS;
330 LEAVE;
331
332 errno = errorno;
333 527
334 if (SvTRUE (ERRSV)) 528 if (SvTRUE (ERRSV))
335 { 529 {
336 req_free (req); 530 req_free (req);
337 croak (0); 531 croak (0);
338 } 532 }
339} 533}
340 534
341static void req_free (aio_req req) 535static void req_free (aio_req req)
342{ 536{
343 if (req->grp)
344 {
345 aio_req grp = req->grp;
346
347 /* unlink request */
348 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
349 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
350
351 if (grp->grp_first == req)
352 grp->grp_first = req->grp_next;
353
354 aio_grp_dec (grp);
355 }
356
357 if (req->self) 537 if (req->self)
358 { 538 {
359 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
361 } 541 }
362 542
363 SvREFCNT_dec (req->data);
364 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
544 SvREFCNT_dec (req->sv1);
365 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
366 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata);
368 547
369 if (req->type == REQ_READDIR && req->result >= 0) 548 if (req->flags & FLAG_PTR2_FREE)
370 free (req->data2ptr); 549 free (req->ptr2);
371 550
372 Safefree (req); 551 Safefree (req);
373} 552}
374 553
554static void req_cancel_subs (aio_req grp)
555{
556 aio_req sub;
557
558 if (grp->type != REQ_GROUP)
559 return;
560
561 SvREFCNT_dec (grp->sv2);
562 grp->sv2 = 0;
563
564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
565 req_cancel (sub);
566}
567
375static void req_cancel (aio_req req) 568static void req_cancel (aio_req req)
376{ 569{
377 req->flags |= FLAG_CANCELLED; 570 req->flags |= FLAG_CANCELLED;
378 571
379 if (req->type == REQ_GROUP) 572 req_cancel_subs (req);
380 {
381 aio_req sub;
382
383 for (sub = req->grp_first; sub; sub = sub->grp_next)
384 req_cancel (sub);
385 }
386}
387
388static int poll_cb ()
389{
390 dSP;
391 int count = 0;
392 int do_croak = 0;
393 aio_req req;
394
395 for (;;)
396 {
397 pthread_mutex_lock (&reslock);
398 req = ress;
399
400 if (req)
401 {
402 ress = req->next;
403
404 if (!ress)
405 {
406 /* read any signals sent by the worker threads */
407 char buf [32];
408 while (read (respipe [0], buf, 32) == 32)
409 ;
410
411 rese = 0;
412 }
413 }
414
415 pthread_mutex_unlock (&reslock);
416
417 if (!req)
418 break;
419
420 --nreqs;
421
422 if (req->type == REQ_QUIT)
423 started--;
424 else if (req->type == REQ_GROUP && req->length)
425 {
426 req->fd = 1; /* mark request as delayed */
427 continue;
428 }
429 else
430 {
431 if (req->type == REQ_READ)
432 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
433
434 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
435 SvREADONLY_off (req->data);
436
437 if (req->statdata)
438 {
439 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
440 PL_laststatval = req->result;
441 PL_statcache = *(req->statdata);
442 }
443
444 req_invoke (req);
445
446 count++;
447 }
448
449 req_free (req);
450 }
451
452 return count;
453} 573}
454 574
455static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
456 576
457static void start_thread (void) 577static void start_thread (void)
458{ 578{
459 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
460 pthread_t tid;
461 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
462 586
463 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
464 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
465 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
590#ifdef PTHREAD_SCOPE_PROCESS
591 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
592#endif
466 593
467 sigfillset (&fullsigset); 594 sigfillset (&fullsigset);
595
596 LOCK (wrklock);
468 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 597 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469 598
470 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 599 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
471 started++;
472
473 sigprocmask (SIG_SETMASK, &oldsigset, 0);
474}
475
476static void req_send (aio_req req)
477{
478 while (started < wanted && nreqs >= started)
479 start_thread ();
480
481 ++nreqs;
482
483 pthread_mutex_lock (&reqlock);
484
485 req->next = 0;
486
487 if (reqe)
488 { 600 {
489 reqe->next = req; 601 wrk->prev = &wrk_first;
490 reqe = req; 602 wrk->next = wrk_first.next;
603 wrk_first.next->prev = wrk;
604 wrk_first.next = wrk;
605 ++started;
491 } 606 }
492 else 607 else
493 reqe = reqs = req; 608 free (wrk);
494 609
610 sigprocmask (SIG_SETMASK, &oldsigset, 0);
611 UNLOCK (wrklock);
612}
613
614static void maybe_start_thread ()
615{
616 if (get_nthreads () >= wanted)
617 return;
618
619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
621 return;
622
623 start_thread ();
624}
625
626static void req_send (aio_req req)
627{
628 ++nreqs;
629
630 LOCK (reqlock);
631 ++nready;
632 reqq_push (&req_queue, req);
495 pthread_cond_signal (&reqwait); 633 pthread_cond_signal (&reqwait);
496 pthread_mutex_unlock (&reqlock); 634 UNLOCK (reqlock);
497 635
498 if (nreqs > max_outstanding) 636 maybe_start_thread ();
499 for (;;)
500 {
501 poll_cb ();
502
503 if (nreqs <= max_outstanding)
504 break;
505
506 poll_wait ();
507 }
508} 637}
509 638
510static void end_thread (void) 639static void end_thread (void)
511{ 640{
512 aio_req req; 641 aio_req req;
642
513 Newz (0, req, 1, aio_cb); 643 Newz (0, req, 1, aio_cb);
644
514 req->type = REQ_QUIT; 645 req->type = REQ_QUIT;
646 req->pri = PRI_MAX + PRI_BIAS;
515 647
516 req_send (req); 648 LOCK (reqlock);
649 reqq_push (&req_queue, req);
650 pthread_cond_signal (&reqwait);
651 UNLOCK (reqlock);
652
653 LOCK (wrklock);
654 --started;
655 UNLOCK (wrklock);
656}
657
658static void set_max_idle (int nthreads)
659{
660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
661 max_idle = nthreads <= 0 ? 1 : nthreads;
662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
517} 663}
518 664
519static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
520{ 666{
521 if (wanted < nthreads) 667 if (wanted < nthreads)
522 wanted = nthreads; 668 wanted = nthreads;
523} 669}
524 670
525static void max_parallel (int nthreads) 671static void max_parallel (int nthreads)
526{ 672{
527 int cur = started;
528
529 if (wanted > nthreads) 673 if (wanted > nthreads)
530 wanted = nthreads; 674 wanted = nthreads;
531 675
532 while (cur > wanted) 676 while (started > wanted)
677 end_thread ();
678}
679
680static void poll_wait ()
681{
682 fd_set rfd;
683
684 while (nreqs)
533 { 685 {
686 int size;
687 if (WORDACCESS_UNSAFE) LOCK (reslock);
688 size = res_queue.size;
689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
690
691 if (size)
692 return;
693
534 end_thread (); 694 maybe_start_thread ();
535 cur--; 695
696 FD_ZERO(&rfd);
697 FD_SET(respipe [0], &rfd);
698
699 select (respipe [0] + 1, &rfd, 0, 0, 0);
536 } 700 }
701}
537 702
538 while (started > wanted) 703static int poll_cb ()
704{
705 dSP;
706 int count = 0;
707 int maxreqs = max_poll_reqs;
708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
714
715 for (;;)
539 { 716 {
717 for (;;)
718 {
719 maybe_start_thread ();
720
721 LOCK (reslock);
722 req = reqq_shift (&res_queue);
723
724 if (req)
725 {
726 --npending;
727
728 if (!res_queue.size)
729 {
730 /* read any signals sent by the worker threads */
731 char buf [32];
732 while (read (respipe [0], buf, 32) == 32)
733 ;
734 }
735 }
736
737 UNLOCK (reslock);
738
739 if (!req)
740 break;
741
742 --nreqs;
743
744 if (req->type == REQ_GROUP && req->size)
745 {
746 req->int1 = 1; /* mark request as delayed */
747 continue;
748 }
749 else
750 {
751 req_invoke (req);
752
753 count++;
754 }
755
756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
768 }
769
770 if (nreqs <= max_outstanding)
771 break;
772
540 poll_wait (); 773 poll_wait ();
541 poll_cb (); 774
775 ++maxreqs;
542 } 776 }
777
778 return count;
543} 779}
544 780
545static void create_pipe () 781static void create_pipe ()
546{ 782{
547 if (pipe (respipe)) 783 if (pipe (respipe))
… …
571static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 807static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
572{ 808{
573 ssize_t res; 809 ssize_t res;
574 off_t ooffset; 810 off_t ooffset;
575 811
576 pthread_mutex_lock (&preadwritelock); 812 LOCK (preadwritelock);
577 ooffset = lseek (fd, 0, SEEK_CUR); 813 ooffset = lseek (fd, 0, SEEK_CUR);
578 lseek (fd, offset, SEEK_SET); 814 lseek (fd, offset, SEEK_SET);
579 res = read (fd, buf, count); 815 res = read (fd, buf, count);
580 lseek (fd, ooffset, SEEK_SET); 816 lseek (fd, ooffset, SEEK_SET);
581 pthread_mutex_unlock (&preadwritelock); 817 UNLOCK (preadwritelock);
582 818
583 return res; 819 return res;
584} 820}
585 821
586static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 822static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
587{ 823{
588 ssize_t res; 824 ssize_t res;
589 off_t ooffset; 825 off_t ooffset;
590 826
591 pthread_mutex_lock (&preadwritelock); 827 LOCK (preadwritelock);
592 ooffset = lseek (fd, 0, SEEK_CUR); 828 ooffset = lseek (fd, 0, SEEK_CUR);
593 lseek (fd, offset, SEEK_SET); 829 lseek (fd, offset, SEEK_SET);
594 res = write (fd, buf, count); 830 res = write (fd, buf, count);
595 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
596 pthread_mutex_unlock (&preadwritelock); 832 UNLOCK (preadwritelock);
597 833
598 return res; 834 return res;
599} 835}
600#endif 836#endif
601 837
602#if !HAVE_FDATASYNC 838#if !HAVE_FDATASYNC
603# define fdatasync fsync 839# define fdatasync fsync
604#endif 840#endif
605 841
606#if !HAVE_READAHEAD 842#if !HAVE_READAHEAD
607# define readahead aio_readahead 843# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608 844
609static ssize_t readahead (int fd, off_t offset, size_t count) 845static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
610{ 846{
611 dBUF; 847 dBUF;
612 848
613 while (count > 0) 849 while (count > 0)
614 { 850 {
… …
617 pread (fd, aio_buf, len, offset); 853 pread (fd, aio_buf, len, offset);
618 offset += len; 854 offset += len;
619 count -= len; 855 count -= len;
620 } 856 }
621 857
622 fBUF;
623
624 errno = 0; 858 errno = 0;
625} 859}
860
626#endif 861#endif
627 862
628#if !HAVE_READDIR_R 863#if !HAVE_READDIR_R
629# define readdir_r aio_readdir_r 864# define readdir_r aio_readdir_r
630 865
… …
633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 868static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
634{ 869{
635 struct dirent *e; 870 struct dirent *e;
636 int errorno; 871 int errorno;
637 872
638 pthread_mutex_lock (&readdirlock); 873 LOCK (readdirlock);
639 874
640 e = readdir (dirp); 875 e = readdir (dirp);
641 errorno = errno; 876 errorno = errno;
642 877
643 if (e) 878 if (e)
… …
646 strcpy (ent->d_name, e->d_name); 881 strcpy (ent->d_name, e->d_name);
647 } 882 }
648 else 883 else
649 *res = 0; 884 *res = 0;
650 885
651 pthread_mutex_unlock (&readdirlock); 886 UNLOCK (readdirlock);
652 887
653 errno = errorno; 888 errno = errorno;
654 return e ? 0 : -1; 889 return e ? 0 : -1;
655} 890}
656#endif 891#endif
657 892
658/* sendfile always needs emulation */ 893/* sendfile always needs emulation */
659static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 894static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
660{ 895{
661 ssize_t res; 896 ssize_t res;
662 897
663 if (!count) 898 if (!count)
664 return 0; 899 return 0;
… …
675 { 910 {
676 off_t sbytes; 911 off_t sbytes;
677 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 912 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
678 913
679 if (res < 0 && sbytes) 914 if (res < 0 && sbytes)
680 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 915 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
681 res = sbytes; 916 res = sbytes;
682 } 917 }
683 918
684# elif __hpux 919# elif __hpux
685 res = sendfile (ofd, ifd, offset, count, 0, 0); 920 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
741 976
742 offset += cnt; 977 offset += cnt;
743 res += cnt; 978 res += cnt;
744 count -= cnt; 979 count -= cnt;
745 } 980 }
746
747 fBUF;
748 } 981 }
749 982
750 return res; 983 return res;
751} 984}
752 985
753/* read a full directory */ 986/* read a full directory */
754static int scandir_ (const char *path, void **namesp) 987static void scandir_ (aio_req req, worker *self)
755{ 988{
756 DIR *dirp; 989 DIR *dirp;
757 union 990 union
758 { 991 {
759 struct dirent d; 992 struct dirent d;
… …
764 int memlen = 4096; 997 int memlen = 4096;
765 int memofs = 0; 998 int memofs = 0;
766 int res = 0; 999 int res = 0;
767 int errorno; 1000 int errorno;
768 1001
769 dirp = opendir (path); 1002 LOCK (wrklock);
770 if (!dirp) 1003 self->dirp = dirp = opendir (req->ptr1);
771 return -1;
772
773 u = malloc (sizeof (*u)); 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
774 names = malloc (memlen); 1006 req->ptr2 = names = malloc (memlen);
1007 UNLOCK (wrklock);
775 1008
776 if (u && names) 1009 if (dirp && u && names)
777 for (;;) 1010 for (;;)
778 { 1011 {
779 errno = 0; 1012 errno = 0;
780 readdir_r (dirp, &u->d, &entp); 1013 readdir_r (dirp, &u->d, &entp);
781 1014
… …
791 res++; 1024 res++;
792 1025
793 while (memofs + len > memlen) 1026 while (memofs + len > memlen)
794 { 1027 {
795 memlen *= 2; 1028 memlen *= 2;
1029 LOCK (wrklock);
796 names = realloc (names, memlen); 1030 req->ptr2 = names = realloc (names, memlen);
1031 UNLOCK (wrklock);
1032
797 if (!names) 1033 if (!names)
798 break; 1034 break;
799 } 1035 }
800 1036
801 memcpy (names + memofs, name, len); 1037 memcpy (names + memofs, name, len);
802 memofs += len; 1038 memofs += len;
803 } 1039 }
804 } 1040 }
805 1041
806 errorno = errno;
807 free (u);
808 closedir (dirp);
809
810 if (errorno) 1042 if (errno)
1043 res = -1;
1044
1045 req->result = res;
1046}
1047
1048/*****************************************************************************/
1049
1050static void *aio_proc (void *thr_arg)
1051{
1052 aio_req req;
1053 struct timespec ts;
1054 worker *self = (worker *)thr_arg;
1055
1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
1059
1060 for (;;)
811 { 1061 {
812 free (names); 1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
813 errno = errorno;
814 res = -1;
815 }
816 1063
817 *namesp = (void *)names; 1064 LOCK (reqlock);
818 return res;
819}
820
821/*****************************************************************************/
822
823static void *aio_proc (void *thr_arg)
824{
825 aio_req req;
826 int type;
827
828 do
829 {
830 pthread_mutex_lock (&reqlock);
831 1065
832 for (;;) 1066 for (;;)
833 { 1067 {
834 req = reqs; 1068 self->req = req = reqq_shift (&req_queue);
835
836 if (reqs)
837 {
838 reqs = reqs->next;
839 if (!reqs) reqe = 0;
840 }
841 1069
842 if (req) 1070 if (req)
843 break; 1071 break;
844 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
845 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
846 } 1094 }
847 1095
848 pthread_mutex_unlock (&reqlock); 1096 --nready;
1097
1098 UNLOCK (reqlock);
849 1099
850 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */
852 1101
853 if (!(req->flags & FLAG_CANCELLED)) 1102 if (!(req->flags & FLAG_CANCELLED))
854 switch (type) 1103 switch (req->type)
855 { 1104 {
856 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
857 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
858 1107
859 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
860 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
861 1110
862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
863 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1112 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
864 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
865 1114
866 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
867 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
868 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
869 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
870 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
872 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
873 1124
874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
875 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
877 1128
878 case REQ_SLEEP: 1129 case REQ_BUSY:
879 { 1130 {
880 struct timeval tv; 1131 struct timeval tv;
881 1132
882 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
883 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
884 1135
885 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
886 } 1137 }
887 1138
888 case REQ_GROUP: 1139 case REQ_GROUP:
889 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
890 case REQ_QUIT: 1143 case REQ_QUIT:
891 break; 1144 goto quit;
892 1145
893 default: 1146 default:
894 req->result = ENOSYS; 1147 req->result = ENOSYS;
895 break; 1148 break;
896 } 1149 }
897 1150
898 req->errorno = errno; 1151 req->errorno = errno;
899 1152
900 pthread_mutex_lock (&reslock); 1153 LOCK (reslock);
901 1154
902 req->next = 0; 1155 ++npending;
903 1156
904 if (rese) 1157 if (!reqq_push (&res_queue, req))
905 {
906 rese->next = req;
907 rese = req;
908 }
909 else
910 {
911 rese = ress = req;
912
913 /* write a dummy byte to the pipe so fh becomes ready */ 1158 /* write a dummy byte to the pipe so fh becomes ready */
914 write (respipe [1], &respipe, 1); 1159 write (respipe [1], &respipe, 1);
915 }
916 1160
917 pthread_mutex_unlock (&reslock); 1161 self->req = 0;
1162 worker_clear (self);
1163
1164 UNLOCK (reslock);
918 } 1165 }
919 while (type != REQ_QUIT); 1166
1167quit:
1168 LOCK (wrklock);
1169 worker_free (self);
1170 UNLOCK (wrklock);
920 1171
921 return 0; 1172 return 0;
922} 1173}
923 1174
924/*****************************************************************************/ 1175/*****************************************************************************/
925 1176
926static void atfork_prepare (void) 1177static void atfork_prepare (void)
927{ 1178{
928 pthread_mutex_lock (&reqlock); 1179 LOCK (wrklock);
929 pthread_mutex_lock (&reslock); 1180 LOCK (reqlock);
1181 LOCK (reslock);
930#if !HAVE_PREADWRITE 1182#if !HAVE_PREADWRITE
931 pthread_mutex_lock (&preadwritelock); 1183 LOCK (preadwritelock);
932#endif 1184#endif
933#if !HAVE_READDIR_R 1185#if !HAVE_READDIR_R
934 pthread_mutex_lock (&readdirlock); 1186 LOCK (readdirlock);
935#endif 1187#endif
936} 1188}
937 1189
938static void atfork_parent (void) 1190static void atfork_parent (void)
939{ 1191{
940#if !HAVE_READDIR_R 1192#if !HAVE_READDIR_R
941 pthread_mutex_unlock (&readdirlock); 1193 UNLOCK (readdirlock);
942#endif 1194#endif
943#if !HAVE_PREADWRITE 1195#if !HAVE_PREADWRITE
944 pthread_mutex_unlock (&preadwritelock); 1196 UNLOCK (preadwritelock);
945#endif 1197#endif
946 pthread_mutex_unlock (&reslock); 1198 UNLOCK (reslock);
947 pthread_mutex_unlock (&reqlock); 1199 UNLOCK (reqlock);
1200 UNLOCK (wrklock);
948} 1201}
949 1202
950static void atfork_child (void) 1203static void atfork_child (void)
951{ 1204{
952 aio_req prv; 1205 aio_req prv;
953 1206
954 started = 0; 1207 while (prv = reqq_shift (&req_queue))
1208 req_free (prv);
955 1209
956 while (reqs) 1210 while (prv = reqq_shift (&res_queue))
1211 req_free (prv);
1212
1213 while (wrk_first.next != &wrk_first)
957 { 1214 {
958 prv = reqs; 1215 worker *wrk = wrk_first.next;
959 reqs = prv->next; 1216
1217 if (wrk->req)
1218 req_free (wrk->req);
1219
1220 worker_clear (wrk);
960 req_free (prv); 1221 worker_free (wrk);
961 } 1222 }
962 1223
963 reqs = reqe = 0; 1224 started = 0;
964 1225 idle = 0;
965 while (ress) 1226 nreqs = 0;
966 { 1227 nready = 0;
967 prv = ress; 1228 npending = 0;
968 ress = prv->next;
969 req_free (prv);
970 }
971
972 ress = rese = 0;
973 1229
974 close (respipe [0]); 1230 close (respipe [0]);
975 close (respipe [1]); 1231 close (respipe [1]);
976 create_pipe (); 1232 create_pipe ();
977 1233
… …
1004PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
1005 1261
1006BOOT: 1262BOOT:
1007{ 1263{
1008 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
1009 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1010 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1011 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1012 1272
1013 create_pipe (); 1273 create_pipe ();
1014 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1015} 1275}
1016 1276
1017void 1277void
1018min_parallel (nthreads) 1278max_poll_reqs (int nreqs)
1019 int nthreads
1020 PROTOTYPE: $ 1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
1021 1282
1022void 1283void
1023max_parallel (nthreads) 1284max_poll_time (double nseconds)
1024 int nthreads
1025 PROTOTYPE: $ 1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1288
1289void
1290min_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_parallel (int nthreads)
1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
1026 1302
1027int 1303int
1028max_outstanding (nreqs) 1304max_outstanding (int maxreqs)
1029 int nreqs 1305 PROTOTYPE: $
1030 PROTOTYPE: $
1031 CODE: 1306 CODE:
1032 RETVAL = max_outstanding; 1307 RETVAL = max_outstanding;
1033 max_outstanding = nreqs; 1308 max_outstanding = maxreqs;
1309 OUTPUT:
1310 RETVAL
1034 1311
1035void 1312void
1036aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1313aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037 SV * pathname 1314 SV * pathname
1038 int flags 1315 int flags
… …
1042 PPCODE: 1319 PPCODE:
1043{ 1320{
1044 dREQ; 1321 dREQ;
1045 1322
1046 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
1047 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
1048 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (req->sv1);
1049 req->fd = flags; 1326 req->int1 = flags;
1050 req->mode = mode; 1327 req->mode = mode;
1051 1328
1052 REQ_SEND; 1329 REQ_SEND;
1053} 1330}
1054 1331
… …
1064 PPCODE: 1341 PPCODE:
1065{ 1342{
1066 dREQ; 1343 dREQ;
1067 1344
1068 req->type = ix; 1345 req->type = ix;
1069 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
1070 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1071 1348
1072 REQ_SEND (req); 1349 REQ_SEND (req);
1073} 1350}
1074 1351
1075void 1352void
… …
1084 aio_read = REQ_READ 1361 aio_read = REQ_READ
1085 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
1086 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
1087 PPCODE: 1364 PPCODE:
1088{ 1365{
1089 aio_req req;
1090 STRLEN svlen; 1366 STRLEN svlen;
1091 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
1092 1368
1093 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
1094 SvPOK_on (data); 1370 SvPOK_on (data);
… …
1116 1392
1117 { 1393 {
1118 dREQ; 1394 dREQ;
1119 1395
1120 req->type = ix; 1396 req->type = ix;
1121 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
1122 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1123 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
1124 req->offset = offset; 1400 req->offs = offset;
1125 req->length = length; 1401 req->size = length;
1126 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1127 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1128 1405
1129 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1130 { 1407 {
1131 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1132 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1133 } 1410 }
1134 1411
1135 REQ_SEND; 1412 REQ_SEND;
1136 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (req->fh);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1137} 1436}
1138 1437
1139void 1438void
1140aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1141 SV * out_fh 1440 SV * out_fh
… …
1147 PPCODE: 1446 PPCODE:
1148{ 1447{
1149 dREQ; 1448 dREQ;
1150 1449
1151 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1152 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1153 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1154 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1155 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1156 req->offset = in_offset; 1455 req->offs = in_offset;
1157 req->length = length; 1456 req->size = length;
1158 1457
1159 REQ_SEND; 1458 REQ_SEND;
1160} 1459}
1161 1460
1162void 1461void
… …
1169 PPCODE: 1468 PPCODE:
1170{ 1469{
1171 dREQ; 1470 dREQ;
1172 1471
1173 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1174 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1175 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1176 req->offset = offset; 1475 req->offs = offset;
1177 req->length = length; 1476 req->size = length;
1178 1477
1179 REQ_SEND; 1478 REQ_SEND;
1180} 1479}
1181 1480
1182void 1481void
… …
1188 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1189 PPCODE: 1488 PPCODE:
1190{ 1489{
1191 dREQ; 1490 dREQ;
1192 1491
1193 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1194 if (!req->statdata) 1493 if (!req->ptr2)
1195 { 1494 {
1196 req_free (req); 1495 req_free (req);
1197 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_stat statdata allocation");
1198 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1199 1500
1200 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1201 { 1502 {
1202 req->type = ix; 1503 req->type = ix;
1203 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1204 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (req->sv1);
1205 } 1506 }
1206 else 1507 else
1207 { 1508 {
1208 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1209 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1210 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1211 } 1512 }
1212 1513
1213 REQ_SEND; 1514 REQ_SEND;
1214} 1515}
1215 1516
1216void 1517void
1217aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1218 SV * pathname 1519 SV * pathname
1219 SV * callback 1520 SV * callback
1220 ALIAS: 1521 ALIAS:
1221 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1222 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1223 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1224 PPCODE: 1525 PPCODE:
1225{ 1526{
1226 dREQ; 1527 dREQ;
1227 1528
1228 req->type = ix; 1529 req->type = ix;
1229 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1230 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (req->sv1);
1231 1532
1232 REQ_SEND; 1533 REQ_SEND;
1233} 1534}
1234 1535
1235void 1536void
1236aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1237 SV * oldpath 1538 SV * oldpath
1238 SV * newpath 1539 SV * newpath
1239 SV * callback 1540 SV * callback
1240 ALIAS: 1541 ALIAS:
1241 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1242 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1243 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1244 PPCODE: 1545 PPCODE:
1245{ 1546{
1246 dREQ; 1547 dREQ;
1247 1548
1248 req->type = ix; 1549 req->type = ix;
1249 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1250 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1251 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1252 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (req->sv1);
1253 1554
1254 REQ_SEND; 1555 REQ_SEND;
1255} 1556}
1256 1557
1257void 1558void
1258aio_sleep (delay,callback=&PL_sv_undef) 1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1259 double delay 1560 SV * pathname
1260 SV * callback 1561 SV * callback
1562 UV mode
1563 UV dev
1261 PPCODE: 1564 PPCODE:
1262{ 1565{
1263 dREQ; 1566 dREQ;
1567
1568 req->type = REQ_MKNOD;
1569 req->sv1 = newSVsv (pathname);
1570 req->ptr1 = SvPVbyte_nolen (req->sv1);
1571 req->mode = (mode_t)mode;
1572 req->offs = dev;
1573
1574 REQ_SEND;
1575}
1264 1576
1577void
1578aio_busy (delay,callback=&PL_sv_undef)
1579 double delay
1580 SV * callback
1581 PPCODE:
1582{
1583 dREQ;
1584
1265 req->type = REQ_SLEEP; 1585 req->type = REQ_BUSY;
1266 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1268 1588
1269 REQ_SEND; 1589 REQ_SEND;
1270} 1590}
1271 1591
1272void 1592void
… …
1276 PPCODE: 1596 PPCODE:
1277{ 1597{
1278 dREQ; 1598 dREQ;
1279 1599
1280 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1601
1281 req_send (req); 1602 req_send (req);
1282
1283 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1284} 1604}
1285 1605
1286void 1606void
1287aio_nop (callback=&PL_sv_undef) 1607aio_nop (callback=&PL_sv_undef)
1288 SV * callback 1608 SV * callback
1289 PPCODE: 1609 PPCODE:
1290{ 1610{
1291 dREQ; 1611 dREQ;
1292 1612
1293 req->type = REQ_NOP; 1613 req->type = REQ_NOP;
1294 1614
1295 REQ_SEND; 1615 REQ_SEND;
1296} 1616}
1297 1617
1298#if 0 1618int
1299 1619aioreq_pri (int pri = 0)
1300void 1620 PROTOTYPE: ;$
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE: 1621 CODE:
1622 RETVAL = next_pri - PRI_BIAS;
1623 if (items > 0)
1624 {
1303 if (pri < PRI_MIN) pri = PRI_MIN; 1625 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX; 1626 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS; 1627 next_pri = pri + PRI_BIAS;
1628 }
1629 OUTPUT:
1630 RETVAL
1306 1631
1307#endif 1632void
1633aioreq_nice (int nice = 0)
1634 CODE:
1635 nice = next_pri - nice;
1636 if (nice < PRI_MIN) nice = PRI_MIN;
1637 if (nice > PRI_MAX) nice = PRI_MAX;
1638 next_pri = nice + PRI_BIAS;
1308 1639
1309void 1640void
1310flush () 1641flush ()
1311 PROTOTYPE: 1642 PROTOTYPE:
1312 CODE: 1643 CODE:
1313 while (nreqs) 1644 while (nreqs)
1314 { 1645 {
1315 poll_wait (); 1646 poll_wait ();
1316 poll_cb (); 1647 poll_cb (0);
1317 } 1648 }
1318 1649
1319void 1650void
1320poll() 1651poll()
1321 PROTOTYPE: 1652 PROTOTYPE:
1322 CODE: 1653 CODE:
1323 if (nreqs) 1654 if (nreqs)
1324 { 1655 {
1325 poll_wait (); 1656 poll_wait ();
1326 poll_cb (); 1657 poll_cb (0);
1327 } 1658 }
1328 1659
1329int 1660int
1330poll_fileno() 1661poll_fileno()
1331 PROTOTYPE: 1662 PROTOTYPE:
… …
1355 CODE: 1686 CODE:
1356 RETVAL = nreqs; 1687 RETVAL = nreqs;
1357 OUTPUT: 1688 OUTPUT:
1358 RETVAL 1689 RETVAL
1359 1690
1691int
1692nready()
1693 PROTOTYPE:
1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1360PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1361 1718
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363 1720
1364void 1721void
1365cancel (aio_req_ornot req) 1722cancel (aio_req_ornot req)
1366 PROTOTYPE:
1367 CODE: 1723 CODE:
1368 req_cancel (req); 1724 req_cancel (req);
1369 1725
1370void 1726void
1371cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1727cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1380 PPCODE: 1736 PPCODE:
1381{ 1737{
1382 int i; 1738 int i;
1383 aio_req req; 1739 aio_req req;
1384 1740
1385 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1386 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1387 1743
1388 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1389 { 1745 {
1390 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
… …
1392 1748
1393 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1394 1750
1395 if (req) 1751 if (req)
1396 { 1752 {
1397 ++grp->length; 1753 ++grp->size;
1398 req->grp = grp; 1754 req->grp = grp;
1399 1755
1400 req->grp_prev = 0; 1756 req->grp_prev = 0;
1401 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1402 1758
… …
1407 } 1763 }
1408 } 1764 }
1409} 1765}
1410 1766
1411void 1767void
1768cancel_subs (aio_req_ornot req)
1769 CODE:
1770 req_cancel_subs (req);
1771
1772void
1412result (aio_req grp, ...) 1773result (aio_req grp, ...)
1413 CODE: 1774 CODE:
1414{ 1775{
1415 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1416 AV *av = newAV (); 1781 av = newAV ();
1417 1782
1418 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1419 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1420 1785
1421 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1422 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1423} 1788}
1424 1789
1425void 1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1794
1795void
1426feed_limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1427 CODE: 1797 CODE:
1428 grp->fd2 = limit; 1798 grp->int2 = limit;
1429 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1430 1800
1431void 1801void
1432feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1433 CODE: 1803 CODE:
1434{ 1804{
1435 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1436 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1437 1807
1438 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1439 grp->fd2 = 2; 1809 grp->int2 = 2;
1440 1810
1441 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1442} 1812}
1443 1813

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines