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.44 by root, Sat Oct 21 23:20:29 2006 UTC vs.
Revision 1.49 by root, Sun Oct 22 13:33:28 2006 UTC

9 9
10#include <pthread.h> 10#include <pthread.h>
11 11
12#include <stddef.h> 12#include <stddef.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/time.h>
15#include <sys/select.h>
14#include <sys/types.h> 16#include <sys/types.h>
15#include <sys/stat.h> 17#include <sys/stat.h>
16#include <limits.h> 18#include <limits.h>
17#include <unistd.h> 19#include <unistd.h>
18#include <fcntl.h> 20#include <fcntl.h>
53 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 55 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
54 REQ_FSYNC, REQ_FDATASYNC, 56 REQ_FSYNC, REQ_FDATASYNC,
55 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
56 REQ_READDIR, 58 REQ_READDIR,
57 REQ_LINK, REQ_SYMLINK, 59 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP,
58 REQ_GROUP, 61 REQ_GROUP,
59}; 62};
60 63
61#define AIO_REQ_KLASS "IO::AIO::REQ" 64#define AIO_REQ_KLASS "IO::AIO::REQ"
62#define AIO_GRP_KLASS "IO::AIO::GRP" 65#define AIO_GRP_KLASS "IO::AIO::GRP"
63 66
64typedef struct aio_cb 67typedef struct aio_cb
65{ 68{
66 struct aio_cb *grp, *grp_prev, *grp_next;
67
68 struct aio_cb *volatile next; 69 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
69 72
70 SV *self; /* the perl counterpart of this request, if any */ 73 SV *self; /* the perl counterpart of this request, if any */
71 74
72 SV *data, *callback; 75 SV *data, *callback;
73 SV *fh, *fh2; 76 SV *fh, *fh2;
85 unsigned char cancelled; 88 unsigned char cancelled;
86} aio_cb; 89} aio_cb;
87 90
88typedef aio_cb *aio_req; 91typedef aio_cb *aio_req;
89typedef aio_cb *aio_req_ornot; 92typedef aio_cb *aio_req_ornot;
90typedef aio_cb *aio_group;
91 93
92static int started, wanted; 94static int started, wanted;
93static volatile int nreqs; 95static volatile int nreqs;
94static int max_outstanding = 1<<30; 96static int max_outstanding = 1<<30;
95static int respipe [2]; 97static int respipe [2];
99static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
100 102
101static volatile aio_req reqs, reqe; /* queue start, queue end */ 103static volatile aio_req reqs, reqe; /* queue start, queue end */
102static volatile aio_req ress, rese; /* queue start, queue end */ 104static volatile aio_req ress, rese; /* queue start, queue end */
103 105
106static void req_free (aio_req req);
107
104/* must be called at most once */ 108/* must be called at most once */
105static SV *req_sv (aio_req req, const char *klass) 109static SV *req_sv (aio_req req, const char *klass)
106{ 110{
111 if (!req->self)
112 {
107 req->self = (SV *)newHV (); 113 req->self = (SV *)newHV ();
108 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 114 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
115 }
109 116
110 return sv_2mortal (sv_bless (newRV_noinc (req->self), gv_stashpv (klass, 1))); 117 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
111} 118}
112 119
113static aio_req SvAIO_REQ (SV *sv, const char *klass) 120static aio_req SvAIO_REQ (SV *sv)
114{ 121{
115 if (!sv_derived_from (sv, klass) || !SvROK (sv)) 122 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
116 croak ("object of class %s expected", klass); 123 croak ("object of class " AIO_REQ_KLASS " expected");
117 124
118 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 125 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
119 126
120 return mg ? (aio_req)mg->mg_ptr : 0; 127 return mg ? (aio_req)mg->mg_ptr : 0;
121} 128}
122 129
123static void req_free (aio_req req) 130static void aio_grp_feed (aio_req grp)
124{ 131{
125 if (req->self) 132 while (grp->length < grp->fd2)
126 {
127 sv_unmagic (req->self, PERL_MAGIC_ext);
128 SvREFCNT_dec (req->self);
129 } 133 {
134 int old_len = grp->length;
130 135
131 if (req->data) 136 if (grp->fh2 && SvOK (grp->fh2))
132 SvREFCNT_dec (req->data); 137 {
138 dSP;
133 139
134 if (req->fh) 140 ENTER;
135 SvREFCNT_dec (req->fh); 141 SAVETMPS;
142 PUSHMARK (SP);
143 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
144 PUTBACK;
145 call_sv (grp->fh2, G_VOID | G_EVAL);
146 SPAGAIN;
147 FREETMPS;
148 LEAVE;
149 }
136 150
137 if (req->fh2) 151 /* stop if no progress has been made */
152 if (old_len == grp->length)
153 {
138 SvREFCNT_dec (req->fh2); 154 SvREFCNT_dec (grp->fh2);
139 155 grp->fh2 = 0;
140 if (req->statdata) 156 break;
141 Safefree (req->statdata); 157 }
142 158 }
143 if (req->callback)
144 SvREFCNT_dec (req->callback);
145
146 if (req->type == REQ_READDIR && req->result >= 0)
147 free (req->data2ptr);
148
149 Safefree (req);
150} 159}
151 160
152static void 161static void poll_wait ()
153poll_wait ()
154{ 162{
155 if (nreqs && !ress) 163 if (nreqs && !ress)
156 { 164 {
157 fd_set rfd; 165 fd_set rfd;
158 FD_ZERO(&rfd); 166 FD_ZERO(&rfd);
160 168
161 select (respipe [0] + 1, &rfd, 0, 0, 0); 169 select (respipe [0] + 1, &rfd, 0, 0, 0);
162 } 170 }
163} 171}
164 172
165static int 173static void req_invoke (aio_req req)
166poll_cb () 174{
175 dSP;
176 int errorno = errno;
177
178 if (req->cancelled || !SvOK (req->callback))
179 return;
180
181 errno = req->errorno;
182
183 ENTER;
184 SAVETMPS;
185 PUSHMARK (SP);
186 EXTEND (SP, 1);
187
188 switch (req->type)
189 {
190 case REQ_READDIR:
191 {
192 SV *rv = &PL_sv_undef;
193
194 if (req->result >= 0)
195 {
196 char *buf = req->data2ptr;
197 AV *av = newAV ();
198
199 while (req->result)
200 {
201 SV *sv = newSVpv (buf, 0);
202
203 av_push (av, sv);
204 buf += SvCUR (sv) + 1;
205 req->result--;
206 }
207
208 rv = sv_2mortal (newRV_noinc ((SV *)av));
209 }
210
211 PUSHs (rv);
212 }
213 break;
214
215 case REQ_OPEN:
216 {
217 /* convert fd to fh */
218 SV *fh;
219
220 PUSHs (sv_2mortal (newSViv (req->result)));
221 PUTBACK;
222 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
223 SPAGAIN;
224
225 fh = SvREFCNT_inc (POPs);
226
227 PUSHMARK (SP);
228 XPUSHs (sv_2mortal (fh));
229 }
230 break;
231
232 case REQ_GROUP:
233 req->fd = 2; /* mark group as finished */
234
235 if (req->data)
236 {
237 int i;
238 AV *av = (AV *)req->data;
239
240 EXTEND (SP, AvFILL (av) + 1);
241 for (i = 0; i <= AvFILL (av); ++i)
242 PUSHs (*av_fetch (av, i, 0));
243 }
244 break;
245
246 case REQ_SLEEP:
247 break;
248
249 default:
250 PUSHs (sv_2mortal (newSViv (req->result)));
251 break;
252 }
253
254
255 PUTBACK;
256 call_sv (req->callback, G_VOID | G_EVAL);
257 SPAGAIN;
258
259 if (SvTRUE (ERRSV))
260 {
261 req_free (req);
262 croak (0);
263 }
264
265 FREETMPS;
266 LEAVE;
267
268 errno = errorno;
269}
270
271static void req_free (aio_req req)
272{
273 if (req->grp)
274 {
275 aio_req grp = req->grp;
276
277 /* unlink request */
278 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
279 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
280
281 if (grp->grp_first == req)
282 grp->grp_first = req->grp_next;
283
284 --grp->length;
285
286 /* call feeder, if applicable */
287 aio_grp_feed (grp);
288
289 /* finish, if done */
290 if (!grp->length && grp->fd)
291 {
292 req_invoke (grp);
293 req_free (grp);
294 }
295 }
296
297 if (req->self)
298 {
299 sv_unmagic (req->self, PERL_MAGIC_ext);
300 SvREFCNT_dec (req->self);
301 }
302
303 SvREFCNT_dec (req->data);
304 SvREFCNT_dec (req->fh);
305 SvREFCNT_dec (req->fh2);
306 SvREFCNT_dec (req->callback);
307 Safefree (req->statdata);
308
309 if (req->type == REQ_READDIR && req->result >= 0)
310 free (req->data2ptr);
311
312 Safefree (req);
313}
314
315static void req_cancel (aio_req req)
316{
317 req->cancelled = 1;
318
319 if (req->type == REQ_GROUP)
320 {
321 aio_req sub;
322
323 for (sub = req->grp_first; sub; sub = sub->grp_next)
324 req_cancel (sub);
325 }
326}
327
328static int poll_cb ()
167{ 329{
168 dSP; 330 dSP;
169 int count = 0; 331 int count = 0;
170 int do_croak = 0; 332 int do_croak = 0;
171 aio_req req; 333 aio_req req;
197 359
198 nreqs--; 360 nreqs--;
199 361
200 if (req->type == REQ_QUIT) 362 if (req->type == REQ_QUIT)
201 started--; 363 started--;
364 else if (req->type == REQ_GROUP && req->length)
365 {
366 req->fd = 1; /* mark request as delayed */
367 continue;
368 }
202 else 369 else
203 { 370 {
204 int errorno = errno;
205 errno = req->errorno;
206
207 if (req->type == REQ_READ) 371 if (req->type == REQ_READ)
208 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 372 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
209 373
210 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) 374 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
211 SvREADONLY_off (req->data); 375 SvREADONLY_off (req->data);
215 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 379 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
216 PL_laststatval = req->result; 380 PL_laststatval = req->result;
217 PL_statcache = *(req->statdata); 381 PL_statcache = *(req->statdata);
218 } 382 }
219 383
220 ENTER; 384 req_invoke (req);
221 PUSHMARK (SP);
222 385
223 if (req->type == REQ_READDIR)
224 {
225 SV *rv = &PL_sv_undef;
226
227 if (req->result >= 0)
228 {
229 char *buf = req->data2ptr;
230 AV *av = newAV ();
231
232 while (req->result)
233 {
234 SV *sv = newSVpv (buf, 0);
235
236 av_push (av, sv);
237 buf += SvCUR (sv) + 1;
238 req->result--;
239 }
240
241 rv = sv_2mortal (newRV_noinc ((SV *)av));
242 }
243
244 XPUSHs (rv);
245 }
246 else
247 {
248 XPUSHs (sv_2mortal (newSViv (req->result)));
249
250 if (req->type == REQ_OPEN)
251 {
252 /* convert fd to fh */
253 SV *fh;
254
255 PUTBACK;
256 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
257 SPAGAIN;
258
259 fh = SvREFCNT_inc (POPs);
260
261 PUSHMARK (SP);
262 XPUSHs (sv_2mortal (fh));
263 }
264 }
265
266 if (SvOK (req->callback) && !req->cancelled)
267 {
268 PUTBACK;
269 call_sv (req->callback, G_VOID | G_EVAL);
270 SPAGAIN;
271
272 if (SvTRUE (ERRSV))
273 {
274 req_free (req);
275 croak (0);
276 }
277 }
278
279 LEAVE;
280
281 errno = errorno;
282 count++; 386 count++;
283 } 387 }
284 388
285 req_free (req); 389 req_free (req);
286 } 390 }
288 return count; 392 return count;
289} 393}
290 394
291static void *aio_proc(void *arg); 395static void *aio_proc(void *arg);
292 396
293static void
294start_thread (void) 397static void start_thread (void)
295{ 398{
296 sigset_t fullsigset, oldsigset; 399 sigset_t fullsigset, oldsigset;
297 pthread_t tid; 400 pthread_t tid;
298 pthread_attr_t attr; 401 pthread_attr_t attr;
299 402
308 started++; 411 started++;
309 412
310 sigprocmask (SIG_SETMASK, &oldsigset, 0); 413 sigprocmask (SIG_SETMASK, &oldsigset, 0);
311} 414}
312 415
313static void
314req_send (aio_req req) 416static void req_send (aio_req req)
315{ 417{
316 while (started < wanted && nreqs >= started) 418 while (started < wanted && nreqs >= started)
317 start_thread (); 419 start_thread ();
318 420
319 nreqs++; 421 nreqs++;
343 445
344 poll_wait (); 446 poll_wait ();
345 } 447 }
346} 448}
347 449
348static void 450static void end_thread (void)
349end_thread (void)
350{ 451{
351 aio_req req; 452 aio_req req;
352 Newz (0, req, 1, aio_cb); 453 Newz (0, req, 1, aio_cb);
353 req->type = REQ_QUIT; 454 req->type = REQ_QUIT;
354 455
405 * normal read/write by using a mutex. slows down execution a lot, 506 * normal read/write by using a mutex. slows down execution a lot,
406 * but that's your problem, not mine. 507 * but that's your problem, not mine.
407 */ 508 */
408static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 509static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
409 510
410static ssize_t 511static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
411pread (int fd, void *buf, size_t count, off_t offset)
412{ 512{
413 ssize_t res; 513 ssize_t res;
414 off_t ooffset; 514 off_t ooffset;
415 515
416 pthread_mutex_lock (&preadwritelock); 516 pthread_mutex_lock (&preadwritelock);
421 pthread_mutex_unlock (&preadwritelock); 521 pthread_mutex_unlock (&preadwritelock);
422 522
423 return res; 523 return res;
424} 524}
425 525
426static ssize_t
427pwrite (int fd, void *buf, size_t count, off_t offset) 526static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
428{ 527{
429 ssize_t res; 528 ssize_t res;
430 off_t ooffset; 529 off_t ooffset;
431 530
432 pthread_mutex_lock (&preadwritelock); 531 pthread_mutex_lock (&preadwritelock);
445#endif 544#endif
446 545
447#if !HAVE_READAHEAD 546#if !HAVE_READAHEAD
448# define readahead aio_readahead 547# define readahead aio_readahead
449 548
450static ssize_t
451readahead (int fd, off_t offset, size_t count) 549static ssize_t readahead (int fd, off_t offset, size_t count)
452{ 550{
453 char readahead_buf[4096]; 551 char readahead_buf[4096];
454 552
455 while (count > 0) 553 while (count > 0)
456 { 554 {
468#if !HAVE_READDIR_R 566#if !HAVE_READDIR_R
469# define readdir_r aio_readdir_r 567# define readdir_r aio_readdir_r
470 568
471static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 569static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
472 570
473static int
474readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 571static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
475{ 572{
476 struct dirent *e; 573 struct dirent *e;
477 int errorno; 574 int errorno;
478 575
479 pthread_mutex_lock (&readdirlock); 576 pthread_mutex_lock (&readdirlock);
495 return e ? 0 : -1; 592 return e ? 0 : -1;
496} 593}
497#endif 594#endif
498 595
499/* sendfile always needs emulation */ 596/* sendfile always needs emulation */
500static ssize_t
501sendfile_ (int ofd, int ifd, off_t offset, size_t count) 597static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
502{ 598{
503 ssize_t res; 599 ssize_t res;
504 600
505 if (!count) 601 if (!count)
506 return 0; 602 return 0;
588 684
589 return res; 685 return res;
590} 686}
591 687
592/* read a full directory */ 688/* read a full directory */
593static int
594scandir_ (const char *path, void **namesp) 689static int scandir_ (const char *path, void **namesp)
595{ 690{
596 DIR *dirp = opendir (path); 691 DIR *dirp = opendir (path);
597 union 692 union
598 { 693 {
599 struct dirent d; 694 struct dirent d;
653 return res; 748 return res;
654} 749}
655 750
656/*****************************************************************************/ 751/*****************************************************************************/
657 752
658static void *
659aio_proc (void *thr_arg) 753static void *aio_proc (void *thr_arg)
660{ 754{
661 aio_req req; 755 aio_req req;
662 int type; 756 int type;
663 757
664 do 758 do
707 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 801 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
708 802
709 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 803 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
710 case REQ_FSYNC: req->result = fsync (req->fd); break; 804 case REQ_FSYNC: req->result = fsync (req->fd); break;
711 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 805 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
806
807 case REQ_SLEEP:
808 {
809 struct timeval tv;
810
811 tv.tv_sec = req->fd;
812 tv.tv_usec = req->fd2;
813
814 req->result = select (0, 0, 0, 0, &tv);
815 }
712 816
713 case REQ_QUIT: 817 case REQ_QUIT:
714 break; 818 break;
715 819
716 default: 820 default:
1073 1177
1074 REQ_SEND; 1178 REQ_SEND;
1075} 1179}
1076 1180
1077void 1181void
1182aio_sleep (delay,callback=&PL_sv_undef)
1183 double delay
1184 SV * callback
1185 PPCODE:
1186{
1187 dREQ;
1188
1189 req->type = REQ_SLEEP;
1190 req->fd = delay < 0. ? 0 : delay;
1191 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1192
1193 REQ_SEND;
1194}
1195
1196void
1078aio_group (callback=&PL_sv_undef) 1197aio_group (callback=&PL_sv_undef)
1079 SV * callback 1198 SV * callback
1080 PROTOTYPE: ;& 1199 PROTOTYPE: ;$
1081 PPCODE: 1200 PPCODE:
1082{ 1201{
1083 dREQ; 1202 dREQ;
1084 req->type = REQ_GROUP; 1203 req->type = REQ_GROUP;
1204 req_send (req);
1085 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1205 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1086} 1206}
1087 1207
1088void 1208void
1089flush () 1209flush ()
1134 CODE: 1254 CODE:
1135 RETVAL = nreqs; 1255 RETVAL = nreqs;
1136 OUTPUT: 1256 OUTPUT:
1137 RETVAL 1257 RETVAL
1138 1258
1259PROTOTYPES: DISABLE
1260
1139MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1261MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1140 1262
1141void 1263void
1142cancel (aio_req_ornot req) 1264cancel (aio_req_ornot req)
1143 PROTOTYPE: 1265 PROTOTYPE:
1144 CODE: 1266 CODE:
1145 req->cancelled = 1; 1267 req_cancel (req);
1146 1268
1269MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1270
1271void
1272add (aio_req grp, ...)
1273 PPCODE:
1274{
1275 int i;
1276
1277 if (grp->fd == 2)
1278 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1279
1280 for (i = 1; i < items; ++i )
1281 {
1282 if (GIMME_V != G_VOID)
1283 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1284
1285 aio_req req = SvAIO_REQ (ST (i));
1286
1287 if (req)
1288 {
1289 ++grp->length;
1290 req->grp = grp;
1291
1292 req->grp_prev = 0;
1293 req->grp_next = grp->grp_first;
1294
1295 if (grp->grp_first)
1296 grp->grp_first->grp_prev = req;
1297
1298 grp->grp_first = req;
1299 }
1300 }
1301}
1302
1303void
1304result (aio_req grp, ...)
1305 CODE:
1306{
1307 int i;
1308 AV *av = newAV ();
1309
1310 for (i = 1; i < items; ++i )
1311 av_push (av, newSVsv (ST (i)));
1312
1313 SvREFCNT_dec (grp->data);
1314 grp->data = (SV *)av;
1315}
1316
1317void
1318feeder_limit (aio_req grp, int limit)
1319 CODE:
1320 grp->fd2 = limit;
1321 aio_grp_feed (grp);
1322
1323void
1324set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
1325 CODE:
1326{
1327 SvREFCNT_dec (grp->fh2);
1328 grp->fh2 = newSVsv (callback);
1329
1330 if (grp->fd2 <= 0)
1331 grp->fd2 = 2;
1332
1333 aio_grp_feed (grp);
1334}
1335

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines