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.195 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.219 by root, Fri Jul 27 18:43:25 2012 UTC

17#include <fcntl.h> 17#include <fcntl.h>
18#include <sched.h> 18#include <sched.h>
19 19
20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
21# include <sys/mman.h> 21# include <sys/mman.h>
22#endif
23
24#if __linux__
25# include <linux/fs.h>
26# ifdef FS_IOC_FIEMAP
27# include <linux/types.h>
28# include <linux/fiemap.h>
29# define HAVE_FIEMAP 1
30# endif
22#endif 31#endif
23 32
24/* perl namespace pollution */ 33/* perl namespace pollution */
25#undef VERSION 34#undef VERSION
26 35
62 #undef dup 71 #undef dup
63 #undef dup2 72 #undef dup2
64 #undef abort 73 #undef abort
65 #undef pipe 74 #undef pipe
66 75
76 #define EIO_STRUCT_STAT struct _stati64
77 #define EIO_STRUCT_STATI64
78
67#else 79#else
68 80
69 #include <sys/time.h> 81 #include <sys/time.h>
70 #include <sys/select.h> 82 #include <sys/select.h>
71 #include <unistd.h> 83 #include <unistd.h>
72 #include <utime.h> 84 #include <utime.h>
73 #include <signal.h> 85 #include <signal.h>
74 86
75#endif
76
77#define EIO_STRUCT_STAT Stat_t 87 #define EIO_STRUCT_STAT Stat_t
78 88
79/* use NV for 32 bit perls as it allows larger offsets */
80#if IVSIZE >= 8
81# define VAL64 IV
82# define SvVAL64 SvIV
83# define newSVval64 newSViv
84#else
85# define VAL64 NV
86# define SvVAL64 SvNV
87# define newSVval64 newSVnv
88#endif 89#endif
89 90
90/*****************************************************************************/ 91/*****************************************************************************/
91 92
92#if __GNUC__ >= 3 93#if __GNUC__ >= 3
123static void req_destroy (eio_req *grp); 124static void req_destroy (eio_req *grp);
124#define EIO_DESTROY(req) req_destroy (req) 125#define EIO_DESTROY(req) req_destroy (req)
125 126
126#include "libeio/eio.c" 127#include "libeio/eio.c"
127 128
128/* Linux/others */
129#ifndef O_ASYNC
130# define O_ASYNC 0
131#endif
132#ifndef O_DIRECT
133# define O_DIRECT 0
134#endif
135#ifndef O_NOATIME
136# define O_NOATIME 0
137#endif
138
139/* POSIX */
140#ifndef O_CLOEXEC
141# define O_CLOEXEC 0
142#endif
143#ifndef O_NOFOLLOW
144# define O_NOFOLLOW 0
145#endif
146#ifndef O_NOCTTY
147# define O_NOCTTY 0
148#endif
149#ifndef O_NONBLOCK
150# define O_NONBLOCK 0
151#endif
152#ifndef O_EXEC
153# define O_EXEC 0
154#endif
155#ifndef O_SEARCH
156# define O_SEARCH 0
157#endif
158#ifndef O_DIRECTORY
159# define O_DIRECTORY 0
160#endif
161#ifndef O_DSYNC
162# define O_DSYNC 0
163#endif
164#ifndef O_RSYNC
165# define O_RSYNC 0
166#endif
167#ifndef O_SYNC
168# define O_SYNC 0
169#endif
170#ifndef O_TTY_INIT
171# define O_TTY_INIT 0
172#endif
173
174#ifndef POSIX_FADV_NORMAL
175# define POSIX_FADV_NORMAL 0
176#endif
177#ifndef POSIX_FADV_SEQUENTIAL
178# define POSIX_FADV_SEQUENTIAL 0
179#endif
180#ifndef POSIX_FADV_RANDOM
181# define POSIX_FADV_RANDOM 0
182#endif
183#ifndef POSIX_FADV_NOREUSE
184# define POSIX_FADV_NOREUSE 0
185#endif
186#ifndef POSIX_FADV_WILLNEED
187# define POSIX_FADV_WILLNEED 0
188#endif
189#ifndef POSIX_FADV_DONTNEED
190# define POSIX_FADV_DONTNEED 0
191#endif
192
193#if !HAVE_POSIX_FADVISE 129#if !HAVE_POSIX_FADVISE
194# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ 130# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
195#endif 131#endif
196 132
197#ifndef POSIX_MADV_NORMAL
198# define POSIX_MADV_NORMAL 0
199#endif
200#ifndef POSIX_MADV_SEQUENTIAL
201# define POSIX_MADV_SEQUENTIAL 0
202#endif
203#ifndef POSIX_MADV_RANDOM
204# define POSIX_MADV_RANDOM 0
205#endif
206#ifndef POSIX_MADV_WILLNEED
207# define POSIX_MADV_WILLNEED 0
208#endif
209#ifndef POSIX_MADV_DONTNEED
210# define POSIX_MADV_DONTNEED 0
211#endif
212
213#if !HAVE_POSIX_MADVISE 133#if !HAVE_POSIX_MADVISE
214# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ 134# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
215#endif
216
217#ifndef PROT_NONE
218# define PROT_NONE 0
219#endif
220#ifndef PROT_READ
221# define PROT_READ 0
222#endif
223#ifndef PROT_WRITE
224# define PROT_READ 0
225#endif
226#ifndef PROT_EXEC
227# define PROT_EXEC 0
228#endif
229
230#ifndef ST_RDONLY
231# define ST_RDONLY 0
232#endif
233#ifndef ST_NOSUID
234# define ST_NOSUID 0
235#endif
236#ifndef ST_NODEV
237# define ST_NODEV 0
238#endif
239#ifndef ST_NOEXEC
240# define ST_NOEXEC 0
241#endif
242#ifndef ST_SYNCHRONOUS
243# define ST_SYNCHRONOUS 0
244#endif
245#ifndef ST_MANDLOCK
246# define ST_MANDLOCK 0
247#endif
248#ifndef ST_WRITE
249# define ST_WRITE 0
250#endif
251#ifndef ST_APPEND
252# define ST_APPEND 0
253#endif
254#ifndef ST_IMMUTABLE
255# define ST_IMMUTABLE 0
256#endif
257#ifndef ST_NOATIME
258# define ST_NOATIME 0
259#endif
260#ifndef ST_NODIRATIME
261# define ST_NODIRATIME 0
262#endif
263#ifndef ST_RELATIME
264# define ST_RELATIME 0
265#endif
266
267#ifndef S_IFIFO
268# define S_IFIFO 0
269#endif
270#ifndef S_IFCHR
271# define S_IFCHR 0
272#endif
273#ifndef S_IFBLK
274# define S_IFBLK 0
275#endif
276#ifndef S_IFLNK
277# define S_IFLNK 0
278#endif
279#ifndef S_IFREG
280# define S_IFREG 0
281#endif
282#ifndef S_IFDIR
283# define S_IFDIR 0
284#endif
285#ifndef S_IFWHT
286# define S_IFWHT 0
287#endif
288#ifndef S_IFSOCK
289# define S_IFSOCK 0
290#endif 135#endif
291 136
292#ifndef MAP_ANONYMOUS 137#ifndef MAP_ANONYMOUS
293# ifdef MAP_ANON 138# ifdef MAP_ANON
294# define MAP_ANONYMOUS MAP_ANON 139# define MAP_ANONYMOUS MAP_ANON
295# else 140# else
296# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */ 141# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
297# endif 142# endif
298#endif 143#endif
299#ifndef MAP_HUGETLB 144
300# define MAP_HUGETLB 0 145/* defines all sorts of constants to 0 unless they are already defined */
301#endif 146#include "def0.h"
302#ifndef MAP_LOCKED
303# define MAP_LOCKED 0
304#endif
305#ifndef MAP_NORESERVE
306# define MAP_NORESERVE 0
307#endif
308#ifndef MAP_POPULATE
309# define MAP_POPULATE 0
310#endif
311#ifndef MAP_NONBLOCK
312# define MAP_NONBLOCK 0
313#endif
314 147
315#ifndef makedev 148#ifndef makedev
316# define makedev(maj,min) (((maj) << 8) | (min)) 149# define makedev(maj,min) (((maj) << 8) | (min))
317#endif 150#endif
318#ifndef major 151#ifndef major
323#endif 156#endif
324 157
325#ifndef PAGESIZE 158#ifndef PAGESIZE
326# define PAGESIZE sysconf (_SC_PAGESIZE) 159# define PAGESIZE sysconf (_SC_PAGESIZE)
327#endif 160#endif
161
162/*****************************************************************************/
163
164static void
165fiemap (eio_req *req)
166{
167 req->result = -1;
168
169#if HAVE_FIEMAP
170 int count = req->int3;
171
172 /* heuristic: first try with 72 extents if we don't know how many, */
173 /* as most files have (hopefully) fewer than this many extents */
174 /* in fact, most should have <= 2, so the 72 below is probably overkill */
175 if (count < 0)
176 count = 72; /* for what it's worth, 72 extents fit nicely into 4kb */
177
178 for (;;)
179 {
180 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
181 errno = ENOMEM;
182 if (!fiemap)
183 return;
184
185 req->ptr1 = fiemap;
186 req->flags |= EIO_FLAG_PTR1_FREE;
187
188 fiemap->fm_start = req->offs;
189 fiemap->fm_length = req->size;
190 fiemap->fm_flags = req->int2;
191 fiemap->fm_extent_count = count;
192
193 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
194 return;
195
196 if (req->int3 >= 0)
197 break; /* when not autosizing we are done */
198
199 if (fiemap->fm_mapped_extents < count)
200 /* either autosizing succeeded,
201 * or the file had no extents
202 * or we luckily had enough space */
203 break;
204
205 /* some kernels overwrite fm_length, so just reset everything */
206 fiemap->fm_start = req->offs;
207 fiemap->fm_length = req->size;
208 fiemap->fm_flags = req->int2;
209 fiemap->fm_extent_count = 0;
210
211 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
212 return;
213
214 /* to work around a kernel bug, we allocate one more */
215 count = fiemap->fm_mapped_extents + 1;
216
217 free (fiemap);
218 }
219
220 req->result = 0;
221
222#else
223 errno = ENOSYS;
224#endif
225}
226
227/*****************************************************************************/
328 228
329enum { 229enum {
330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 230 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
331}; 231};
332 232
333typedef eio_req *aio_req; 233typedef eio_req *aio_req;
334typedef eio_req *aio_req_ornot; 234typedef eio_req *aio_req_ornot;
335typedef eio_wd *aio_wd; 235typedef eio_wd aio_wd;
336 236
337static SV *on_next_submit; 237static SV *on_next_submit;
338static int next_pri = EIO_PRI_DEFAULT; 238static int next_pri = EIO_PRI_DEFAULT;
339static int max_outstanding; 239static int max_outstanding;
340 240
341static s_epipe respipe; 241static s_epipe respipe;
342 242
343static void req_destroy (aio_req req); 243static void req_destroy (aio_req req);
344static void req_cancel (aio_req req); 244static void req_cancel (aio_req req);
345 245
346static void want_poll (void) 246static void
247want_poll (void)
347{ 248{
348 /* write a dummy byte to the pipe so fh becomes ready */ 249 /* write a dummy byte to the pipe so fh becomes ready */
349 s_epipe_signal (&respipe); 250 s_epipe_signal (&respipe);
350} 251}
351 252
352static void done_poll (void) 253static void
254done_poll (void)
353{ 255{
354 /* read any signals sent by the worker threads */ 256 /* read any signals sent by the worker threads */
355 s_epipe_drain (&respipe); 257 s_epipe_drain (&respipe);
356} 258}
357 259
358/* must be called at most once */ 260/* must be called at most once */
261static SV *
359static SV *req_sv (aio_req req, HV *stash) 262req_sv (aio_req req, HV *stash)
360{ 263{
361 if (!req->self) 264 if (!req->self)
362 { 265 {
363 req->self = (SV *)newHV (); 266 req->self = (SV *)newHV ();
364 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 267 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
365 } 268 }
366 269
367 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 270 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
368} 271}
369 272
370static aio_req SvAIO_REQ (SV *sv) 273static SV *
274newSVaio_wd (aio_wd wd)
275{
276 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
277}
278
279static aio_req
280SvAIO_REQ (SV *sv)
371{ 281{
372 MAGIC *mg; 282 MAGIC *mg;
373 283
374 if (!SvROK (sv) 284 if (!SvROK (sv)
285 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
375 || (SvSTASH (SvRV (sv)) != aio_grp_stash 286 || (SvSTASH (SvRV (sv)) != aio_grp_stash
376 && SvSTASH (SvRV (sv)) != aio_req_stash 287 && SvSTASH (SvRV (sv)) != aio_req_stash
377 && !sv_derived_from (sv, "IO::AIO::REQ"))) 288 && !sv_derived_from (sv, "IO::AIO::REQ")))
378 croak ("object of class IO::AIO::REQ expected"); 289 croak ("object of class IO::AIO::REQ expected");
379 290
380 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 291 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
381 292
382 return mg ? (aio_req)mg->mg_ptr : 0; 293 return mg ? (aio_req)mg->mg_ptr : 0;
383} 294}
384 295
385static aio_wd SvAIO_WD (SV *sv) 296static aio_wd
297SvAIO_WD (SV *sv)
386{ 298{
387 if (!SvROK (sv) 299 if (!SvROK (sv)
300 || SvTYPE (SvRV (sv)) != SVt_PVMG
388 || SvSTASH (SvRV (sv)) != aio_wd_stash 301 || SvSTASH (SvRV (sv)) != aio_wd_stash)
389 || SvTYPE (SvRV (sv)) != SVt_PVMG)
390 croak ("IO::AIO: expected a working directory object as returned by aio_wd"); 302 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
391 303
392 return (aio_wd)(long)SvIVX (SvRV (sv)); 304 return (aio_wd)(long)SvIVX (SvRV (sv));
393} 305}
394 306
307static void
395static void aio_grp_feed (aio_req grp) 308aio_grp_feed (aio_req grp)
396{ 309{
397 if (grp->sv2 && SvOK (grp->sv2)) 310 if (grp->sv2 && SvOK (grp->sv2))
398 { 311 {
399 dSP; 312 dSP;
400 313
408 FREETMPS; 321 FREETMPS;
409 LEAVE; 322 LEAVE;
410 } 323 }
411} 324}
412 325
326static void
413static void req_submit (eio_req *req) 327req_submit (eio_req *req)
414{ 328{
415 eio_submit (req); 329 eio_submit (req);
416 330
417 if (expect_false (on_next_submit)) 331 if (expect_false (on_next_submit))
418 { 332 {
425 PUTBACK; 339 PUTBACK;
426 call_sv (cb, G_DISCARD | G_EVAL); 340 call_sv (cb, G_DISCARD | G_EVAL);
427 } 341 }
428} 342}
429 343
344static int
430static int req_invoke (eio_req *req) 345req_invoke (eio_req *req)
431{ 346{
432 if (req->flags & FLAG_SV2_RO_OFF) 347 if (req->flags & FLAG_SV2_RO_OFF)
433 SvREADONLY_off (req->sv2); 348 SvREADONLY_off (req->sv2);
434 349
435 if (!EIO_CANCELLED (req) && req->callback) 350 if (!EIO_CANCELLED (req) && req->callback)
457 } 372 }
458 373
459 switch (req->type) 374 switch (req->type)
460 { 375 {
461 case EIO_WD_OPEN: 376 case EIO_WD_OPEN:
462 PUSHs (sv_2mortal (sv_bless (newRV_noinc (newSViv (((long)req->wd))), aio_wd_stash))); 377 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
463 break; 378 break;
464 379
465 case EIO_READDIR: 380 case EIO_READDIR:
466 { 381 {
467 SV *rv = &PL_sv_undef; 382 SV *rv = &PL_sv_undef;
611 break; 526 break;
612 527
613 case EIO_STAT: 528 case EIO_STAT:
614 case EIO_LSTAT: 529 case EIO_LSTAT:
615 case EIO_FSTAT: 530 case EIO_FSTAT:
616 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 531 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
532
617 PL_laststatval = req->result; 533 if (!(PL_laststatval = req->result))
618 /* if compilation fails here then perl's Stat_t is not struct _stati64 */ 534 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
619 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 535 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
536
620 PUSHs (sv_result); 537 PUSHs (sv_result);
538 break;
539
540 case EIO_SEEK:
541 PUSHs (req->result ? sv_result : sv_2mortal (newSVval64 (req->offs)));
621 break; 542 break;
622 543
623 case EIO_READ: 544 case EIO_READ:
624 { 545 {
625 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 546 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
628 SvSETMAGIC (req->sv2); 549 SvSETMAGIC (req->sv2);
629 PUSHs (sv_result); 550 PUSHs (sv_result);
630 } 551 }
631 break; 552 break;
632 553
554 case EIO_CUSTOM:
555 if (req->feed == fiemap)
556 {
557#if HAVE_FIEMAP
558 if (!req->result)
559 {
560 struct fiemap *fiemap = (struct fiemap *)req->ptr1;
561
562 if (fiemap->fm_extent_count)
563 {
564 AV *av = newAV ();
565 int i;
566
567 while (fiemap->fm_mapped_extents)
568 {
569 struct fiemap_extent *extent = &fiemap->fm_extents [--fiemap->fm_mapped_extents];
570 AV *ext_av = newAV ();
571
572 av_store (ext_av, 3, newSVuv (extent->fe_flags));
573 av_store (ext_av, 2, newSVval64 (extent->fe_length));
574 av_store (ext_av, 1, newSVval64 (extent->fe_physical));
575 av_store (ext_av, 0, newSVval64 (extent->fe_logical));
576
577 av_store (av, fiemap->fm_mapped_extents, newRV_noinc ((SV *)ext_av));
578 }
579
580 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
581 }
582 else
583 {
584 SvIV_set (sv_result, fiemap->fm_mapped_extents);
585 PUSHs (sv_result);
586 }
587 }
588#endif
589 }
590 else
591 PUSHs (sv_result);
592 break;
593
633 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */ 594 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
634 if (req->result > 0) 595 if (req->result > 0)
635 SvIV_set (sv_result, 0); 596 SvIV_set (sv_result, 0);
636 /* FALLTHROUGH */ 597 /* FALLTHROUGH */
637 598
658 } 619 }
659 620
660 return !!SvTRUE (ERRSV); 621 return !!SvTRUE (ERRSV);
661} 622}
662 623
624static void
663static void req_destroy (aio_req req) 625req_destroy (aio_req req)
664{ 626{
665 if (req->self) 627 if (req->self)
666 { 628 {
667 sv_unmagic (req->self, PERL_MAGIC_ext); 629 sv_unmagic (req->self, PERL_MAGIC_ext);
668 SvREFCNT_dec (req->self); 630 SvREFCNT_dec (req->self);
672 SvREFCNT_dec (req->sv2); 634 SvREFCNT_dec (req->sv2);
673 SvREFCNT_dec (req->sv3); 635 SvREFCNT_dec (req->sv3);
674 SvREFCNT_dec (req->sv4); 636 SvREFCNT_dec (req->sv4);
675 SvREFCNT_dec (req->callback); 637 SvREFCNT_dec (req->callback);
676 638
677 Safefree (req); 639 free (req);
678} 640}
679 641
642static void
680static void req_cancel_subs (aio_req grp) 643req_cancel_subs (aio_req grp)
681{ 644{
682 if (grp->type != EIO_GROUP) 645 if (grp->type != EIO_GROUP)
683 return; 646 return;
684 647
685 SvREFCNT_dec (grp->sv2); 648 SvREFCNT_dec (grp->sv2);
686 grp->sv2 = 0; 649 grp->sv2 = 0;
687 650
688 eio_grp_cancel (grp); 651 eio_grp_cancel (grp);
689} 652}
690 653
654static void ecb_cold
691static void create_respipe (void) 655create_respipe (void)
692{ 656{
693 if (s_epipe_renew (&respipe)) 657 if (s_epipe_renew (&respipe))
694 croak ("IO::AIO: unable to initialize result pipe"); 658 croak ("IO::AIO: unable to initialize result pipe");
695} 659}
696 660
697static void poll_wait (void) 661static void
662poll_wait (void)
698{ 663{
699 while (eio_nreqs ()) 664 while (eio_nreqs ())
700 { 665 {
701 int size; 666 int size;
702 667
711 676
712 s_epipe_wait (&respipe); 677 s_epipe_wait (&respipe);
713 } 678 }
714} 679}
715 680
716static int poll_cb (void) 681static int
682poll_cb (void)
717{ 683{
718 for (;;) 684 for (;;)
719 { 685 {
720 int res = eio_poll (); 686 int res = eio_poll ();
721 687
739} 705}
740 706
741/*****************************************************************************/ 707/*****************************************************************************/
742 708
743#if !_POSIX_MAPPED_FILES 709#if !_POSIX_MAPPED_FILES
744# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 710# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
745# define munmap(addr,length) (errno = ENOSYS, -1) 711# define munmap(addr,length) EIO_ENOSYS ()
746#endif 712#endif
747 713
748#if !_POSIX_MEMORY_PROTECTION 714#if !_POSIX_MEMORY_PROTECTION
749# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 715# define mprotect(addr,len,prot) EIO_ENOSYS ()
750# define PROT_NONE 0 716# define PROT_NONE 0
751# define PROT_WRITE 0 717# define PROT_WRITE 0
752# define MAP_PRIVATE 0 718# define MAP_PRIVATE 0
753# define MAP_SHARED 0 719# define MAP_SHARED 0
754# define MAP_FIXED 0 720# define MAP_FIXED 0
755#endif 721#endif
756 722
757#define MMAP_MAGIC PERL_MAGIC_ext 723#define MMAP_MAGIC PERL_MAGIC_ext
758 724
725static int ecb_cold
759static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 726mmap_free (pTHX_ SV *sv, MAGIC *mg)
760{ 727{
761 int old_errno = errno; 728 int old_errno = errno;
762 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 729 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
763 errno = old_errno; 730 errno = old_errno;
764 731
780 0, 0, 0, 0, mmap_free 747 0, 0, 0, 0, mmap_free
781}; 748};
782 749
783/*****************************************************************************/ 750/*****************************************************************************/
784 751
752static SV *
785static SV * get_cb (SV *cb_sv) 753get_cb (SV *cb_sv)
786{ 754{
787 SvGETMAGIC (cb_sv); 755 SvGETMAGIC (cb_sv);
788 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 756 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
789} 757}
790 758
759static aio_req ecb_noinline
760dreq (SV *callback)
761{
762 SV *cb_cv;
763 aio_req req;
764 int req_pri = next_pri;
765 next_pri = EIO_PRI_DEFAULT;
766
767 cb_cv = get_cb (callback);
768
769 req = calloc (sizeof (*req), 1);
770 if (!req)
771 croak ("out of memory during eio_req allocation");
772
773 req->callback = SvREFCNT_inc (cb_cv);
774 req->pri = req_pri;
775
776 return req;
777}
778
791#define dREQ \ 779#define dREQ \
792 SV *cb_cv; \ 780 aio_req req = dreq (callback); \
793 aio_req req; \
794 int req_pri = next_pri; \
795 next_pri = EIO_PRI_DEFAULT; \
796 \
797 cb_cv = get_cb (callback); \
798 \
799 Newz (0, req, 1, eio_req); \
800 if (!req) \
801 croak ("out of memory during eio_req allocation"); \
802 \
803 req->callback = SvREFCNT_inc (cb_cv); \
804 req->pri = req_pri
805 781
806#define REQ_SEND \ 782#define REQ_SEND \
807 PUTBACK; \ 783 PUTBACK; \
808 req_submit (req); \ 784 req_submit (req); \
809 SPAGAIN; \ 785 SPAGAIN; \
810 \ 786 \
811 if (GIMME_V != G_VOID) \ 787 if (GIMME_V != G_VOID) \
812 XPUSHs (req_sv (req, aio_req_stash)); 788 XPUSHs (req_sv (req, aio_req_stash));
813 789
814static void 790ecb_inline void
815req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr) 791req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
816{ 792{
817 if (SvROK (path)) 793 if (expect_false (SvROK (path)))
818 { 794 {
819 AV *av = (AV *)SvRV (path); 795 SV *rv = SvRV (path);
820 SV *wdob; 796 SV *wdob;
821 797
822 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1) 798 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
823 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs"); 799 {
824
825 path = AvARRAY (av)[1]; 800 path = AvARRAY (rv)[1];
826 wdob = AvARRAY (av)[0]; 801 wdob = AvARRAY (rv)[0];
827 802
803 if (SvOK (wdob))
804 {
828 *wd = SvAIO_WD (wdob); 805 *wd = SvAIO_WD (wdob);
829 *wdsv = SvREFCNT_inc_NN (SvRV (wdob)); 806 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
807 }
808 else
809 *wd = EIO_INVALID_WD;
810 }
811 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
812 {
813 *wd = (aio_wd)(long)SvIVX (rv);
814 *wdsv = SvREFCNT_inc_NN (rv);
815 *ptr = ".";
816 return; /* path set to "." */
817 }
818 else
819 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
830 } 820 }
831 821
832 *pathsv = newSVsv (path); 822 *pathsv = newSVsv (path);
833 *ptr = SvPVbyte_nolen (*pathsv); 823 *ptr = SvPVbyte_nolen (*pathsv);
834} 824}
835 825
836static void 826static void ecb_noinline
837req_set_path1 (aio_req req, SV *path) 827req_set_path1 (aio_req req, SV *path)
838{ 828{
839 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1); 829 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
840} 830}
841 831
842static void 832static void ecb_noinline
843req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path) 833req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
844{ 834{
845 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path; 835 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
846 836
847 switch (SvTYPE (rv)) 837 switch (SvTYPE (rv))
857 default: 847 default:
858 req->type = type_path; 848 req->type = type_path;
859 req_set_path1 (req, fh_or_path); 849 req_set_path1 (req, fh_or_path);
860 break; 850 break;
861 } 851 }
862
863} 852}
853
854XS(boot_IO__AIO) ecb_cold;
864 855
865MODULE = IO::AIO PACKAGE = IO::AIO 856MODULE = IO::AIO PACKAGE = IO::AIO
866 857
867PROTOTYPES: ENABLE 858PROTOTYPES: ENABLE
868 859
873 IV iv; 864 IV iv;
874 } *civ, const_iv[] = { 865 } *civ, const_iv[] = {
875# define const_niv(name, value) { # name, (IV) value }, 866# define const_niv(name, value) { # name, (IV) value },
876# define const_iv(name) { # name, (IV) name }, 867# define const_iv(name) { # name, (IV) name },
877# define const_eio(name) { # name, (IV) EIO_ ## name }, 868# define const_eio(name) { # name, (IV) EIO_ ## name },
869
870 /* you have to re-run ./gendef0 after adding/Removing any constants here */
871
872 const_iv (ENOSYS)
878 const_iv (EXDEV) 873 const_iv (EXDEV)
879 const_iv (ENOSYS) 874 const_iv (EBADR)
875
880 const_iv (O_RDONLY) 876 const_iv (O_RDONLY)
881 const_iv (O_WRONLY) 877 const_iv (O_WRONLY)
882 const_iv (O_RDWR) 878 const_iv (O_RDWR)
883 const_iv (O_CREAT) 879 const_iv (O_CREAT)
884 const_iv (O_TRUNC) 880 const_iv (O_TRUNC)
952 const_iv (MAP_LOCKED) 948 const_iv (MAP_LOCKED)
953 const_iv (MAP_NORESERVE) 949 const_iv (MAP_NORESERVE)
954 const_iv (MAP_POPULATE) 950 const_iv (MAP_POPULATE)
955 const_iv (MAP_NONBLOCK) 951 const_iv (MAP_NONBLOCK)
956 952
953 const_iv (FIEMAP_FLAG_SYNC)
954 const_iv (FIEMAP_FLAG_XATTR)
955 const_iv (FIEMAP_FLAGS_COMPAT)
956 const_iv (FIEMAP_EXTENT_LAST)
957 const_iv (FIEMAP_EXTENT_UNKNOWN)
958 const_iv (FIEMAP_EXTENT_DELALLOC)
959 const_iv (FIEMAP_EXTENT_ENCODED)
960 const_iv (FIEMAP_EXTENT_DATA_ENCRYPTED)
961 const_iv (FIEMAP_EXTENT_NOT_ALIGNED)
962 const_iv (FIEMAP_EXTENT_DATA_INLINE)
963 const_iv (FIEMAP_EXTENT_DATA_TAIL)
964 const_iv (FIEMAP_EXTENT_UNWRITTEN)
965 const_iv (FIEMAP_EXTENT_MERGED)
966 const_iv (FIEMAP_EXTENT_SHARED)
967
968 const_iv (SPLICE_F_MOVE)
969 const_iv (SPLICE_F_NONBLOCK)
970 const_iv (SPLICE_F_MORE)
971 const_iv (SPLICE_F_GIFT)
972
973 const_iv (SEEK_DATA)
974 const_iv (SEEK_HOLE)
975
976 /* libeio constants */
977 const_eio (SEEK_SET)
978 const_eio (SEEK_CUR)
979 const_eio (SEEK_END)
980
957 const_eio (MCL_FUTURE) 981 const_eio (MCL_FUTURE)
958 const_eio (MCL_CURRENT) 982 const_eio (MCL_CURRENT)
959 983
960 const_eio (MS_ASYNC) 984 const_eio (MS_ASYNC)
961 const_eio (MS_INVALIDATE) 985 const_eio (MS_INVALIDATE)
966 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 990 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
967 const_eio (SYNC_FILE_RANGE_WRITE) 991 const_eio (SYNC_FILE_RANGE_WRITE)
968 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 992 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
969 993
970 const_eio (FALLOC_FL_KEEP_SIZE) 994 const_eio (FALLOC_FL_KEEP_SIZE)
995 const_eio (FALLOC_FL_PUNCH_HOLE)
971 996
972 const_eio (READDIR_DENTS) 997 const_eio (READDIR_DENTS)
973 const_eio (READDIR_DIRS_FIRST) 998 const_eio (READDIR_DIRS_FIRST)
974 const_eio (READDIR_STAT_ORDER) 999 const_eio (READDIR_STAT_ORDER)
975 const_eio (READDIR_FOUND_UNKNOWN) 1000 const_eio (READDIR_FOUND_UNKNOWN)
1083 1108
1084 req->type = ix; 1109 req->type = ix;
1085 req->sv1 = newSVsv (fh); 1110 req->sv1 = newSVsv (fh);
1086 req->int1 = fd; 1111 req->int1 = fd;
1087 1112
1088 REQ_SEND (req); 1113 REQ_SEND;
1089} 1114}
1090 1115
1091void 1116void
1092aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1117aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1093 PPCODE: 1118 PPCODE:
1100 req->int1 = fd; 1125 req->int1 = fd;
1101 req->offs = offset; 1126 req->offs = offset;
1102 req->size = nbytes; 1127 req->size = nbytes;
1103 req->int2 = flags; 1128 req->int2 = flags;
1104 1129
1105 REQ_SEND (req); 1130 REQ_SEND;
1106} 1131}
1107 1132
1108void 1133void
1109aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1134aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1110 PPCODE: 1135 PPCODE:
1117 req->int1 = fd; 1142 req->int1 = fd;
1118 req->int2 = mode; 1143 req->int2 = mode;
1119 req->offs = offset; 1144 req->offs = offset;
1120 req->size = len; 1145 req->size = len;
1121 1146
1122 REQ_SEND (req); 1147 REQ_SEND;
1123} 1148}
1124 1149
1125void 1150void
1126aio_close (SV *fh, SV *callback=&PL_sv_undef) 1151aio_close (SV *fh, SV *callback=&PL_sv_undef)
1127 PPCODE: 1152 PPCODE:
1151 req->type = EIO_DUP2; 1176 req->type = EIO_DUP2;
1152 req->int1 = close_fd; 1177 req->int1 = close_fd;
1153 req->sv2 = newSVsv (fh); 1178 req->sv2 = newSVsv (fh);
1154 req->int2 = fd; 1179 req->int2 = fd;
1155 1180
1156 REQ_SEND (req); 1181 REQ_SEND;
1182}
1183
1184void
1185aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef)
1186 PPCODE:
1187{
1188 int fd = s_fileno_croak (fh, 0);
1189 dREQ;
1190
1191 req->type = EIO_SEEK;
1192 req->sv1 = newSVsv (fh);
1193 req->int1 = fd;
1194 req->offs = SvVAL64 (offset);
1195 req->int2 = whence;
1196
1197 REQ_SEND;
1157} 1198}
1158 1199
1159void 1200void
1160aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1201aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1161 ALIAS: 1202 ALIAS:
1182 } 1223 }
1183 else 1224 else
1184 { 1225 {
1185 /* read: check type and grow scalar as necessary */ 1226 /* read: check type and grow scalar as necessary */
1186 SvUPGRADE (data, SVt_PV); 1227 SvUPGRADE (data, SVt_PV);
1228 if (SvLEN (data) >= SvCUR (data))
1187 svptr = SvGROW (data, len + dataoffset + 1); 1229 svptr = SvGROW (data, len + dataoffset + 1);
1230 else if (SvCUR (data) < len + dataoffset)
1231 croak ("length + dataoffset outside of scalar, and cannot grow");
1188 } 1232 }
1189 1233
1190 { 1234 {
1191 dREQ; 1235 dREQ;
1192 1236
1267 aio_statvfs = EIO_STATVFS 1311 aio_statvfs = EIO_STATVFS
1268 PPCODE: 1312 PPCODE:
1269{ 1313{
1270 dREQ; 1314 dREQ;
1271 1315
1272 req->sv1 = newSVsv (fh_or_path);
1273 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path); 1316 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1317
1274 REQ_SEND; 1318 REQ_SEND;
1275} 1319}
1276 1320
1277UV 1321UV
1278major (UV dev) 1322major (UV dev)
1315 REQ_SEND; 1359 REQ_SEND;
1316} 1360}
1317 1361
1318void 1362void
1319aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1363aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1320 ALIAS:
1321 aio_chmod = EIO_CHMOD
1322 aio_mkdir = EIO_MKDIR
1323 PPCODE: 1364 PPCODE:
1324{ 1365{
1325 dREQ; 1366 dREQ;
1326 1367
1327 req->int2 = mode; 1368 req->int2 = mode;
1348 PPCODE: 1389 PPCODE:
1349{ 1390{
1350 dREQ; 1391 dREQ;
1351 1392
1352 req->type = EIO_READDIR; 1393 req->type = EIO_READDIR;
1353 req->sv1 = newSVsv (pathname);
1354 req->ptr1 = SvPVbyte_nolen (req->sv1);
1355 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1394 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1356 1395
1357 if (flags & EIO_READDIR_DENTS) 1396 if (flags & EIO_READDIR_DENTS)
1358 req->int1 |= EIO_READDIR_CUSTOM2; 1397 req->int1 |= EIO_READDIR_CUSTOM2;
1359 1398
1399 req_set_path1 (req, pathname);
1400
1360 REQ_SEND; 1401 REQ_SEND;
1402}
1403
1404void
1405aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1406 PPCODE:
1407{
1408 dREQ;
1409
1410 req->type = EIO_MKDIR;
1411 req->int2 = mode;
1412 req_set_path1 (req, pathname);
1413
1414 REQ_SEND;
1361} 1415}
1362 1416
1363void 1417void
1364aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1418aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1365 ALIAS: 1419 ALIAS:
1382 aio_link = EIO_LINK 1436 aio_link = EIO_LINK
1383 aio_symlink = EIO_SYMLINK 1437 aio_symlink = EIO_SYMLINK
1384 aio_rename = EIO_RENAME 1438 aio_rename = EIO_RENAME
1385 PPCODE: 1439 PPCODE:
1386{ 1440{
1441 eio_wd wd2 = 0;
1387 dREQ; 1442 dREQ;
1388 eio_wd wd2;
1389 1443
1390 req->type = ix; 1444 req->type = ix;
1391 req_set_path1 (req, oldpath); 1445 req_set_path1 (req, oldpath);
1392 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2); 1446 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1393 req->int3 = (long)wd2; 1447 req->int3 = (long)wd2;
1479 1533
1480 req->type = EIO_MLOCKALL; 1534 req->type = EIO_MLOCKALL;
1481 req->int1 = flags; 1535 req->int1 = flags;
1482 1536
1483 REQ_SEND; 1537 REQ_SEND;
1538}
1539
1540void
1541aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
1542 PPCODE:
1543{
1544 int fd = s_fileno_croak (fh, 0);
1545 dREQ;
1546
1547 req->type = EIO_CUSTOM;
1548 req->sv1 = newSVsv (fh);
1549 req->int1 = fd;
1550
1551 req->feed = fiemap;
1552#if HAVE_FIEMAP
1553 /* keep our fingers crossed that the next two types are 64 bit */
1554 req->offs = start;
1555 req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL;
1556 req->int2 = flags;
1557 req->int3 = SvOK (count) ? SvIV (count) : -1;
1558#endif
1559
1560 REQ_SEND;
1484} 1561}
1485 1562
1486void 1563void
1487aio_busy (double delay, SV *callback=&PL_sv_undef) 1564aio_busy (double delay, SV *callback=&PL_sv_undef)
1488 PPCODE: 1565 PPCODE:
1620 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1697 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1621 OUTPUT: 1698 OUTPUT:
1622 RETVAL 1699 RETVAL
1623 1700
1624void 1701void
1625mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1702mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1626 PPCODE: 1703 PPCODE:
1627 sv_unmagic (scalar, MMAP_MAGIC); 1704 sv_unmagic (scalar, MMAP_MAGIC);
1628{ 1705{
1629 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1706 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1630 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1707 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1663 ALIAS: 1740 ALIAS:
1664 mprotect = 1 1741 mprotect = 1
1665 CODE: 1742 CODE:
1666{ 1743{
1667 STRLEN svlen; 1744 STRLEN svlen;
1668 void *addr = SvPVbyte (scalar, svlen); 1745 void *addr = SvPVbyte (scalar, svlen);
1669 size_t len = SvUV (length); 1746 size_t len = SvUV (length);
1670 1747
1671 if (offset < 0) 1748 if (offset < 0)
1672 offset += svlen; 1749 offset += svlen;
1673 1750
1709 addr = (void *)(((intptr_t)addr) + offset); 1786 addr = (void *)(((intptr_t)addr) + offset);
1710 eio_page_align (&addr, &len); 1787 eio_page_align (&addr, &len);
1711#if _POSIX_MEMLOCK_RANGE 1788#if _POSIX_MEMLOCK_RANGE
1712 RETVAL = munlock (addr, len); 1789 RETVAL = munlock (addr, len);
1713#else 1790#else
1714 RETVAL = ((errno = ENOSYS), -1); 1791 RETVAL = EIO_ENOSYS ();
1715#endif 1792#endif
1716} 1793}
1717 OUTPUT: 1794 OUTPUT:
1718 RETVAL 1795 RETVAL
1719 1796
1721munlockall () 1798munlockall ()
1722 CODE: 1799 CODE:
1723#if _POSIX_MEMLOCK 1800#if _POSIX_MEMLOCK
1724 munlockall (); 1801 munlockall ();
1725#else 1802#else
1726 RETVAL = -1; 1803 RETVAL = EIO_ENOSYS ();
1727 errno = ENOSYS;
1728#endif 1804#endif
1729 OUTPUT: 1805 OUTPUT:
1806 RETVAL
1807
1808int
1809splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1810 CODE:
1811{
1812#if HAVE_LINUX_SPLICE
1813 loff_t off_in_, off_out_;
1814 RETVAL = splice (
1815 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1816 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1817 length, flags
1818 );
1819#else
1820 RETVAL = EIO_ENOSYS ();
1821#endif
1822}
1823 OUTPUT:
1824 RETVAL
1825
1826int
1827tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1828 CODE:
1829#if HAVE_LINUX_SPLICE
1830 RETVAL = tee (rfh, wfh, length, flags);
1831#else
1832 RETVAL = EIO_ENOSYS ();
1833#endif
1834 OUTPUT:
1730 RETVAL 1835 RETVAL
1731 1836
1732void _on_next_submit (SV *cb) 1837void _on_next_submit (SV *cb)
1733 CODE: 1838 CODE:
1734 SvREFCNT_dec (on_next_submit); 1839 SvREFCNT_dec (on_next_submit);
1736 1841
1737PROTOTYPES: DISABLE 1842PROTOTYPES: DISABLE
1738 1843
1739MODULE = IO::AIO PACKAGE = IO::AIO::WD 1844MODULE = IO::AIO PACKAGE = IO::AIO::WD
1740 1845
1846BOOT:
1847{
1848 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1849 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1850}
1851
1741void 1852void
1742DESTROY (SV *self) 1853DESTROY (SV *self)
1743 CODE: 1854 CODE:
1744{ 1855{
1745 aio_wd wd = SvAIO_WD (self); 1856 aio_wd wd = SvAIO_WD (self);
1746#if HAVE_AT 1857#if HAVE_AT
1858 {
1747 SV *callback = &PL_sv_undef; 1859 SV *callback = &PL_sv_undef;
1748 dREQ; /* clobbers next_pri :/ */ 1860 dREQ; /* clobbers next_pri :/ */
1861 next_pri = req->pri; /* restore next_pri */
1862 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1749 req->type = EIO_WD_CLOSE; 1863 req->type = EIO_WD_CLOSE;
1750 req->wd = wd; 1864 req->wd = wd;
1751 REQ_SEND; 1865 REQ_SEND;
1866 }
1752#else 1867#else
1753 eio_wd_close_sync (wd); 1868 eio_wd_close_sync (wd);
1754#endif 1869#endif
1755} 1870}
1756 1871

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines