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.43 by root, Sat Oct 21 23:06:04 2006 UTC vs.
Revision 1.47 by root, Sun Oct 22 10:10:23 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,
61 REQ_GROUP,
58}; 62};
59 63
60#define AIO_CB_KLASS "IO::AIO::CB" 64#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP"
61 66
62typedef struct aio_cb 67typedef struct aio_cb
63{ 68{
64 struct aio_cb *grp_prev, *grp_next; 69 struct aio_cb *grp, *grp_prev, *grp_next;
65 struct aio_grp *grp;
66 70
67 struct aio_cb *volatile next; 71 struct aio_cb *volatile next;
68 72
69 SV *self; /* the perl counterpart of this request, if any */ 73 SV *self; /* the perl counterpart of this request, if any */
70 74
… …
97static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
98 102
99static volatile aio_req reqs, reqe; /* queue start, queue end */ 103static volatile aio_req reqs, reqe; /* queue start, queue end */
100static volatile aio_req ress, rese; /* queue start, queue end */ 104static volatile aio_req ress, rese; /* queue start, queue end */
101 105
102typedef struct aio_grp 106static void req_free (aio_req req);
103{
104 struct aio_cb *first, *last;
105 SV *callback;
106 int busycount;
107} aio_grp;
108
109static void aio_grp_begin (aio_grp *grp)
110{
111 ++grp->busycount;
112}
113
114static void aio_grp_end (aio_grp *grp)
115{
116 --grp->busycount;
117
118 if (grp->busycount)
119 return;
120
121 SvREFCNT_dec (grp->callback);
122 grp->callback = 0;
123}
124
125static aio_grp *aio_grp_new ()
126{
127 aio_grp *grp;
128
129 Newz (0, grp, 1, aio_grp);
130 aio_grp_begin (grp);
131
132 return grp;
133}
134 107
135/* must be called at most once */ 108/* must be called at most once */
136static SV *req_sv (aio_req req) 109static SV *req_sv (aio_req req, const char *klass)
137{ 110{
138 req->self = (SV *)newHV (); 111 req->self = (SV *)newHV ();
139 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 112 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
140 113
141 return sv_bless (newRV_noinc (req->self), gv_stashpv (AIO_CB_KLASS, 1)); 114 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
142} 115}
143 116
144static aio_req SvAIO_REQ (SV *sv) 117static aio_req SvAIO_REQ (SV *sv)
145{ 118{
146 if (!sv_derived_from (sv, AIO_CB_KLASS) || !SvROK (sv)) 119 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
147 croak ("object of class " AIO_CB_KLASS " expected"); 120 croak ("object of class " AIO_REQ_KLASS " expected");
148 121
149 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
150 123
151 return mg ? (aio_req)mg->mg_ptr : 0; 124 return mg ? (aio_req)mg->mg_ptr : 0;
152} 125}
153 126
154static void req_free (aio_req req) 127static void poll_wait ()
155{
156 if (req->self)
157 {
158 sv_unmagic (req->self, PERL_MAGIC_ext);
159 SvREFCNT_dec (req->self);
160 }
161
162 if (req->data)
163 SvREFCNT_dec (req->data);
164
165 if (req->fh)
166 SvREFCNT_dec (req->fh);
167
168 if (req->fh2)
169 SvREFCNT_dec (req->fh2);
170
171 if (req->statdata)
172 Safefree (req->statdata);
173
174 if (req->callback)
175 SvREFCNT_dec (req->callback);
176
177 if (req->type == REQ_READDIR && req->result >= 0)
178 free (req->data2ptr);
179
180 Safefree (req);
181}
182
183static void
184poll_wait ()
185{ 128{
186 if (nreqs && !ress) 129 if (nreqs && !ress)
187 { 130 {
188 fd_set rfd; 131 fd_set rfd;
189 FD_ZERO(&rfd); 132 FD_ZERO(&rfd);
… …
191 134
192 select (respipe [0] + 1, &rfd, 0, 0, 0); 135 select (respipe [0] + 1, &rfd, 0, 0, 0);
193 } 136 }
194} 137}
195 138
196static int 139static void req_invoke (aio_req req)
197poll_cb () 140{
141 dSP;
142 int errorno = errno;
143
144 if (req->cancelled || !SvOK (req->callback))
145 return;
146
147 errno = req->errorno;
148
149 ENTER;
150 PUSHMARK (SP);
151
152 switch (req->type)
153 {
154 case REQ_READDIR:
155 {
156 SV *rv = &PL_sv_undef;
157
158 if (req->result >= 0)
159 {
160 char *buf = req->data2ptr;
161 AV *av = newAV ();
162
163 while (req->result)
164 {
165 SV *sv = newSVpv (buf, 0);
166
167 av_push (av, sv);
168 buf += SvCUR (sv) + 1;
169 req->result--;
170 }
171
172 rv = sv_2mortal (newRV_noinc ((SV *)av));
173 }
174
175 XPUSHs (rv);
176 }
177 break;
178
179 case REQ_OPEN:
180 {
181 /* convert fd to fh */
182 SV *fh;
183
184 XPUSHs (sv_2mortal (newSViv (req->result)));
185 PUTBACK;
186 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
187 SPAGAIN;
188
189 fh = SvREFCNT_inc (POPs);
190
191 PUSHMARK (SP);
192 XPUSHs (sv_2mortal (fh));
193 }
194 break;
195
196 case REQ_SLEEP:
197 case REQ_GROUP:
198 break;
199
200 default:
201 XPUSHs (sv_2mortal (newSViv (req->result)));
202 break;
203 }
204
205
206 PUTBACK;
207 call_sv (req->callback, G_VOID | G_EVAL);
208 SPAGAIN;
209
210 if (SvTRUE (ERRSV))
211 {
212 req_free (req);
213 croak (0);
214 }
215
216 LEAVE;
217
218 errno = errorno;
219}
220
221static void req_free (aio_req req)
222{
223 if (req->grp)
224 {
225 aio_req grp = req->grp;
226
227 /* unlink request */
228 req->grp_next->grp_prev = req->grp_prev;
229 req->grp_prev->grp_next = req->grp_next;
230
231 if (grp->grp_next == grp && grp->fd)
232 {
233 req_invoke (grp);
234 req_free (grp);
235 }
236 }
237
238 if (req->self)
239 {
240 sv_unmagic (req->self, PERL_MAGIC_ext);
241 SvREFCNT_dec (req->self);
242 }
243
244 if (req->data)
245 SvREFCNT_dec (req->data);
246
247 if (req->fh)
248 SvREFCNT_dec (req->fh);
249
250 if (req->fh2)
251 SvREFCNT_dec (req->fh2);
252
253 if (req->statdata)
254 Safefree (req->statdata);
255
256 if (req->callback)
257 SvREFCNT_dec (req->callback);
258
259 if (req->type == REQ_READDIR && req->result >= 0)
260 free (req->data2ptr);
261
262 Safefree (req);
263}
264
265static void req_cancel (aio_req req)
266{
267 req->cancelled = 1;
268
269 if (req->type == REQ_GROUP)
270 {
271 aio_req sub;
272
273 for (sub = req->grp_next; sub != req; sub = sub->grp_next)
274 req_cancel (sub);
275 }
276}
277
278static int poll_cb ()
198{ 279{
199 dSP; 280 dSP;
200 int count = 0; 281 int count = 0;
201 int do_croak = 0; 282 int do_croak = 0;
202 aio_req req; 283 aio_req req;
… …
228 309
229 nreqs--; 310 nreqs--;
230 311
231 if (req->type == REQ_QUIT) 312 if (req->type == REQ_QUIT)
232 started--; 313 started--;
314 else if (req->type == REQ_GROUP && req->grp_next != req)
315 {
316 req->fd = 1; /* mark request as delayed */
317 continue;
318 }
233 else 319 else
234 { 320 {
235 int errorno = errno;
236 errno = req->errorno;
237
238 if (req->type == REQ_READ) 321 if (req->type == REQ_READ)
239 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 322 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
240 323
241 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) 324 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
242 SvREADONLY_off (req->data); 325 SvREADONLY_off (req->data);
… …
246 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 329 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
247 PL_laststatval = req->result; 330 PL_laststatval = req->result;
248 PL_statcache = *(req->statdata); 331 PL_statcache = *(req->statdata);
249 } 332 }
250 333
251 ENTER; 334 req_invoke (req);
252 PUSHMARK (SP);
253 335
254 if (req->type == REQ_READDIR)
255 {
256 SV *rv = &PL_sv_undef;
257
258 if (req->result >= 0)
259 {
260 char *buf = req->data2ptr;
261 AV *av = newAV ();
262
263 while (req->result)
264 {
265 SV *sv = newSVpv (buf, 0);
266
267 av_push (av, sv);
268 buf += SvCUR (sv) + 1;
269 req->result--;
270 }
271
272 rv = sv_2mortal (newRV_noinc ((SV *)av));
273 }
274
275 XPUSHs (rv);
276 }
277 else
278 {
279 XPUSHs (sv_2mortal (newSViv (req->result)));
280
281 if (req->type == REQ_OPEN)
282 {
283 /* convert fd to fh */
284 SV *fh;
285
286 PUTBACK;
287 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
288 SPAGAIN;
289
290 fh = SvREFCNT_inc (POPs);
291
292 PUSHMARK (SP);
293 XPUSHs (sv_2mortal (fh));
294 }
295 }
296
297 if (SvOK (req->callback) && !req->cancelled)
298 {
299 PUTBACK;
300 call_sv (req->callback, G_VOID | G_EVAL);
301 SPAGAIN;
302
303 if (SvTRUE (ERRSV))
304 {
305 req_free (req);
306 croak (0);
307 }
308 }
309
310 LEAVE;
311
312 errno = errorno;
313 count++; 336 count++;
314 } 337 }
315 338
316 req_free (req); 339 req_free (req);
317 } 340 }
… …
319 return count; 342 return count;
320} 343}
321 344
322static void *aio_proc(void *arg); 345static void *aio_proc(void *arg);
323 346
324static void
325start_thread (void) 347static void start_thread (void)
326{ 348{
327 sigset_t fullsigset, oldsigset; 349 sigset_t fullsigset, oldsigset;
328 pthread_t tid; 350 pthread_t tid;
329 pthread_attr_t attr; 351 pthread_attr_t attr;
330 352
… …
339 started++; 361 started++;
340 362
341 sigprocmask (SIG_SETMASK, &oldsigset, 0); 363 sigprocmask (SIG_SETMASK, &oldsigset, 0);
342} 364}
343 365
344static void
345req_send (aio_req req) 366static void req_send (aio_req req)
346{ 367{
347 while (started < wanted && nreqs >= started) 368 while (started < wanted && nreqs >= started)
348 start_thread (); 369 start_thread ();
349 370
350 nreqs++; 371 nreqs++;
… …
374 395
375 poll_wait (); 396 poll_wait ();
376 } 397 }
377} 398}
378 399
379static void 400static void end_thread (void)
380end_thread (void)
381{ 401{
382 aio_req req; 402 aio_req req;
383 Newz (0, req, 1, aio_cb); 403 Newz (0, req, 1, aio_cb);
384 req->type = REQ_QUIT; 404 req->type = REQ_QUIT;
385 405
… …
436 * normal read/write by using a mutex. slows down execution a lot, 456 * normal read/write by using a mutex. slows down execution a lot,
437 * but that's your problem, not mine. 457 * but that's your problem, not mine.
438 */ 458 */
439static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 459static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
440 460
441static ssize_t 461static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
442pread (int fd, void *buf, size_t count, off_t offset)
443{ 462{
444 ssize_t res; 463 ssize_t res;
445 off_t ooffset; 464 off_t ooffset;
446 465
447 pthread_mutex_lock (&preadwritelock); 466 pthread_mutex_lock (&preadwritelock);
… …
452 pthread_mutex_unlock (&preadwritelock); 471 pthread_mutex_unlock (&preadwritelock);
453 472
454 return res; 473 return res;
455} 474}
456 475
457static ssize_t
458pwrite (int fd, void *buf, size_t count, off_t offset) 476static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
459{ 477{
460 ssize_t res; 478 ssize_t res;
461 off_t ooffset; 479 off_t ooffset;
462 480
463 pthread_mutex_lock (&preadwritelock); 481 pthread_mutex_lock (&preadwritelock);
… …
476#endif 494#endif
477 495
478#if !HAVE_READAHEAD 496#if !HAVE_READAHEAD
479# define readahead aio_readahead 497# define readahead aio_readahead
480 498
481static ssize_t
482readahead (int fd, off_t offset, size_t count) 499static ssize_t readahead (int fd, off_t offset, size_t count)
483{ 500{
484 char readahead_buf[4096]; 501 char readahead_buf[4096];
485 502
486 while (count > 0) 503 while (count > 0)
487 { 504 {
… …
499#if !HAVE_READDIR_R 516#if !HAVE_READDIR_R
500# define readdir_r aio_readdir_r 517# define readdir_r aio_readdir_r
501 518
502static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 519static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
503 520
504static int
505readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 521static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
506{ 522{
507 struct dirent *e; 523 struct dirent *e;
508 int errorno; 524 int errorno;
509 525
510 pthread_mutex_lock (&readdirlock); 526 pthread_mutex_lock (&readdirlock);
… …
526 return e ? 0 : -1; 542 return e ? 0 : -1;
527} 543}
528#endif 544#endif
529 545
530/* sendfile always needs emulation */ 546/* sendfile always needs emulation */
531static ssize_t
532sendfile_ (int ofd, int ifd, off_t offset, size_t count) 547static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
533{ 548{
534 ssize_t res; 549 ssize_t res;
535 550
536 if (!count) 551 if (!count)
537 return 0; 552 return 0;
… …
619 634
620 return res; 635 return res;
621} 636}
622 637
623/* read a full directory */ 638/* read a full directory */
624static int
625scandir_ (const char *path, void **namesp) 639static int scandir_ (const char *path, void **namesp)
626{ 640{
627 DIR *dirp = opendir (path); 641 DIR *dirp = opendir (path);
628 union 642 union
629 { 643 {
630 struct dirent d; 644 struct dirent d;
… …
684 return res; 698 return res;
685} 699}
686 700
687/*****************************************************************************/ 701/*****************************************************************************/
688 702
689static void *
690aio_proc (void *thr_arg) 703static void *aio_proc (void *thr_arg)
691{ 704{
692 aio_req req; 705 aio_req req;
693 int type; 706 int type;
694 707
695 do 708 do
… …
738 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 751 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
739 752
740 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 753 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
741 case REQ_FSYNC: req->result = fsync (req->fd); break; 754 case REQ_FSYNC: req->result = fsync (req->fd); break;
742 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 755 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
756
757 case REQ_SLEEP:
758 {
759 struct timeval tv;
760
761 tv.tv_sec = req->fd;
762 tv.tv_usec = req->fd2;
763
764 req->result = select (0, 0, 0, 0, &tv);
765 }
743 766
744 case REQ_QUIT: 767 case REQ_QUIT:
745 break; 768 break;
746 769
747 default: 770 default:
… …
846 869
847#define REQ_SEND \ 870#define REQ_SEND \
848 req_send (req); \ 871 req_send (req); \
849 \ 872 \
850 if (GIMME_V != G_VOID) \ 873 if (GIMME_V != G_VOID) \
851 XPUSHs (req_sv (req)); 874 XPUSHs (req_sv (req, AIO_REQ_KLASS));
852 875
853MODULE = IO::AIO PACKAGE = IO::AIO 876MODULE = IO::AIO PACKAGE = IO::AIO
854 877
855PROTOTYPES: ENABLE 878PROTOTYPES: ENABLE
856 879
… …
1103 req->dataptr = SvPVbyte_nolen (req->data); 1126 req->dataptr = SvPVbyte_nolen (req->data);
1104 1127
1105 REQ_SEND; 1128 REQ_SEND;
1106} 1129}
1107 1130
1108#if 0
1109
1110# undocumented, because it does not cancel active requests
1111void 1131void
1112cancel_most_requests () 1132aio_sleep (delay,callback=&PL_sv_undef)
1133 double delay
1134 SV * callback
1135 PPCODE:
1136{
1137 dREQ;
1138
1139 req->type = REQ_SLEEP;
1140 req->fd = delay < 0. ? 0 : delay;
1141 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1142
1143 REQ_SEND;
1144}
1145
1146void
1147aio_group (callback=&PL_sv_undef)
1148 SV * callback
1113 PROTOTYPE: 1149 PROTOTYPE: ;$
1114 CODE: 1150 PPCODE:
1115{ 1151{
1116 aio_req *req; 1152 dREQ;
1153 req->type = REQ_GROUP;
1154 req->grp_next = req;
1155 req->grp_prev = req;
1117 1156
1118 pthread_mutex_lock (&reqlock); 1157 req_send (req);
1119 for (req = reqs; req; req = req->next) 1158 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1120 req->flags |= 1;
1121 pthread_mutex_unlock (&reqlock);
1122
1123 pthread_mutex_lock (&reslock);
1124 for (req = ress; req; req = req->next)
1125 req->flags |= 1;
1126 pthread_mutex_unlock (&reslock);
1127} 1159}
1128
1129#endif
1130 1160
1131void 1161void
1132flush () 1162flush ()
1133 PROTOTYPE: 1163 PROTOTYPE:
1134 CODE: 1164 CODE:
… …
1177 CODE: 1207 CODE:
1178 RETVAL = nreqs; 1208 RETVAL = nreqs;
1179 OUTPUT: 1209 OUTPUT:
1180 RETVAL 1210 RETVAL
1181 1211
1182MODULE = IO::AIO PACKAGE = IO::AIO::CB 1212MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1183 1213
1184void 1214void
1185cancel (aio_req_ornot req) 1215cancel (aio_req_ornot req)
1186 PROTOTYPE: 1216 PROTOTYPE:
1187 CODE: 1217 CODE:
1188 req->cancelled = 1; 1218 req_cancel (req);
1189 1219
1220MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221
1222void
1223add (aio_req grp, ...)
1224 PROTOTYPE: $;@
1225 PPCODE:
1226{
1227 int i;
1228
1229 for (i = 1; i < items; ++i )
1230 {
1231 if (GIMME_V != G_VOID)
1232 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233
1234 aio_req req = SvAIO_REQ (ST (i));
1235
1236 if (req)
1237 {
1238 req->grp_prev = grp;
1239 req->grp_next = grp->grp_next;
1240 grp->grp_next->grp_prev = req;
1241 grp->grp_next = req;
1242
1243 req->grp = grp;
1244 }
1245 }
1246}
1247

Diff Legend

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