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.62 by root, Mon Oct 23 22:45:18 2006 UTC vs.
Revision 1.86 by root, Mon Oct 30 23:30:00 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines