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.86 by root, Mon Oct 30 23:30:00 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; 116 Stat_t *statdata;
92 off_t offset; 117 off_t offs;
93 size_t length; 118 size_t size;
94 ssize_t result; 119 ssize_t result;
95 120
96 STRLEN dataoffset; 121 STRLEN stroffset;
97 int type; 122 int type;
98 int fd, fd2; 123 int int1, int2;
99 int errorno; 124 int errorno;
100 mode_t mode; /* open */ 125 mode_t mode; /* open */
101 126
102 unsigned char flags; 127 unsigned char flags;
103 unsigned char pri; 128 unsigned char pri;
… …
105 SV *self; /* the perl counterpart of this request, if any */ 130 SV *self; /* the perl counterpart of this request, if any */
106 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
107} aio_cb; 132} aio_cb;
108 133
109enum { 134enum {
110 FLAG_CANCELLED = 0x01, 135 FLAG_CANCELLED = 0x01,
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */
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 ()
218{
219 fd_set rfd;
220
221 while (nreqs)
222 {
223 aio_req req;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
225 pthread_mutex_lock (&reslock);
226#endif
227 req = ress;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
229 pthread_mutex_unlock (&reslock);
230#endif
231
232 if (req)
233 return;
234
235 FD_ZERO(&rfd);
236 FD_SET(respipe [0], &rfd);
237
238 select (respipe [0] + 1, &rfd, 0, 0, 0);
239 }
240}
241
242static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
243{ 398{
244 dSP; 399 dSP;
245 int errorno = errno;
246 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
247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
248 return; 412 {
249
250 errno = req->errorno;
251
252 ENTER; 413 ENTER;
253 SAVETMPS; 414 SAVETMPS;
254 PUSHMARK (SP); 415 PUSHMARK (SP);
255 EXTEND (SP, 1); 416 EXTEND (SP, 1);
256 417
257 switch (req->type) 418 switch (req->type)
258 {
259 case REQ_READDIR:
260 { 419 {
261 SV *rv = &PL_sv_undef; 420 case REQ_READDIR:
262
263 if (req->result >= 0)
264 { 421 {
265 char *buf = req->data2ptr; 422 SV *rv = &PL_sv_undef;
266 AV *av = newAV ();
267 423
268 while (req->result) 424 if (req->result >= 0)
269 { 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 {
270 SV *sv = newSVpv (buf, 0); 434 SV *sv = newSVpv (buf, 0);
271 435
272 av_push (av, sv); 436 av_store (av, i, sv);
273 buf += SvCUR (sv) + 1; 437 buf += SvCUR (sv) + 1;
274 req->result--; 438 }
439
440 rv = sv_2mortal (newRV_noinc ((SV *)av));
275 } 441 }
276 442
277 rv = sv_2mortal (newRV_noinc ((SV *)av)); 443 PUSHs (rv);
278 } 444 }
445 break;
279 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;
280 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;
281 } 498 }
282 break;
283 499
284 case REQ_OPEN: 500 errno = req->errorno;
285 {
286 /* convert fd to fh */
287 SV *fh;
288 501
289 PUSHs (sv_2mortal (newSViv (req->result)));
290 PUTBACK; 502 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 }
323
324
325 PUTBACK;
326 call_sv (req->callback, G_VOID | G_EVAL); 503 call_sv (req->callback, G_VOID | G_EVAL);
327 SPAGAIN; 504 SPAGAIN;
328 505
329 FREETMPS; 506 FREETMPS;
330 LEAVE; 507 LEAVE;
331
332 errno = errorno;
333
334 if (SvTRUE (ERRSV))
335 { 508 }
336 req_free (req);
337 croak (0);
338 }
339}
340 509
341static void req_free (aio_req req)
342{
343 if (req->grp) 510 if (req->grp)
344 { 511 {
345 aio_req grp = req->grp; 512 aio_req grp = req->grp;
346 513
347 /* unlink request */ 514 /* unlink request */
… …
352 grp->grp_first = req->grp_next; 519 grp->grp_first = req->grp_next;
353 520
354 aio_grp_dec (grp); 521 aio_grp_dec (grp);
355 } 522 }
356 523
524 if (SvTRUE (ERRSV))
525 {
526 req_free (req);
527 croak (0);
528 }
529}
530
531static void req_free (aio_req req)
532{
357 if (req->self) 533 if (req->self)
358 { 534 {
359 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
361 } 537 }
362 538
363 SvREFCNT_dec (req->data);
364 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
365 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
366 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata); 543 Safefree (req->statdata);
368 544
369 if (req->type == REQ_READDIR && req->result >= 0) 545 if (req->type == REQ_READDIR)
370 free (req->data2ptr); 546 free (req->ptr2);
371 547
372 Safefree (req); 548 Safefree (req);
373} 549}
374 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
375static void req_cancel (aio_req req) 565static void req_cancel (aio_req req)
376{ 566{
377 req->flags |= FLAG_CANCELLED; 567 req->flags |= FLAG_CANCELLED;
378 568
379 if (req->type == REQ_GROUP) 569 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} 570}
454 571
455static void *aio_proc(void *arg); 572static void *aio_proc(void *arg);
456 573
457static void start_thread (void) 574static void start_thread (void)
458{ 575{
459 sigset_t fullsigset, oldsigset; 576 sigset_t fullsigset, oldsigset;
460 pthread_t tid;
461 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");
462 583
463 pthread_attr_init (&attr); 584 pthread_attr_init (&attr);
464 pthread_attr_setstacksize (&attr, STACKSIZE); 585 pthread_attr_setstacksize (&attr, STACKSIZE);
465 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
466 590
467 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
468 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469 595
470 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;
471 started++; 602 ++started;
603 }
604 else
605 free (wrk);
472 606
473 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 ();
474} 621}
475 622
476static void req_send (aio_req req) 623static void req_send (aio_req req)
477{ 624{
478 while (started < wanted && nreqs >= started)
479 start_thread ();
480
481 ++nreqs; 625 ++nreqs;
482 626
483 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
484 628 ++nready;
485 req->next = 0; 629 reqq_push (&req_queue, req);
486
487 if (reqe)
488 {
489 reqe->next = req;
490 reqe = req;
491 }
492 else
493 reqe = reqs = req;
494
495 pthread_cond_signal (&reqwait); 630 pthread_cond_signal (&reqwait);
496 pthread_mutex_unlock (&reqlock); 631 UNLOCK (reqlock);
497 632
498 if (nreqs > max_outstanding) 633 maybe_start_thread ();
499 for (;;)
500 {
501 poll_cb ();
502
503 if (nreqs <= max_outstanding)
504 break;
505
506 poll_wait ();
507 }
508} 634}
509 635
510static void end_thread (void) 636static void end_thread (void)
511{ 637{
512 aio_req req; 638 aio_req req;
639
513 Newz (0, req, 1, aio_cb); 640 Newz (0, req, 1, aio_cb);
641
514 req->type = REQ_QUIT; 642 req->type = REQ_QUIT;
643 req->pri = PRI_MAX + PRI_BIAS;
515 644
516 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);
517} 660}
518 661
519static void min_parallel (int nthreads) 662static void min_parallel (int nthreads)
520{ 663{
521 if (wanted < nthreads) 664 if (wanted < nthreads)
522 wanted = nthreads; 665 wanted = nthreads;
523} 666}
524 667
525static void max_parallel (int nthreads) 668static void max_parallel (int nthreads)
526{ 669{
527 int cur = started;
528
529 if (wanted > nthreads) 670 if (wanted > nthreads)
530 wanted = nthreads; 671 wanted = nthreads;
531 672
532 while (cur > wanted)
533 {
534 end_thread ();
535 cur--;
536 }
537
538 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);
539 { 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
540 poll_wait (); 770 poll_wait ();
541 poll_cb (); 771
772 ++maxreqs;
542 } 773 }
774
775 return count;
543} 776}
544 777
545static void create_pipe () 778static void create_pipe ()
546{ 779{
547 if (pipe (respipe)) 780 if (pipe (respipe))
… …
571static 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)
572{ 805{
573 ssize_t res; 806 ssize_t res;
574 off_t ooffset; 807 off_t ooffset;
575 808
576 pthread_mutex_lock (&preadwritelock); 809 LOCK (preadwritelock);
577 ooffset = lseek (fd, 0, SEEK_CUR); 810 ooffset = lseek (fd, 0, SEEK_CUR);
578 lseek (fd, offset, SEEK_SET); 811 lseek (fd, offset, SEEK_SET);
579 res = read (fd, buf, count); 812 res = read (fd, buf, count);
580 lseek (fd, ooffset, SEEK_SET); 813 lseek (fd, ooffset, SEEK_SET);
581 pthread_mutex_unlock (&preadwritelock); 814 UNLOCK (preadwritelock);
582 815
583 return res; 816 return res;
584} 817}
585 818
586static 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)
587{ 820{
588 ssize_t res; 821 ssize_t res;
589 off_t ooffset; 822 off_t ooffset;
590 823
591 pthread_mutex_lock (&preadwritelock); 824 LOCK (preadwritelock);
592 ooffset = lseek (fd, 0, SEEK_CUR); 825 ooffset = lseek (fd, 0, SEEK_CUR);
593 lseek (fd, offset, SEEK_SET); 826 lseek (fd, offset, SEEK_SET);
594 res = write (fd, buf, count); 827 res = write (fd, buf, count);
595 lseek (fd, offset, SEEK_SET); 828 lseek (fd, offset, SEEK_SET);
596 pthread_mutex_unlock (&preadwritelock); 829 UNLOCK (preadwritelock);
597 830
598 return res; 831 return res;
599} 832}
600#endif 833#endif
601 834
602#if !HAVE_FDATASYNC 835#if !HAVE_FDATASYNC
603# define fdatasync fsync 836# define fdatasync fsync
604#endif 837#endif
605 838
606#if !HAVE_READAHEAD 839#if !HAVE_READAHEAD
607# define readahead aio_readahead 840# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608 841
609static 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)
610{ 843{
611 dBUF; 844 dBUF;
612 845
613 while (count > 0) 846 while (count > 0)
614 { 847 {
… …
617 pread (fd, aio_buf, len, offset); 850 pread (fd, aio_buf, len, offset);
618 offset += len; 851 offset += len;
619 count -= len; 852 count -= len;
620 } 853 }
621 854
622 fBUF;
623
624 errno = 0; 855 errno = 0;
625} 856}
857
626#endif 858#endif
627 859
628#if !HAVE_READDIR_R 860#if !HAVE_READDIR_R
629# define readdir_r aio_readdir_r 861# define readdir_r aio_readdir_r
630 862
… …
633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 865static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
634{ 866{
635 struct dirent *e; 867 struct dirent *e;
636 int errorno; 868 int errorno;
637 869
638 pthread_mutex_lock (&readdirlock); 870 LOCK (readdirlock);
639 871
640 e = readdir (dirp); 872 e = readdir (dirp);
641 errorno = errno; 873 errorno = errno;
642 874
643 if (e) 875 if (e)
… …
646 strcpy (ent->d_name, e->d_name); 878 strcpy (ent->d_name, e->d_name);
647 } 879 }
648 else 880 else
649 *res = 0; 881 *res = 0;
650 882
651 pthread_mutex_unlock (&readdirlock); 883 UNLOCK (readdirlock);
652 884
653 errno = errorno; 885 errno = errorno;
654 return e ? 0 : -1; 886 return e ? 0 : -1;
655} 887}
656#endif 888#endif
657 889
658/* sendfile always needs emulation */ 890/* sendfile always needs emulation */
659static 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)
660{ 892{
661 ssize_t res; 893 ssize_t res;
662 894
663 if (!count) 895 if (!count)
664 return 0; 896 return 0;
… …
675 { 907 {
676 off_t sbytes; 908 off_t sbytes;
677 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 909 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
678 910
679 if (res < 0 && sbytes) 911 if (res < 0 && sbytes)
680 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 912 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
681 res = sbytes; 913 res = sbytes;
682 } 914 }
683 915
684# elif __hpux 916# elif __hpux
685 res = sendfile (ofd, ifd, offset, count, 0, 0); 917 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
741 973
742 offset += cnt; 974 offset += cnt;
743 res += cnt; 975 res += cnt;
744 count -= cnt; 976 count -= cnt;
745 } 977 }
746
747 fBUF;
748 } 978 }
749 979
750 return res; 980 return res;
751} 981}
752 982
753/* read a full directory */ 983/* read a full directory */
754static int scandir_ (const char *path, void **namesp) 984static void scandir_ (aio_req req, worker *self)
755{ 985{
756 DIR *dirp; 986 DIR *dirp;
757 union 987 union
758 { 988 {
759 struct dirent d; 989 struct dirent d;
… …
764 int memlen = 4096; 994 int memlen = 4096;
765 int memofs = 0; 995 int memofs = 0;
766 int res = 0; 996 int res = 0;
767 int errorno; 997 int errorno;
768 998
769 dirp = opendir (path); 999 LOCK (wrklock);
770 if (!dirp) 1000 self->dirp = dirp = opendir (req->ptr1);
771 return -1;
772
773 u = malloc (sizeof (*u)); 1001 self->dbuf = u = malloc (sizeof (*u));
774 names = malloc (memlen); 1002 req->ptr2 = names = malloc (memlen);
1003 UNLOCK (wrklock);
775 1004
776 if (u && names) 1005 if (dirp && u && names)
777 for (;;) 1006 for (;;)
778 { 1007 {
779 errno = 0; 1008 errno = 0;
780 readdir_r (dirp, &u->d, &entp); 1009 readdir_r (dirp, &u->d, &entp);
781 1010
… …
791 res++; 1020 res++;
792 1021
793 while (memofs + len > memlen) 1022 while (memofs + len > memlen)
794 { 1023 {
795 memlen *= 2; 1024 memlen *= 2;
1025 LOCK (wrklock);
796 names = realloc (names, memlen); 1026 req->ptr2 = names = realloc (names, memlen);
1027 UNLOCK (wrklock);
1028
797 if (!names) 1029 if (!names)
798 break; 1030 break;
799 } 1031 }
800 1032
801 memcpy (names + memofs, name, len); 1033 memcpy (names + memofs, name, len);
802 memofs += len; 1034 memofs += len;
803 } 1035 }
804 } 1036 }
805 1037
806 errorno = errno;
807 free (u);
808 closedir (dirp);
809
810 if (errorno) 1038 if (errno)
811 {
812 free (names);
813 errno = errorno;
814 res = -1; 1039 res = -1;
815 } 1040
816 1041 req->result = res;
817 *namesp = (void *)names;
818 return res;
819} 1042}
820 1043
821/*****************************************************************************/ 1044/*****************************************************************************/
822 1045
823static void *aio_proc (void *thr_arg) 1046static void *aio_proc (void *thr_arg)
824{ 1047{
825 aio_req req; 1048 aio_req req;
826 int type; 1049 struct timespec ts;
1050 worker *self = (worker *)thr_arg;
827 1051
828 do 1052 /* try to distribute timeouts somewhat evenly */
1053 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1054 * (1000000000UL / 1024UL);
1055
1056 for (;;)
829 { 1057 {
830 pthread_mutex_lock (&reqlock); 1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059
1060 LOCK (reqlock);
831 1061
832 for (;;) 1062 for (;;)
833 { 1063 {
834 req = reqs; 1064 self->req = req = reqq_shift (&req_queue);
835
836 if (reqs)
837 {
838 reqs = reqs->next;
839 if (!reqs) reqe = 0;
840 }
841 1065
842 if (req) 1066 if (req)
843 break; 1067 break;
844 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 */
845 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
846 } 1090 }
847 1091
848 pthread_mutex_unlock (&reqlock); 1092 --nready;
1093
1094 UNLOCK (reqlock);
849 1095
850 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */
852 1097
853 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
854 switch (type) 1099 switch (req->type)
855 { 1100 {
856 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;
857 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;
858 1103
859 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;
860 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;
861 1106
862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
863 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
864 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
865 1110
866 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;
867 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
868 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
869 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
870 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
872 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;
873 1120
874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
875 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
877 1124
878 case REQ_SLEEP: 1125 case REQ_BUSY:
879 { 1126 {
880 struct timeval tv; 1127 struct timeval tv;
881 1128
882 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
883 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
884 1131
885 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
886 } 1133 }
887 1134
888 case REQ_GROUP: 1135 case REQ_GROUP:
889 case REQ_NOP: 1136 case REQ_NOP:
1137 break;
1138
890 case REQ_QUIT: 1139 case REQ_QUIT:
891 break; 1140 goto quit;
892 1141
893 default: 1142 default:
894 req->result = ENOSYS; 1143 req->result = ENOSYS;
895 break; 1144 break;
896 } 1145 }
897 1146
898 req->errorno = errno; 1147 req->errorno = errno;
899 1148
900 pthread_mutex_lock (&reslock); 1149 LOCK (reslock);
901 1150
902 req->next = 0; 1151 ++npending;
903 1152
904 if (rese) 1153 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 */ 1154 /* write a dummy byte to the pipe so fh becomes ready */
914 write (respipe [1], &respipe, 1); 1155 write (respipe [1], &respipe, 1);
915 }
916 1156
917 pthread_mutex_unlock (&reslock); 1157 self->req = 0;
1158 worker_clear (self);
1159
1160 UNLOCK (reslock);
918 } 1161 }
919 while (type != REQ_QUIT); 1162
1163quit:
1164 LOCK (wrklock);
1165 worker_free (self);
1166 UNLOCK (wrklock);
920 1167
921 return 0; 1168 return 0;
922} 1169}
923 1170
924/*****************************************************************************/ 1171/*****************************************************************************/
925 1172
926static void atfork_prepare (void) 1173static void atfork_prepare (void)
927{ 1174{
928 pthread_mutex_lock (&reqlock); 1175 LOCK (wrklock);
929 pthread_mutex_lock (&reslock); 1176 LOCK (reqlock);
1177 LOCK (reslock);
930#if !HAVE_PREADWRITE 1178#if !HAVE_PREADWRITE
931 pthread_mutex_lock (&preadwritelock); 1179 LOCK (preadwritelock);
932#endif 1180#endif
933#if !HAVE_READDIR_R 1181#if !HAVE_READDIR_R
934 pthread_mutex_lock (&readdirlock); 1182 LOCK (readdirlock);
935#endif 1183#endif
936} 1184}
937 1185
938static void atfork_parent (void) 1186static void atfork_parent (void)
939{ 1187{
940#if !HAVE_READDIR_R 1188#if !HAVE_READDIR_R
941 pthread_mutex_unlock (&readdirlock); 1189 UNLOCK (readdirlock);
942#endif 1190#endif
943#if !HAVE_PREADWRITE 1191#if !HAVE_PREADWRITE
944 pthread_mutex_unlock (&preadwritelock); 1192 UNLOCK (preadwritelock);
945#endif 1193#endif
946 pthread_mutex_unlock (&reslock); 1194 UNLOCK (reslock);
947 pthread_mutex_unlock (&reqlock); 1195 UNLOCK (reqlock);
1196 UNLOCK (wrklock);
948} 1197}
949 1198
950static void atfork_child (void) 1199static void atfork_child (void)
951{ 1200{
952 aio_req prv; 1201 aio_req prv;
953 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
954 started = 0; 1220 started = 0;
955 1221 idle = 0;
956 while (reqs) 1222 nreqs = 0;
957 { 1223 nready = 0;
958 prv = reqs; 1224 npending = 0;
959 reqs = prv->next;
960 req_free (prv);
961 }
962
963 reqs = reqe = 0;
964
965 while (ress)
966 {
967 prv = ress;
968 ress = prv->next;
969 req_free (prv);
970 }
971
972 ress = rese = 0;
973 1225
974 close (respipe [0]); 1226 close (respipe [0]);
975 close (respipe [1]); 1227 close (respipe [1]);
976 create_pipe (); 1228 create_pipe ();
977 1229
… …
1004PROTOTYPES: ENABLE 1256PROTOTYPES: ENABLE
1005 1257
1006BOOT: 1258BOOT:
1007{ 1259{
1008 HV *stash = gv_stashpv ("IO::AIO", 1); 1260 HV *stash = gv_stashpv ("IO::AIO", 1);
1261
1009 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1010 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1011 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));
1012 1268
1013 create_pipe (); 1269 create_pipe ();
1014 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1015} 1271}
1016 1272
1017void 1273void
1018min_parallel (nthreads) 1274max_poll_reqs (int nreqs)
1019 int nthreads
1020 PROTOTYPE: $ 1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
1021 1278
1022void 1279void
1023max_parallel (nthreads) 1280max_poll_time (double nseconds)
1024 int nthreads
1025 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);
1026 1298
1027int 1299int
1028max_outstanding (nreqs) 1300max_outstanding (int maxreqs)
1029 int nreqs 1301 PROTOTYPE: $
1030 PROTOTYPE: $
1031 CODE: 1302 CODE:
1032 RETVAL = max_outstanding; 1303 RETVAL = max_outstanding;
1033 max_outstanding = nreqs; 1304 max_outstanding = maxreqs;
1305 OUTPUT:
1306 RETVAL
1034 1307
1035void 1308void
1036aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1309aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037 SV * pathname 1310 SV * pathname
1038 int flags 1311 int flags
… …
1042 PPCODE: 1315 PPCODE:
1043{ 1316{
1044 dREQ; 1317 dREQ;
1045 1318
1046 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1047 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1048 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1049 req->fd = flags; 1322 req->int1 = flags;
1050 req->mode = mode; 1323 req->mode = mode;
1051 1324
1052 REQ_SEND; 1325 REQ_SEND;
1053} 1326}
1054 1327
… …
1064 PPCODE: 1337 PPCODE:
1065{ 1338{
1066 dREQ; 1339 dREQ;
1067 1340
1068 req->type = ix; 1341 req->type = ix;
1069 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1070 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1071 1344
1072 REQ_SEND (req); 1345 REQ_SEND (req);
1073} 1346}
1074 1347
1075void 1348void
… …
1084 aio_read = REQ_READ 1357 aio_read = REQ_READ
1085 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1086 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1087 PPCODE: 1360 PPCODE:
1088{ 1361{
1089 aio_req req;
1090 STRLEN svlen; 1362 STRLEN svlen;
1091 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1092 1364
1093 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1094 SvPOK_on (data); 1366 SvPOK_on (data);
… …
1116 1388
1117 { 1389 {
1118 dREQ; 1390 dREQ;
1119 1391
1120 req->type = ix; 1392 req->type = ix;
1121 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1122 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1123 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1124 req->offset = offset; 1396 req->offs = offset;
1125 req->length = length; 1397 req->size = length;
1126 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1127 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1128 1401
1129 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1130 { 1403 {
1131 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1132 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1133 } 1406 }
1134 1407
1135 REQ_SEND; 1408 REQ_SEND;
1136 } 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;
1137} 1432}
1138 1433
1139void 1434void
1140aio_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)
1141 SV * out_fh 1436 SV * out_fh
… …
1147 PPCODE: 1442 PPCODE:
1148{ 1443{
1149 dREQ; 1444 dREQ;
1150 1445
1151 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1152 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1153 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1154 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1155 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1156 req->offset = in_offset; 1451 req->offs = in_offset;
1157 req->length = length; 1452 req->size = length;
1158 1453
1159 REQ_SEND; 1454 REQ_SEND;
1160} 1455}
1161 1456
1162void 1457void
… …
1169 PPCODE: 1464 PPCODE:
1170{ 1465{
1171 dREQ; 1466 dREQ;
1172 1467
1173 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1174 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1175 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1176 req->offset = offset; 1471 req->offs = offset;
1177 req->length = length; 1472 req->size = length;
1178 1473
1179 REQ_SEND; 1474 REQ_SEND;
1180} 1475}
1181 1476
1182void 1477void
… …
1198 } 1493 }
1199 1494
1200 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1201 { 1496 {
1202 req->type = ix; 1497 req->type = ix;
1203 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1204 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1205 } 1500 }
1206 else 1501 else
1207 { 1502 {
1208 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1209 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1210 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1211 } 1506 }
1212 1507
1213 REQ_SEND; 1508 REQ_SEND;
1214} 1509}
1215 1510
1216void 1511void
1217aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1218 SV * pathname 1513 SV * pathname
1219 SV * callback 1514 SV * callback
1220 ALIAS: 1515 ALIAS:
1221 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1222 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1223 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1224 PPCODE: 1519 PPCODE:
1225{ 1520{
1226 dREQ; 1521 dREQ;
1227 1522
1228 req->type = ix; 1523 req->type = ix;
1229 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1230 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1231 1526
1232 REQ_SEND; 1527 REQ_SEND;
1233} 1528}
1234 1529
1235void 1530void
1236aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1237 SV * oldpath 1532 SV * oldpath
1238 SV * newpath 1533 SV * newpath
1239 SV * callback 1534 SV * callback
1240 ALIAS: 1535 ALIAS:
1241 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1242 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1243 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1244 PPCODE: 1539 PPCODE:
1245{ 1540{
1246 dREQ; 1541 dREQ;
1247 1542
1248 req->type = ix; 1543 req->type = ix;
1249 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1250 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1251 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1252 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1253 1548
1254 REQ_SEND; 1549 REQ_SEND;
1255} 1550}
1256 1551
1257void 1552void
1258aio_sleep (delay,callback=&PL_sv_undef) 1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1259 double delay 1554 SV * pathname
1260 SV * callback 1555 SV * callback
1556 UV mode
1557 UV dev
1261 PPCODE: 1558 PPCODE:
1262{ 1559{
1263 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}
1264 1570
1571void
1572aio_busy (delay,callback=&PL_sv_undef)
1573 double delay
1574 SV * callback
1575 PPCODE:
1576{
1577 dREQ;
1578
1265 req->type = REQ_SLEEP; 1579 req->type = REQ_BUSY;
1266 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1268 1582
1269 REQ_SEND; 1583 REQ_SEND;
1270} 1584}
1271 1585
1272void 1586void
… …
1276 PPCODE: 1590 PPCODE:
1277{ 1591{
1278 dREQ; 1592 dREQ;
1279 1593
1280 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1281 req_send (req); 1596 req_send (req);
1282
1283 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1284} 1598}
1285 1599
1286void 1600void
1287aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1288 SV * callback 1602 SV * callback
1289 PPCODE: 1603 PPCODE:
1290{ 1604{
1291 dREQ; 1605 dREQ;
1292 1606
1293 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
1294 1608
1295 REQ_SEND; 1609 REQ_SEND;
1296} 1610}
1297 1611
1298#if 0 1612int
1299 1613aioreq_pri (int pri = 0)
1300void 1614 PROTOTYPE: ;$
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE: 1615 CODE:
1616 RETVAL = next_pri - PRI_BIAS;
1617 if (items > 0)
1618 {
1303 if (pri < PRI_MIN) pri = PRI_MIN; 1619 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX; 1620 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS; 1621 next_pri = pri + PRI_BIAS;
1622 }
1623 OUTPUT:
1624 RETVAL
1306 1625
1307#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;
1308 1633
1309void 1634void
1310flush () 1635flush ()
1311 PROTOTYPE: 1636 PROTOTYPE:
1312 CODE: 1637 CODE:
1313 while (nreqs) 1638 while (nreqs)
1314 { 1639 {
1315 poll_wait (); 1640 poll_wait ();
1316 poll_cb (); 1641 poll_cb (0);
1317 } 1642 }
1318 1643
1319void 1644void
1320poll() 1645poll()
1321 PROTOTYPE: 1646 PROTOTYPE:
1322 CODE: 1647 CODE:
1323 if (nreqs) 1648 if (nreqs)
1324 { 1649 {
1325 poll_wait (); 1650 poll_wait ();
1326 poll_cb (); 1651 poll_cb (0);
1327 } 1652 }
1328 1653
1329int 1654int
1330poll_fileno() 1655poll_fileno()
1331 PROTOTYPE: 1656 PROTOTYPE:
… …
1355 CODE: 1680 CODE:
1356 RETVAL = nreqs; 1681 RETVAL = nreqs;
1357 OUTPUT: 1682 OUTPUT:
1358 RETVAL 1683 RETVAL
1359 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
1360PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1361 1712
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1713MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363 1714
1364void 1715void
1365cancel (aio_req_ornot req) 1716cancel (aio_req_ornot req)
1366 PROTOTYPE:
1367 CODE: 1717 CODE:
1368 req_cancel (req); 1718 req_cancel (req);
1369 1719
1370void 1720void
1371cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1721cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1380 PPCODE: 1730 PPCODE:
1381{ 1731{
1382 int i; 1732 int i;
1383 aio_req req; 1733 aio_req req;
1384 1734
1385 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1386 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");
1387 1737
1388 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1389 { 1739 {
1390 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
… …
1392 1742
1393 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1394 1744
1395 if (req) 1745 if (req)
1396 { 1746 {
1397 ++grp->length; 1747 ++grp->size;
1398 req->grp = grp; 1748 req->grp = grp;
1399 1749
1400 req->grp_prev = 0; 1750 req->grp_prev = 0;
1401 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1402 1752
… …
1407 } 1757 }
1408 } 1758 }
1409} 1759}
1410 1760
1411void 1761void
1762cancel_subs (aio_req_ornot req)
1763 CODE:
1764 req_cancel_subs (req);
1765
1766void
1412result (aio_req grp, ...) 1767result (aio_req grp, ...)
1413 CODE: 1768 CODE:
1414{ 1769{
1415 int i; 1770 int i;
1771 AV *av;
1772
1773 grp->errorno = errno;
1774
1416 AV *av = newAV (); 1775 av = newAV ();
1417 1776
1418 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1419 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1420 1779
1421 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1422 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1423} 1782}
1424 1783
1425void 1784void
1785errno (aio_req grp, int errorno = errno)
1786 CODE:
1787 grp->errorno = errorno;
1788
1789void
1426feed_limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1427 CODE: 1791 CODE:
1428 grp->fd2 = limit; 1792 grp->int2 = limit;
1429 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1430 1794
1431void 1795void
1432feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1433 CODE: 1797 CODE:
1434{ 1798{
1435 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1436 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1437 1801
1438 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1439 grp->fd2 = 2; 1803 grp->int2 = 2;
1440 1804
1441 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1442} 1806}
1443 1807

Diff Legend

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