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.45 by root, Sun Oct 22 00:19:05 2006 UTC vs.
Revision 1.74 by root, Wed Oct 25 17:57:30 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux
5# define _GNU_SOURCE
6#endif
7
1#define _REENTRANT 1 8#define _REENTRANT 1
9
2#include <errno.h> 10#include <errno.h>
3 11
4#include "EXTERN.h" 12#include "EXTERN.h"
5#include "perl.h" 13#include "perl.h"
6#include "XSUB.h" 14#include "XSUB.h"
41# define NAME_MAX 4096 49# define NAME_MAX 4096
42#endif 50#endif
43 51
44#if __ia64 52#if __ia64
45# define STACKSIZE 65536 53# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN
46#else 56#else
47# define STACKSIZE 8192 57# define STACKSIZE 16384
48#endif 58#endif
59
60/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536
62
63#define dBUF \
64 char *aio_buf; \
65 LOCK (wrklock); \
66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \
68 if (!aio_buf) \
69 return -1;
49 70
50enum { 71enum {
51 REQ_QUIT, 72 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 73 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 74 REQ_READ, REQ_WRITE, REQ_READAHEAD,
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 76 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 79 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 80 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP, 81 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 82 REQ_BUSY,
62}; 83};
63 84
64#define AIO_REQ_KLASS "IO::AIO::REQ" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 86#define AIO_GRP_KLASS "IO::AIO::GRP"
66 87
67typedef struct aio_cb 88typedef struct aio_cb
68{ 89{
69 struct aio_cb *grp, *grp_prev, *grp_next;
70
71 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 91
75 SV *data, *callback; 92 SV *data, *callback;
76 SV *fh, *fh2; 93 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 94 void *dataptr, *data2ptr;
78 Stat_t *statdata; 95 Stat_t *statdata;
79 off_t offset; 96 off_t offset;
80 size_t length; 97 size_t length;
81 ssize_t result; 98 ssize_t result;
82 99
100 STRLEN dataoffset;
83 int type; 101 int type;
84 int fd, fd2; 102 int fd, fd2;
85 int errorno; 103 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 104 mode_t mode; /* open */
105
88 unsigned char cancelled; 106 unsigned char flags;
107 unsigned char pri;
108
109 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 111} aio_cb;
112
113enum {
114 FLAG_CANCELLED = 0x01,
115};
90 116
91typedef aio_cb *aio_req; 117typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 118typedef aio_cb *aio_req_ornot;
93typedef aio_cb *aio_group; 119
120enum {
121 PRI_MIN = -4,
122 PRI_MAX = 4,
123
124 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127};
128
129static int next_pri = DEFAULT_PRI + PRI_BIAS;
94 130
95static int started, wanted; 131static int started, wanted;
96static volatile int nreqs; 132static volatile int nreqs;
97static int max_outstanding = 1<<30;
98static int respipe [2]; 133static int respipe [2];
99 134
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif
140
141#define LOCK(mutex) pthread_mutex_lock (&(mutex))
142#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
143
144/* worker threasd management */
145static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
146
147typedef struct worker {
148 /* locked by wrklock */
149 struct worker *prev, *next;
150
151 pthread_t tid;
152
153 /* locked by reslock, reqlock or wrklock */
154 aio_req req; /* currently processed request */
155 void *dbuf;
156 DIR *dirp;
157} worker;
158
159static worker wrk_first = { &wrk_first, &wrk_first, 0 };
160
161static void worker_clear (worker *wrk)
162{
163 if (wrk->dirp)
164 {
165 closedir (wrk->dirp);
166 wrk->dirp = 0;
167 }
168
169 if (wrk->dbuf)
170 {
171 free (wrk->dbuf);
172 wrk->dbuf = 0;
173 }
174}
175
176static void worker_free (worker *wrk)
177{
178 wrk->next->prev = wrk->prev;
179 wrk->prev->next = wrk->next;
180
181 free (wrk);
182}
183
100static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 184static pthread_mutex_t reslock = AIO_MUTEX_INIT;
101static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 185static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
102static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 186static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
103 187
104static volatile aio_req reqs, reqe; /* queue start, queue end */ 188/*
105static volatile aio_req ress, rese; /* queue start, queue end */ 189 * a somewhat faster data structure might be nice, but
190 * with 8 priorities this actually needs <20 insns
191 * per shift, the most expensive operation.
192 */
193typedef struct {
194 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
195 int size;
196} reqq;
106 197
198static reqq req_queue;
199static reqq res_queue;
200
201int reqq_push (reqq *q, aio_req req)
202{
203 int pri = req->pri;
204 req->next = 0;
205
206 if (q->qe[pri])
207 {
208 q->qe[pri]->next = req;
209 q->qe[pri] = req;
210 }
211 else
212 q->qe[pri] = q->qs[pri] = req;
213
214 return q->size++;
215}
216
217aio_req reqq_shift (reqq *q)
218{
219 int pri;
220
221 if (!q->size)
222 return 0;
223
224 --q->size;
225
226 for (pri = NUM_PRI; pri--; )
227 {
228 aio_req req = q->qs[pri];
229
230 if (req)
231 {
232 if (!(q->qs[pri] = req->next))
233 q->qe[pri] = 0;
234
235 return req;
236 }
237 }
238
239 abort ();
240}
241
242static int poll_cb ();
243static void req_invoke (aio_req req);
107static void req_free (aio_req req); 244static void req_free (aio_req req);
245static void req_cancel (aio_req req);
108 246
109/* must be called at most once */ 247/* must be called at most once */
110static SV *req_sv (aio_req req, const char *klass) 248static SV *req_sv (aio_req req, const char *klass)
111{ 249{
250 if (!req->self)
251 {
112 req->self = (SV *)newHV (); 252 req->self = (SV *)newHV ();
113 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 253 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
254 }
114 255
115 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 256 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
116} 257}
117 258
118static aio_req SvAIO_REQ (SV *sv) 259static aio_req SvAIO_REQ (SV *sv)
119{ 260{
261 MAGIC *mg;
262
120 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 263 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
121 croak ("object of class " AIO_REQ_KLASS " expected"); 264 croak ("object of class " AIO_REQ_KLASS " expected");
122 265
123 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 266 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
124 267
125 return mg ? (aio_req)mg->mg_ptr : 0; 268 return mg ? (aio_req)mg->mg_ptr : 0;
126} 269}
127 270
271static void aio_grp_feed (aio_req grp)
272{
273 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
274 {
275 int old_len = grp->length;
276
277 if (grp->fh2 && SvOK (grp->fh2))
278 {
279 dSP;
280
281 ENTER;
282 SAVETMPS;
283 PUSHMARK (SP);
284 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
285 PUTBACK;
286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
287 SPAGAIN;
288 FREETMPS;
289 LEAVE;
290 }
291
292 /* stop if no progress has been made */
293 if (old_len == grp->length)
294 {
295 SvREFCNT_dec (grp->fh2);
296 grp->fh2 = 0;
297 break;
298 }
299 }
300}
301
302static void aio_grp_dec (aio_req grp)
303{
304 --grp->length;
305
306 /* call feeder, if applicable */
307 aio_grp_feed (grp);
308
309 /* finish, if done */
310 if (!grp->length && grp->fd)
311 {
312 req_invoke (grp);
313 req_free (grp);
314 }
315}
316
128static void poll_wait () 317static void poll_wait ()
129{ 318{
130 if (nreqs && !ress)
131 {
132 fd_set rfd; 319 fd_set rfd;
320
321 while (nreqs)
322 {
323 int size;
324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
325 LOCK (reslock);
326#endif
327 size = res_queue.size;
328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
329 UNLOCK (reslock);
330#endif
331
332 if (size)
333 return;
334
133 FD_ZERO(&rfd); 335 FD_ZERO(&rfd);
134 FD_SET(respipe [0], &rfd); 336 FD_SET(respipe [0], &rfd);
135 337
136 select (respipe [0] + 1, &rfd, 0, 0, 0); 338 select (respipe [0] + 1, &rfd, 0, 0, 0);
137 } 339 }
138} 340}
139 341
140static void req_invoke (aio_req req) 342static void req_invoke (aio_req req)
141{ 343{
142 dSP; 344 dSP;
143 int errorno = errno;
144 345
145 if (req->cancelled || !SvOK (req->callback)) 346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
146 return; 347 {
147
148 errno = req->errorno; 348 errno = req->errorno;
149 349
150 ENTER; 350 ENTER;
351 SAVETMPS;
151 PUSHMARK (SP); 352 PUSHMARK (SP);
353 EXTEND (SP, 1);
152 354
153 switch (req->type) 355 switch (req->type)
154 {
155 case REQ_READDIR:
156 { 356 {
157 SV *rv = &PL_sv_undef; 357 case REQ_READDIR:
158
159 if (req->result >= 0)
160 { 358 {
161 char *buf = req->data2ptr; 359 SV *rv = &PL_sv_undef;
162 AV *av = newAV ();
163 360
164 while (req->result) 361 if (req->result >= 0)
165 { 362 {
363 int i;
364 char *buf = req->data2ptr;
365 AV *av = newAV ();
366
367 av_extend (av, req->result - 1);
368
369 for (i = 0; i < req->result; ++i)
370 {
166 SV *sv = newSVpv (buf, 0); 371 SV *sv = newSVpv (buf, 0);
167 372
168 av_push (av, sv); 373 av_store (av, i, sv);
169 buf += SvCUR (sv) + 1; 374 buf += SvCUR (sv) + 1;
170 req->result--; 375 }
376
377 rv = sv_2mortal (newRV_noinc ((SV *)av));
171 } 378 }
172 379
173 rv = sv_2mortal (newRV_noinc ((SV *)av)); 380 PUSHs (rv);
174 } 381 }
382 break;
175 383
176 XPUSHs (rv); 384 case REQ_OPEN:
385 {
386 /* convert fd to fh */
387 SV *fh;
388
389 PUSHs (sv_2mortal (newSViv (req->result)));
390 PUTBACK;
391 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
392 SPAGAIN;
393
394 fh = SvREFCNT_inc (POPs);
395
396 PUSHMARK (SP);
397 XPUSHs (sv_2mortal (fh));
398 }
399 break;
400
401 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */
403
404 if (req->data)
405 {
406 int i;
407 AV *av = (AV *)req->data;
408
409 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0));
412 }
413 break;
414
415 case REQ_NOP:
416 case REQ_BUSY:
417 break;
418
419 default:
420 PUSHs (sv_2mortal (newSViv (req->result)));
421 break;
177 } 422 }
178 break;
179 423
180 case REQ_OPEN:
181 {
182 /* convert fd to fh */
183 SV *fh;
184 424
185 XPUSHs (sv_2mortal (newSViv (req->result)));
186 PUTBACK; 425 PUTBACK;
187 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
188 SPAGAIN;
189
190 fh = SvREFCNT_inc (POPs);
191
192 PUSHMARK (SP);
193 XPUSHs (sv_2mortal (fh));
194 }
195 break;
196
197 case REQ_SLEEP:
198 case REQ_GROUP:
199 break;
200
201 default:
202 XPUSHs (sv_2mortal (newSViv (req->result)));
203 break;
204 }
205
206
207 PUTBACK;
208 call_sv (req->callback, G_VOID | G_EVAL); 426 call_sv (req->callback, G_VOID | G_EVAL);
209 SPAGAIN; 427 SPAGAIN;
428
429 FREETMPS;
430 LEAVE;
431 }
432
433 if (req->grp)
434 {
435 aio_req grp = req->grp;
436
437 /* unlink request */
438 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
439 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
440
441 if (grp->grp_first == req)
442 grp->grp_first = req->grp_next;
443
444 aio_grp_dec (grp);
445 }
210 446
211 if (SvTRUE (ERRSV)) 447 if (SvTRUE (ERRSV))
212 { 448 {
213 req_free (req); 449 req_free (req);
214 croak (0); 450 croak (0);
215 } 451 }
216
217 LEAVE;
218
219 errno = errorno;
220} 452}
221 453
222static void req_free (aio_req req) 454static void req_free (aio_req req)
223{ 455{
224 if (req->grp)
225 {
226 aio_req grp = req->grp;
227
228 /* unlink request */
229 req->grp_next->grp_prev = req->grp_prev;
230 req->grp_prev->grp_next = req->grp_next;
231
232 if (grp->grp_next == grp)
233 {
234 req_invoke (grp);
235 req_free (grp);
236 }
237 }
238
239 if (req->self) 456 if (req->self)
240 { 457 {
241 sv_unmagic (req->self, PERL_MAGIC_ext); 458 sv_unmagic (req->self, PERL_MAGIC_ext);
242 SvREFCNT_dec (req->self); 459 SvREFCNT_dec (req->self);
243 } 460 }
244 461
245 if (req->data)
246 SvREFCNT_dec (req->data); 462 SvREFCNT_dec (req->data);
247
248 if (req->fh)
249 SvREFCNT_dec (req->fh); 463 SvREFCNT_dec (req->fh);
250
251 if (req->fh2)
252 SvREFCNT_dec (req->fh2); 464 SvREFCNT_dec (req->fh2);
253
254 if (req->statdata)
255 Safefree (req->statdata);
256
257 if (req->callback)
258 SvREFCNT_dec (req->callback); 465 SvREFCNT_dec (req->callback);
466 Safefree (req->statdata);
259 467
260 if (req->type == REQ_READDIR && req->result >= 0) 468 if (req->type == REQ_READDIR)
261 free (req->data2ptr); 469 free (req->data2ptr);
262 470
263 Safefree (req); 471 Safefree (req);
264} 472}
265 473
474static void req_cancel_subs (aio_req grp)
475{
476 aio_req sub;
477
478 if (grp->type != REQ_GROUP)
479 return;
480
481 SvREFCNT_dec (grp->fh2);
482 grp->fh2 = 0;
483
484 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub);
486}
487
266static void req_cancel (aio_req req) 488static void req_cancel (aio_req req)
267{ 489{
268 req->cancelled = 1; 490 req->flags |= FLAG_CANCELLED;
269 491
270 if (req->type == REQ_GROUP) 492 req_cancel_subs (req);
271 {
272 aio_req sub;
273
274 for (sub = req->grp_next; sub != req; sub = sub->grp_next)
275 req_cancel (sub);
276 }
277} 493}
278 494
279static int poll_cb () 495static int poll_cb ()
280{ 496{
281 dSP; 497 dSP;
283 int do_croak = 0; 499 int do_croak = 0;
284 aio_req req; 500 aio_req req;
285 501
286 for (;;) 502 for (;;)
287 { 503 {
288 pthread_mutex_lock (&reslock); 504 LOCK (reslock);
289 req = ress; 505 req = reqq_shift (&res_queue);
290 506
291 if (req) 507 if (req)
292 { 508 {
293 ress = req->next;
294
295 if (!ress) 509 if (!res_queue.size)
296 { 510 {
297 /* read any signals sent by the worker threads */ 511 /* read any signals sent by the worker threads */
298 char buf [32]; 512 char buf [32];
299 while (read (respipe [0], buf, 32) == 32) 513 while (read (respipe [0], buf, 32) == 32)
300 ; 514 ;
301
302 rese = 0;
303 } 515 }
304 } 516 }
305 517
306 pthread_mutex_unlock (&reslock); 518 UNLOCK (reslock);
307 519
308 if (!req) 520 if (!req)
309 break; 521 break;
310 522
311 nreqs--; 523 --nreqs;
312 524
313 if (req->type == REQ_QUIT) 525 if (req->type == REQ_QUIT)
314 started--; 526 started--;
315 else if (req->type == REQ_GROUP && req->grp_next != req) 527 else if (req->type == REQ_GROUP && req->length)
528 {
529 req->fd = 1; /* mark request as delayed */
316 continue; 530 continue;
531 }
317 else 532 else
318 { 533 {
319 if (req->type == REQ_READ) 534 if (req->type == REQ_READ)
320 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 535 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321 536
343static void *aio_proc(void *arg); 558static void *aio_proc(void *arg);
344 559
345static void start_thread (void) 560static void start_thread (void)
346{ 561{
347 sigset_t fullsigset, oldsigset; 562 sigset_t fullsigset, oldsigset;
348 pthread_t tid;
349 pthread_attr_t attr; 563 pthread_attr_t attr;
564
565 worker *wrk = calloc (1, sizeof (worker));
566
567 if (!wrk)
568 croak ("unable to allocate worker thread data");
350 569
351 pthread_attr_init (&attr); 570 pthread_attr_init (&attr);
352 pthread_attr_setstacksize (&attr, STACKSIZE); 571 pthread_attr_setstacksize (&attr, STACKSIZE);
353 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
354 573
355 sigfillset (&fullsigset); 574 sigfillset (&fullsigset);
575
576 LOCK (wrklock);
356 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
357 578
358 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 579 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
580 {
581 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk;
359 started++; 585 started++;
586 }
587 else
588 free (wrk);
360 589
361 sigprocmask (SIG_SETMASK, &oldsigset, 0); 590 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock);
362} 592}
363 593
364static void req_send (aio_req req) 594static void req_send (aio_req req)
365{ 595{
366 while (started < wanted && nreqs >= started) 596 while (started < wanted && nreqs >= started)
367 start_thread (); 597 start_thread ();
368 598
369 nreqs++; 599 ++nreqs;
370 600
371 pthread_mutex_lock (&reqlock); 601 LOCK (reqlock);
372 602 reqq_push (&req_queue, req);
373 req->next = 0;
374
375 if (reqe)
376 {
377 reqe->next = req;
378 reqe = req;
379 }
380 else
381 reqe = reqs = req;
382
383 pthread_cond_signal (&reqwait); 603 pthread_cond_signal (&reqwait);
384 pthread_mutex_unlock (&reqlock); 604 UNLOCK (reqlock);
385
386 if (nreqs > max_outstanding)
387 for (;;)
388 {
389 poll_cb ();
390
391 if (nreqs <= max_outstanding)
392 break;
393
394 poll_wait ();
395 }
396} 605}
397 606
398static void end_thread (void) 607static void end_thread (void)
399{ 608{
400 aio_req req; 609 aio_req req;
610
401 Newz (0, req, 1, aio_cb); 611 Newz (0, req, 1, aio_cb);
612
402 req->type = REQ_QUIT; 613 req->type = REQ_QUIT;
614 req->pri = PRI_MAX + PRI_BIAS;
403 615
404 req_send (req); 616 req_send (req);
405} 617}
406 618
407static void min_parallel (int nthreads) 619static void min_parallel (int nthreads)
459static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 671static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
460{ 672{
461 ssize_t res; 673 ssize_t res;
462 off_t ooffset; 674 off_t ooffset;
463 675
464 pthread_mutex_lock (&preadwritelock); 676 LOCK (preadwritelock);
465 ooffset = lseek (fd, 0, SEEK_CUR); 677 ooffset = lseek (fd, 0, SEEK_CUR);
466 lseek (fd, offset, SEEK_SET); 678 lseek (fd, offset, SEEK_SET);
467 res = read (fd, buf, count); 679 res = read (fd, buf, count);
468 lseek (fd, ooffset, SEEK_SET); 680 lseek (fd, ooffset, SEEK_SET);
469 pthread_mutex_unlock (&preadwritelock); 681 UNLOCK (preadwritelock);
470 682
471 return res; 683 return res;
472} 684}
473 685
474static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 686static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
475{ 687{
476 ssize_t res; 688 ssize_t res;
477 off_t ooffset; 689 off_t ooffset;
478 690
479 pthread_mutex_lock (&preadwritelock); 691 LOCK (preadwritelock);
480 ooffset = lseek (fd, 0, SEEK_CUR); 692 ooffset = lseek (fd, 0, SEEK_CUR);
481 lseek (fd, offset, SEEK_SET); 693 lseek (fd, offset, SEEK_SET);
482 res = write (fd, buf, count); 694 res = write (fd, buf, count);
483 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
484 pthread_mutex_unlock (&preadwritelock); 696 UNLOCK (preadwritelock);
485 697
486 return res; 698 return res;
487} 699}
488#endif 700#endif
489 701
494#if !HAVE_READAHEAD 706#if !HAVE_READAHEAD
495# define readahead aio_readahead 707# define readahead aio_readahead
496 708
497static ssize_t readahead (int fd, off_t offset, size_t count) 709static ssize_t readahead (int fd, off_t offset, size_t count)
498{ 710{
499 char readahead_buf[4096]; 711 dBUF;
500 712
501 while (count > 0) 713 while (count > 0)
502 { 714 {
503 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 715 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
504 716
505 pread (fd, readahead_buf, len, offset); 717 pread (fd, aio_buf, len, offset);
506 offset += len; 718 offset += len;
507 count -= len; 719 count -= len;
508 } 720 }
509 721
510 errno = 0; 722 errno = 0;
519static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 731static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
520{ 732{
521 struct dirent *e; 733 struct dirent *e;
522 int errorno; 734 int errorno;
523 735
524 pthread_mutex_lock (&readdirlock); 736 LOCK (readdirlock);
525 737
526 e = readdir (dirp); 738 e = readdir (dirp);
527 errorno = errno; 739 errorno = errno;
528 740
529 if (e) 741 if (e)
532 strcpy (ent->d_name, e->d_name); 744 strcpy (ent->d_name, e->d_name);
533 } 745 }
534 else 746 else
535 *res = 0; 747 *res = 0;
536 748
537 pthread_mutex_unlock (&readdirlock); 749 UNLOCK (readdirlock);
538 750
539 errno = errorno; 751 errno = errorno;
540 return e ? 0 : -1; 752 return e ? 0 : -1;
541} 753}
542#endif 754#endif
543 755
544/* sendfile always needs emulation */ 756/* sendfile always needs emulation */
545static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 757static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
546{ 758{
547 ssize_t res; 759 ssize_t res;
548 760
549 if (!count) 761 if (!count)
550 return 0; 762 return 0;
599#endif 811#endif
600 ) 812 )
601 ) 813 )
602 { 814 {
603 /* emulate sendfile. this is a major pain in the ass */ 815 /* emulate sendfile. this is a major pain in the ass */
604 char buf[4096]; 816 dBUF;
817
605 res = 0; 818 res = 0;
606 819
607 while (count) 820 while (count)
608 { 821 {
609 ssize_t cnt; 822 ssize_t cnt;
610 823
611 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 824 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
612 825
613 if (cnt <= 0) 826 if (cnt <= 0)
614 { 827 {
615 if (cnt && !res) res = -1; 828 if (cnt && !res) res = -1;
616 break; 829 break;
617 } 830 }
618 831
619 cnt = write (ofd, buf, cnt); 832 cnt = write (ofd, aio_buf, cnt);
620 833
621 if (cnt <= 0) 834 if (cnt <= 0)
622 { 835 {
623 if (cnt && !res) res = -1; 836 if (cnt && !res) res = -1;
624 break; 837 break;
632 845
633 return res; 846 return res;
634} 847}
635 848
636/* read a full directory */ 849/* read a full directory */
637static int scandir_ (const char *path, void **namesp) 850static void scandir_ (aio_req req, worker *self)
638{ 851{
639 DIR *dirp = opendir (path); 852 DIR *dirp;
640 union 853 union
641 { 854 {
642 struct dirent d; 855 struct dirent d;
643 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 856 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
644 } u; 857 } *u;
645 struct dirent *entp; 858 struct dirent *entp;
646 char *name, *names; 859 char *name, *names;
647 int memlen = 4096; 860 int memlen = 4096;
648 int memofs = 0; 861 int memofs = 0;
649 int res = 0; 862 int res = 0;
650 int errorno; 863 int errorno;
651 864
652 if (!dirp) 865 LOCK (wrklock);
653 return -1; 866 self->dirp = dirp = opendir (req->dataptr);
867 self->dbuf = u = malloc (sizeof (*u));
868 UNLOCK (wrklock);
654 869
655 names = malloc (memlen); 870 req->data2ptr = names = malloc (memlen);
656 871
872 if (dirp && u && names)
657 for (;;) 873 for (;;)
658 { 874 {
875 errno = 0;
659 errno = 0, readdir_r (dirp, &u.d, &entp); 876 readdir_r (dirp, &u->d, &entp);
660 877
661 if (!entp) 878 if (!entp)
662 break; 879 break;
663 880
664 name = entp->d_name; 881 name = entp->d_name;
665 882
666 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 883 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
667 { 884 {
668 int len = strlen (name) + 1; 885 int len = strlen (name) + 1;
669 886
670 res++; 887 res++;
671 888
672 while (memofs + len > memlen) 889 while (memofs + len > memlen)
673 { 890 {
674 memlen *= 2; 891 memlen *= 2;
892 LOCK (wrklock);
675 names = realloc (names, memlen); 893 req->data2ptr = names = realloc (names, memlen);
894 UNLOCK (wrklock);
895
676 if (!names) 896 if (!names)
677 break; 897 break;
678 } 898 }
679 899
680 memcpy (names + memofs, name, len); 900 memcpy (names + memofs, name, len);
681 memofs += len; 901 memofs += len;
682 } 902 }
683 } 903 }
684 904
685 errorno = errno;
686 closedir (dirp);
687
688 if (errorno) 905 if (errno)
689 {
690 free (names);
691 errno = errorno;
692 res = -1; 906 res = -1;
693 } 907
694 908 req->result = res;
695 *namesp = (void *)names;
696 return res;
697} 909}
698 910
699/*****************************************************************************/ 911/*****************************************************************************/
700 912
701static void *aio_proc (void *thr_arg) 913static void *aio_proc (void *thr_arg)
702{ 914{
703 aio_req req; 915 aio_req req;
704 int type; 916 int type;
917 worker *self = (worker *)thr_arg;
705 918
706 do 919 do
707 { 920 {
708 pthread_mutex_lock (&reqlock); 921 LOCK (reqlock);
709 922
710 for (;;) 923 for (;;)
711 { 924 {
712 req = reqs; 925 self->req = req = reqq_shift (&req_queue);
713
714 if (reqs)
715 {
716 reqs = reqs->next;
717 if (!reqs) reqe = 0;
718 }
719 926
720 if (req) 927 if (req)
721 break; 928 break;
722 929
723 pthread_cond_wait (&reqwait, &reqlock); 930 pthread_cond_wait (&reqwait, &reqlock);
724 } 931 }
725 932
726 pthread_mutex_unlock (&reqlock); 933 UNLOCK (reqlock);
727 934
728 errno = 0; /* strictly unnecessary */ 935 errno = 0; /* strictly unnecessary */
936 type = req->type; /* remember type for QUIT check */
729 937
730 if (!req->cancelled) 938 if (!(req->flags & FLAG_CANCELLED))
731 switch (req->type) 939 switch (type)
732 { 940 {
733 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 941 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
734 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 942 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
735 943
736 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 944 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
737 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 945 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
738 946
739 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 947 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
740 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 948 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
741 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 949 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
742 950
748 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 956 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
749 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 957 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
750 958
751 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 959 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
752 case REQ_FSYNC: req->result = fsync (req->fd); break; 960 case REQ_FSYNC: req->result = fsync (req->fd); break;
753 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 961 case REQ_READDIR: scandir_ (req, self); break;
754 962
755 case REQ_SLEEP: 963 case REQ_BUSY:
756 { 964 {
757 struct timeval tv; 965 struct timeval tv;
758 966
759 tv.tv_sec = req->fd; 967 tv.tv_sec = req->fd;
760 tv.tv_usec = req->fd2; 968 tv.tv_usec = req->fd2;
761 969
762 req->result = select (0, 0, 0, 0, &tv); 970 req->result = select (0, 0, 0, 0, &tv);
763 } 971 }
764 972
973 case REQ_GROUP:
974 case REQ_NOP:
765 case REQ_QUIT: 975 case REQ_QUIT:
766 break; 976 break;
767 977
768 default: 978 default:
769 req->result = ENOSYS; 979 req->result = ENOSYS;
770 break; 980 break;
771 } 981 }
772 982
773 req->errorno = errno; 983 req->errorno = errno;
774 984
775 pthread_mutex_lock (&reslock); 985 LOCK (reslock);
776 986
777 req->next = 0; 987 if (!reqq_push (&res_queue, req))
778
779 if (rese)
780 {
781 rese->next = req;
782 rese = req;
783 }
784 else
785 {
786 rese = ress = req;
787
788 /* write a dummy byte to the pipe so fh becomes ready */ 988 /* write a dummy byte to the pipe so fh becomes ready */
789 write (respipe [1], &respipe, 1); 989 write (respipe [1], &respipe, 1);
790 }
791 990
792 pthread_mutex_unlock (&reslock); 991 self->req = 0;
992 worker_clear (self);
993
994 UNLOCK (reslock);
793 } 995 }
794 while (type != REQ_QUIT); 996 while (type != REQ_QUIT);
795 997
998 LOCK (wrklock);
999 worker_free (self);
1000 UNLOCK (wrklock);
1001
796 return 0; 1002 return 0;
797} 1003}
798 1004
799/*****************************************************************************/ 1005/*****************************************************************************/
800 1006
801static void atfork_prepare (void) 1007static void atfork_prepare (void)
802{ 1008{
803 pthread_mutex_lock (&reqlock); 1009 LOCK (wrklock);
804 pthread_mutex_lock (&reslock); 1010 LOCK (reqlock);
1011 LOCK (reslock);
805#if !HAVE_PREADWRITE 1012#if !HAVE_PREADWRITE
806 pthread_mutex_lock (&preadwritelock); 1013 LOCK (preadwritelock);
807#endif 1014#endif
808#if !HAVE_READDIR_R 1015#if !HAVE_READDIR_R
809 pthread_mutex_lock (&readdirlock); 1016 LOCK (readdirlock);
810#endif 1017#endif
811} 1018}
812 1019
813static void atfork_parent (void) 1020static void atfork_parent (void)
814{ 1021{
815#if !HAVE_READDIR_R 1022#if !HAVE_READDIR_R
816 pthread_mutex_unlock (&readdirlock); 1023 UNLOCK (readdirlock);
817#endif 1024#endif
818#if !HAVE_PREADWRITE 1025#if !HAVE_PREADWRITE
819 pthread_mutex_unlock (&preadwritelock); 1026 UNLOCK (preadwritelock);
820#endif 1027#endif
821 pthread_mutex_unlock (&reslock); 1028 UNLOCK (reslock);
822 pthread_mutex_unlock (&reqlock); 1029 UNLOCK (reqlock);
1030 UNLOCK (wrklock);
823} 1031}
824 1032
825static void atfork_child (void) 1033static void atfork_child (void)
826{ 1034{
827 aio_req prv; 1035 aio_req prv;
828 1036
1037 while (prv = reqq_shift (&req_queue))
1038 req_free (prv);
1039
1040 while (prv = reqq_shift (&res_queue))
1041 req_free (prv);
1042
1043 while (wrk_first.next != &wrk_first)
1044 {
1045 worker *wrk = wrk_first.next;
1046
1047 if (wrk->req)
1048 req_free (wrk->req);
1049
1050 worker_clear (wrk);
1051 worker_free (wrk);
1052 }
1053
829 started = 0; 1054 started = 0;
830 1055 nreqs = 0;
831 while (reqs)
832 {
833 prv = reqs;
834 reqs = prv->next;
835 req_free (prv);
836 }
837
838 reqs = reqe = 0;
839
840 while (ress)
841 {
842 prv = ress;
843 ress = prv->next;
844 req_free (prv);
845 }
846
847 ress = rese = 0;
848 1056
849 close (respipe [0]); 1057 close (respipe [0]);
850 close (respipe [1]); 1058 close (respipe [1]);
851 create_pipe (); 1059 create_pipe ();
852 1060
853 atfork_parent (); 1061 atfork_parent ();
854} 1062}
855 1063
856#define dREQ \ 1064#define dREQ \
857 aio_req req; \ 1065 aio_req req; \
1066 int req_pri = next_pri; \
1067 next_pri = DEFAULT_PRI + PRI_BIAS; \
858 \ 1068 \
859 if (SvOK (callback) && !SvROK (callback)) \ 1069 if (SvOK (callback) && !SvROK (callback)) \
860 croak ("callback must be undef or of reference type"); \ 1070 croak ("callback must be undef or of reference type"); \
861 \ 1071 \
862 Newz (0, req, 1, aio_cb); \ 1072 Newz (0, req, 1, aio_cb); \
863 if (!req) \ 1073 if (!req) \
864 croak ("out of memory during aio_req allocation"); \ 1074 croak ("out of memory during aio_req allocation"); \
865 \ 1075 \
866 req->callback = newSVsv (callback) 1076 req->callback = newSVsv (callback); \
1077 req->pri = req_pri
867 1078
868#define REQ_SEND \ 1079#define REQ_SEND \
869 req_send (req); \ 1080 req_send (req); \
870 \ 1081 \
871 if (GIMME_V != G_VOID) \ 1082 if (GIMME_V != G_VOID) \
893 1104
894void 1105void
895max_parallel (nthreads) 1106max_parallel (nthreads)
896 int nthreads 1107 int nthreads
897 PROTOTYPE: $ 1108 PROTOTYPE: $
898
899int
900max_outstanding (nreqs)
901 int nreqs
902 PROTOTYPE: $
903 CODE:
904 RETVAL = max_outstanding;
905 max_outstanding = nreqs;
906 1109
907void 1110void
908aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1111aio_open (pathname,flags,mode,callback=&PL_sv_undef)
909 SV * pathname 1112 SV * pathname
910 int flags 1113 int flags
1125 1328
1126 REQ_SEND; 1329 REQ_SEND;
1127} 1330}
1128 1331
1129void 1332void
1130aio_sleep (delay,callback=&PL_sv_undef) 1333aio_busy (delay,callback=&PL_sv_undef)
1131 double delay 1334 double delay
1132 SV * callback 1335 SV * callback
1133 PPCODE: 1336 PPCODE:
1134{ 1337{
1135 dREQ; 1338 dREQ;
1136 1339
1137 req->type = REQ_SLEEP; 1340 req->type = REQ_BUSY;
1138 req->fd = delay < 0. ? 0 : delay; 1341 req->fd = delay < 0. ? 0 : delay;
1139 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1342 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1140 1343
1141 REQ_SEND; 1344 REQ_SEND;
1142} 1345}
1143 1346
1144void 1347void
1145aio_group (callback=&PL_sv_undef) 1348aio_group (callback=&PL_sv_undef)
1146 SV * callback 1349 SV * callback
1147 PROTOTYPE: ;& 1350 PROTOTYPE: ;$
1148 PPCODE: 1351 PPCODE:
1149{ 1352{
1150 dREQ; 1353 dREQ;
1354
1151 req->type = REQ_GROUP; 1355 req->type = REQ_GROUP;
1152 req->grp_next = req;
1153 req->grp_prev = req;
1154
1155 req_send (req); 1356 req_send (req);
1357
1156 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1358 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1157} 1359}
1360
1361void
1362aio_nop (callback=&PL_sv_undef)
1363 SV * callback
1364 PPCODE:
1365{
1366 dREQ;
1367
1368 req->type = REQ_NOP;
1369
1370 REQ_SEND;
1371}
1372
1373void
1374aioreq_pri (int pri = DEFAULT_PRI)
1375 CODE:
1376 if (pri < PRI_MIN) pri = PRI_MIN;
1377 if (pri > PRI_MAX) pri = PRI_MAX;
1378 next_pri = pri + PRI_BIAS;
1379
1380void
1381aioreq_nice (int nice = 0)
1382 CODE:
1383 nice = next_pri - nice;
1384 if (nice < PRI_MIN) nice = PRI_MIN;
1385 if (nice > PRI_MAX) nice = PRI_MAX;
1386 next_pri = nice + PRI_BIAS;
1158 1387
1159void 1388void
1160flush () 1389flush ()
1161 PROTOTYPE: 1390 PROTOTYPE:
1162 CODE: 1391 CODE:
1205 CODE: 1434 CODE:
1206 RETVAL = nreqs; 1435 RETVAL = nreqs;
1207 OUTPUT: 1436 OUTPUT:
1208 RETVAL 1437 RETVAL
1209 1438
1439PROTOTYPES: DISABLE
1440
1210MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1441MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211 1442
1212void 1443void
1213cancel (aio_req_ornot req) 1444cancel (aio_req_ornot req)
1214 PROTOTYPE:
1215 CODE: 1445 CODE:
1216 req_cancel (req); 1446 req_cancel (req);
1217 1447
1448void
1449cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1450 CODE:
1451 SvREFCNT_dec (req->callback);
1452 req->callback = newSVsv (callback);
1453
1218MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1454MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219 1455
1220void 1456void
1221add (aio_req grp, ...) 1457add (aio_req grp, ...)
1222 PROTOTYPE: $;@
1223 PPCODE: 1458 PPCODE:
1224{ 1459{
1225 int i; 1460 int i;
1461 aio_req req;
1462
1463 if (grp->fd == 2)
1464 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1226 1465
1227 for (i = 1; i < items; ++i ) 1466 for (i = 1; i < items; ++i )
1228 { 1467 {
1229 aio_req req = SvAIO_REQ (ST (i));
1230
1231 req->grp_prev = grp;
1232 req->grp_next = grp->grp_next;
1233 grp->grp_next->grp_prev = req;
1234 grp->grp_next = req;
1235
1236 req->grp = grp;
1237
1238 if (GIMME_V != G_VOID) 1468 if (GIMME_V != G_VOID)
1239 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1469 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1470
1471 req = SvAIO_REQ (ST (i));
1472
1473 if (req)
1474 {
1475 ++grp->length;
1476 req->grp = grp;
1477
1478 req->grp_prev = 0;
1479 req->grp_next = grp->grp_first;
1480
1481 if (grp->grp_first)
1482 grp->grp_first->grp_prev = req;
1483
1484 grp->grp_first = req;
1485 }
1240 } 1486 }
1241} 1487}
1242 1488
1489void
1490cancel_subs (aio_req_ornot req)
1491 CODE:
1492 req_cancel_subs (req);
1493
1494void
1495result (aio_req grp, ...)
1496 CODE:
1497{
1498 int i;
1499 AV *av = newAV ();
1500
1501 for (i = 1; i < items; ++i )
1502 av_push (av, newSVsv (ST (i)));
1503
1504 SvREFCNT_dec (grp->data);
1505 grp->data = (SV *)av;
1506}
1507
1508void
1509limit (aio_req grp, int limit)
1510 CODE:
1511 grp->fd2 = limit;
1512 aio_grp_feed (grp);
1513
1514void
1515feed (aio_req grp, SV *callback=&PL_sv_undef)
1516 CODE:
1517{
1518 SvREFCNT_dec (grp->fh2);
1519 grp->fh2 = newSVsv (callback);
1520
1521 if (grp->fd2 <= 0)
1522 grp->fd2 = 2;
1523
1524 aio_grp_feed (grp);
1525}
1526

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines