ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/eio.c
(Generate patch)

Comparing libeio/eio.c (file contents):
Revision 1.120 by root, Tue Apr 24 18:47:50 2012 UTC vs.
Revision 1.141 by root, Tue Feb 23 19:47:44 2016 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
121 121
122 #define chmod(path,mode) _chmod (path, mode) 122 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 123 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 124 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
125 126
127 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
128 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
126 #define fchmod(fd,mode) EIO_ENOSYS () 129 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS () 130 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS () 131 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 132 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 133 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
131 #define mknod(path,mode,dev) EIO_ENOSYS () 134 #define mknod(path,mode,dev) EIO_ENOSYS ()
132 #define sync() EIO_ENOSYS () 135 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS () 136 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS () 137 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS () 138 #define fstatvfs(fd,buf) EIO_ENOSYS ()
139
140 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
141 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
142
143 #if __GNUC__
144 typedef long long eio_off_t; /* signed for compatibility to msvc */
145 #else
146 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
147 #endif
148
149 static eio_ssize_t
150 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
151 {
152 OVERLAPPED o = { 0 };
153 DWORD got;
154
155 o.Offset = offset;
156 o.OffsetHigh = offset >> 32;
157
158 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
159 ? got : -1;
160 }
161
162 static eio_ssize_t
163 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
164 {
165 OVERLAPPED o = { 0 };
166 DWORD got;
167
168 o.Offset = offset;
169 o.OffsetHigh = offset >> 32;
170
171 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
172 ? got : -1;
173 }
136 174
137 /* rename() uses MoveFile, which fails to overwrite */ 175 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu) 176 #define rename(old,neu) eio__rename (old, neu)
139 177
140 static int 178 static int
178 #endif 216 #endif
179 217
180 return EIO_ERRNO (ENOENT, -1); 218 return EIO_ERRNO (ENOENT, -1);
181 } 219 }
182 220
183 /* POSIX API only */ 221 /* POSIX API only, causing trouble for win32 apps */
184 #define CreateHardLink(neu,old,flags) 0 222 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
185 #define CreateSymbolicLink(neu,old,flags) 0 223 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
186 224
187 struct statvfs 225 struct statvfs
188 { 226 {
189 int dummy; 227 int dummy;
190 }; 228 };
196 234
197#else 235#else
198 236
199 #include <sys/time.h> 237 #include <sys/time.h>
200 #include <sys/select.h> 238 #include <sys/select.h>
201 #include <sys/statvfs.h>
202 #include <unistd.h> 239 #include <unistd.h>
203 #include <signal.h> 240 #include <signal.h>
204 #include <dirent.h> 241 #include <dirent.h>
242
243 #ifdef ANDROID
244 #include <sys/vfs.h>
245 #define statvfs statfs
246 #define fstatvfs fstatfs
247 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
248 #else
249 #include <sys/statvfs.h>
250 #endif
205 251
206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
207 #include <sys/mman.h> 253 #include <sys/mman.h>
208 #endif 254 #endif
209 255
281#endif 327#endif
282 328
283/* buffer size for various temporary buffers */ 329/* buffer size for various temporary buffers */
284#define EIO_BUFSIZE 65536 330#define EIO_BUFSIZE 65536
285 331
286#define dBUF \ 332#define dBUF \
287 char *eio_buf = malloc (EIO_BUFSIZE); \ 333 char *eio_buf = malloc (EIO_BUFSIZE); \
288 errno = ENOMEM; \ 334 errno = ENOMEM; \
289 if (!eio_buf) \ 335 if (!eio_buf) \
290 return -1 336 return -1
291 337
292#define FUBd \ 338#define FUBd \
293 free (eio_buf) 339 free (eio_buf)
294 340
295#define EIO_TICKS ((1000000 + 1023) >> 10)
296
297/*****************************************************************************/ 341/*****************************************************************************/
298 342
299struct tmpbuf
300{
301 void *ptr;
302 int len;
303};
304
305static void *
306tmpbuf_get (struct tmpbuf *buf, int len)
307{
308 if (buf->len < len)
309 {
310 free (buf->ptr);
311 buf->ptr = malloc (buf->len = len);
312 }
313
314 return buf->ptr;
315}
316
317struct tmpbuf; 343struct etp_tmpbuf;
318 344
319#if _POSIX_VERSION >= 200809L 345#if _POSIX_VERSION >= 200809L
320 #define HAVE_AT 1 346 #define HAVE_AT 1
321 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 347 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
322 #ifndef O_SEARCH 348 #ifndef O_SEARCH
323 #define O_SEARCH O_RDONLY 349 #define O_SEARCH O_RDONLY
324 #endif 350 #endif
325#else 351#else
326 #define HAVE_AT 0 352 #define HAVE_AT 0
327 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path); 353 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
328#endif 354#endif
329 355
330struct eio_pwd 356struct eio_pwd
331{ 357{
332#if HAVE_AT 358#if HAVE_AT
339/*****************************************************************************/ 365/*****************************************************************************/
340 366
341#define ETP_PRI_MIN EIO_PRI_MIN 367#define ETP_PRI_MIN EIO_PRI_MIN
342#define ETP_PRI_MAX EIO_PRI_MAX 368#define ETP_PRI_MAX EIO_PRI_MAX
343 369
370#define ETP_TYPE_QUIT -1
371#define ETP_TYPE_GROUP EIO_GROUP
372
373static void eio_nop_callback (void) { }
374static void (*eio_want_poll_cb)(void) = eio_nop_callback;
375static void (*eio_done_poll_cb)(void) = eio_nop_callback;
376
377#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
378#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
379
344struct etp_worker; 380struct etp_worker;
345
346#define ETP_REQ eio_req 381#define ETP_REQ eio_req
347#define ETP_DESTROY(req) eio_destroy (req) 382#define ETP_DESTROY(req) eio_destroy (req)
348static int eio_finish (eio_req *req); 383static int eio_finish (eio_req *req);
349#define ETP_FINISH(req) eio_finish (req) 384#define ETP_FINISH(req) eio_finish (req)
350static void eio_execute (struct etp_worker *self, eio_req *req); 385static void eio_execute (struct etp_worker *self, eio_req *req);
351#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 386#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
352 387
353/*****************************************************************************/ 388#include "etp.c"
354 389
355#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 390static struct etp_pool eio_pool;
356 391#define EIO_POOL (&eio_pool)
357/* calculate time difference in ~1/EIO_TICKS of a second */
358ecb_inline int
359tvdiff (struct timeval *tv1, struct timeval *tv2)
360{
361 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
362 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
363}
364
365static unsigned int started, idle, wanted = 4;
366
367static void (*want_poll_cb) (void);
368static void (*done_poll_cb) (void);
369
370static unsigned int max_poll_time; /* reslock */
371static unsigned int max_poll_reqs; /* reslock */
372
373static unsigned int nreqs; /* reqlock */
374static unsigned int nready; /* reqlock */
375static unsigned int npending; /* reqlock */
376static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
377static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
378
379static xmutex_t wrklock;
380static xmutex_t reslock;
381static xmutex_t reqlock;
382static xcond_t reqwait;
383
384#if !HAVE_PREADWRITE
385/*
386 * make our pread/pwrite emulation safe against themselves, but not against
387 * normal read/write by using a mutex. slows down execution a lot,
388 * but that's your problem, not mine.
389 */
390static xmutex_t preadwritelock;
391#endif
392
393typedef struct etp_worker
394{
395 struct tmpbuf tmpbuf;
396
397 /* locked by wrklock */
398 struct etp_worker *prev, *next;
399
400 xthread_t tid;
401
402#ifdef ETP_WORKER_COMMON
403 ETP_WORKER_COMMON
404#endif
405} etp_worker;
406
407static etp_worker wrk_first; /* NOT etp */
408
409#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
410#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
411
412/* worker threads management */
413
414static void
415etp_worker_clear (etp_worker *wrk)
416{
417}
418
419static void ecb_cold
420etp_worker_free (etp_worker *wrk)
421{
422 free (wrk->tmpbuf.ptr);
423
424 wrk->next->prev = wrk->prev;
425 wrk->prev->next = wrk->next;
426
427 free (wrk);
428}
429
430static unsigned int
431etp_nreqs (void)
432{
433 int retval;
434 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
435 retval = nreqs;
436 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
437 return retval;
438}
439
440static unsigned int
441etp_nready (void)
442{
443 unsigned int retval;
444
445 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
446 retval = nready;
447 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
448
449 return retval;
450}
451
452static unsigned int
453etp_npending (void)
454{
455 unsigned int retval;
456
457 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
458 retval = npending;
459 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
460
461 return retval;
462}
463
464static unsigned int
465etp_nthreads (void)
466{
467 unsigned int retval;
468
469 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
470 retval = started;
471 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
472
473 return retval;
474}
475
476/*
477 * a somewhat faster data structure might be nice, but
478 * with 8 priorities this actually needs <20 insns
479 * per shift, the most expensive operation.
480 */
481typedef struct {
482 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
483 int size;
484} etp_reqq;
485
486static etp_reqq req_queue;
487static etp_reqq res_queue;
488
489static void ecb_noinline ecb_cold
490reqq_init (etp_reqq *q)
491{
492 int pri;
493
494 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
495 q->qs[pri] = q->qe[pri] = 0;
496
497 q->size = 0;
498}
499
500static int ecb_noinline
501reqq_push (etp_reqq *q, ETP_REQ *req)
502{
503 int pri = req->pri;
504 req->next = 0;
505
506 if (q->qe[pri])
507 {
508 q->qe[pri]->next = req;
509 q->qe[pri] = req;
510 }
511 else
512 q->qe[pri] = q->qs[pri] = req;
513
514 return q->size++;
515}
516
517static ETP_REQ * ecb_noinline
518reqq_shift (etp_reqq *q)
519{
520 int pri;
521
522 if (!q->size)
523 return 0;
524
525 --q->size;
526
527 for (pri = ETP_NUM_PRI; pri--; )
528 {
529 eio_req *req = q->qs[pri];
530
531 if (req)
532 {
533 if (!(q->qs[pri] = (eio_req *)req->next))
534 q->qe[pri] = 0;
535
536 return req;
537 }
538 }
539
540 abort ();
541}
542
543static int ecb_cold
544etp_init (void (*want_poll)(void), void (*done_poll)(void))
545{
546 X_MUTEX_CREATE (wrklock);
547 X_MUTEX_CREATE (reslock);
548 X_MUTEX_CREATE (reqlock);
549 X_COND_CREATE (reqwait);
550
551 reqq_init (&req_queue);
552 reqq_init (&res_queue);
553
554 wrk_first.next =
555 wrk_first.prev = &wrk_first;
556
557 started = 0;
558 idle = 0;
559 nreqs = 0;
560 nready = 0;
561 npending = 0;
562
563 want_poll_cb = want_poll;
564 done_poll_cb = done_poll;
565
566 return 0;
567}
568
569X_THREAD_PROC (etp_proc);
570
571static void ecb_cold
572etp_start_thread (void)
573{
574 etp_worker *wrk = calloc (1, sizeof (etp_worker));
575
576 /*TODO*/
577 assert (("unable to allocate worker thread data", wrk));
578
579 X_LOCK (wrklock);
580
581 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
582 {
583 wrk->prev = &wrk_first;
584 wrk->next = wrk_first.next;
585 wrk_first.next->prev = wrk;
586 wrk_first.next = wrk;
587 ++started;
588 }
589 else
590 free (wrk);
591
592 X_UNLOCK (wrklock);
593}
594
595static void
596etp_maybe_start_thread (void)
597{
598 if (ecb_expect_true (etp_nthreads () >= wanted))
599 return;
600
601 /* todo: maybe use idle here, but might be less exact */
602 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
603 return;
604
605 etp_start_thread ();
606}
607
608static void ecb_cold
609etp_end_thread (void)
610{
611 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
612
613 req->type = -1;
614 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
615
616 X_LOCK (reqlock);
617 reqq_push (&req_queue, req);
618 X_COND_SIGNAL (reqwait);
619 X_UNLOCK (reqlock);
620
621 X_LOCK (wrklock);
622 --started;
623 X_UNLOCK (wrklock);
624}
625
626static int
627etp_poll (void)
628{
629 unsigned int maxreqs;
630 unsigned int maxtime;
631 struct timeval tv_start, tv_now;
632
633 X_LOCK (reslock);
634 maxreqs = max_poll_reqs;
635 maxtime = max_poll_time;
636 X_UNLOCK (reslock);
637
638 if (maxtime)
639 gettimeofday (&tv_start, 0);
640
641 for (;;)
642 {
643 ETP_REQ *req;
644
645 etp_maybe_start_thread ();
646
647 X_LOCK (reslock);
648 req = reqq_shift (&res_queue);
649
650 if (req)
651 {
652 --npending;
653
654 if (!res_queue.size && done_poll_cb)
655 done_poll_cb ();
656 }
657
658 X_UNLOCK (reslock);
659
660 if (!req)
661 return 0;
662
663 X_LOCK (reqlock);
664 --nreqs;
665 X_UNLOCK (reqlock);
666
667 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
668 {
669 req->int1 = 1; /* mark request as delayed */
670 continue;
671 }
672 else
673 {
674 int res = ETP_FINISH (req);
675 if (ecb_expect_false (res))
676 return res;
677 }
678
679 if (ecb_expect_false (maxreqs && !--maxreqs))
680 break;
681
682 if (maxtime)
683 {
684 gettimeofday (&tv_now, 0);
685
686 if (tvdiff (&tv_start, &tv_now) >= maxtime)
687 break;
688 }
689 }
690
691 errno = EAGAIN;
692 return -1;
693}
694
695static void
696etp_cancel (ETP_REQ *req)
697{
698 req->cancelled = 1;
699
700 eio_grp_cancel (req);
701}
702
703static void
704etp_submit (ETP_REQ *req)
705{
706 req->pri -= ETP_PRI_MIN;
707
708 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
709 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
710
711 if (ecb_expect_false (req->type == EIO_GROUP))
712 {
713 /* I hope this is worth it :/ */
714 X_LOCK (reqlock);
715 ++nreqs;
716 X_UNLOCK (reqlock);
717
718 X_LOCK (reslock);
719
720 ++npending;
721
722 if (!reqq_push (&res_queue, req) && want_poll_cb)
723 want_poll_cb ();
724
725 X_UNLOCK (reslock);
726 }
727 else
728 {
729 X_LOCK (reqlock);
730 ++nreqs;
731 ++nready;
732 reqq_push (&req_queue, req);
733 X_COND_SIGNAL (reqwait);
734 X_UNLOCK (reqlock);
735
736 etp_maybe_start_thread ();
737 }
738}
739
740static void ecb_cold
741etp_set_max_poll_time (double nseconds)
742{
743 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
744 max_poll_time = nseconds * EIO_TICKS;
745 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
746}
747
748static void ecb_cold
749etp_set_max_poll_reqs (unsigned int maxreqs)
750{
751 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
752 max_poll_reqs = maxreqs;
753 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
754}
755
756static void ecb_cold
757etp_set_max_idle (unsigned int nthreads)
758{
759 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
760 max_idle = nthreads;
761 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
762}
763
764static void ecb_cold
765etp_set_idle_timeout (unsigned int seconds)
766{
767 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
768 idle_timeout = seconds;
769 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
770}
771
772static void ecb_cold
773etp_set_min_parallel (unsigned int nthreads)
774{
775 if (wanted < nthreads)
776 wanted = nthreads;
777}
778
779static void ecb_cold
780etp_set_max_parallel (unsigned int nthreads)
781{
782 if (wanted > nthreads)
783 wanted = nthreads;
784
785 while (started > wanted)
786 etp_end_thread ();
787}
788 392
789/*****************************************************************************/ 393/*****************************************************************************/
790 394
791static void 395static void
792grp_try_feed (eio_req *grp) 396grp_try_feed (eio_req *grp)
793{ 397{
794 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 398 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
795 { 399 {
796 grp->flags &= ~EIO_FLAG_GROUPADD; 400 grp->flags &= ~ETP_FLAG_GROUPADD;
797 401
798 EIO_FEED (grp); 402 EIO_FEED (grp);
799 403
800 /* stop if no progress has been made */ 404 /* stop if no progress has been made */
801 if (!(grp->flags & EIO_FLAG_GROUPADD)) 405 if (!(grp->flags & ETP_FLAG_GROUPADD))
802 { 406 {
803 grp->feed = 0; 407 grp->feed = 0;
804 break; 408 break;
805 } 409 }
806 } 410 }
813 417
814 /* call feeder, if applicable */ 418 /* call feeder, if applicable */
815 grp_try_feed (grp); 419 grp_try_feed (grp);
816 420
817 /* finish, if done */ 421 /* finish, if done */
818 if (!grp->size && grp->int1) 422 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
819 return eio_finish (grp); 423 return eio_finish (grp);
820 else 424 else
821 return 0; 425 return 0;
822} 426}
823 427
859} 463}
860 464
861void 465void
862eio_grp_cancel (eio_req *grp) 466eio_grp_cancel (eio_req *grp)
863{ 467{
864 for (grp = grp->grp_first; grp; grp = grp->grp_next) 468 etp_grp_cancel (EIO_POOL, grp);
865 eio_cancel (grp);
866} 469}
867 470
868void 471void
869eio_cancel (eio_req *req) 472eio_cancel (eio_req *req)
870{ 473{
871 etp_cancel (req); 474 etp_cancel (EIO_POOL, req);
872} 475}
873 476
874void 477void
875eio_submit (eio_req *req) 478eio_submit (eio_req *req)
876{ 479{
877 etp_submit (req); 480 etp_submit (EIO_POOL, req);
878} 481}
879 482
880unsigned int 483unsigned int
881eio_nreqs (void) 484eio_nreqs (void)
882{ 485{
883 return etp_nreqs (); 486 return etp_nreqs (EIO_POOL);
884} 487}
885 488
886unsigned int 489unsigned int
887eio_nready (void) 490eio_nready (void)
888{ 491{
889 return etp_nready (); 492 return etp_nready (EIO_POOL);
890} 493}
891 494
892unsigned int 495unsigned int
893eio_npending (void) 496eio_npending (void)
894{ 497{
895 return etp_npending (); 498 return etp_npending (EIO_POOL);
896} 499}
897 500
898unsigned int ecb_cold 501unsigned int ecb_cold
899eio_nthreads (void) 502eio_nthreads (void)
900{ 503{
901 return etp_nthreads (); 504 return etp_nthreads (EIO_POOL);
902} 505}
903 506
904void ecb_cold 507void ecb_cold
905eio_set_max_poll_time (double nseconds) 508eio_set_max_poll_time (double nseconds)
906{ 509{
907 etp_set_max_poll_time (nseconds); 510 etp_set_max_poll_time (EIO_POOL, nseconds);
908} 511}
909 512
910void ecb_cold 513void ecb_cold
911eio_set_max_poll_reqs (unsigned int maxreqs) 514eio_set_max_poll_reqs (unsigned int maxreqs)
912{ 515{
913 etp_set_max_poll_reqs (maxreqs); 516 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
914} 517}
915 518
916void ecb_cold 519void ecb_cold
917eio_set_max_idle (unsigned int nthreads) 520eio_set_max_idle (unsigned int nthreads)
918{ 521{
919 etp_set_max_idle (nthreads); 522 etp_set_max_idle (EIO_POOL, nthreads);
920} 523}
921 524
922void ecb_cold 525void ecb_cold
923eio_set_idle_timeout (unsigned int seconds) 526eio_set_idle_timeout (unsigned int seconds)
924{ 527{
925 etp_set_idle_timeout (seconds); 528 etp_set_idle_timeout (EIO_POOL, seconds);
926} 529}
927 530
928void ecb_cold 531void ecb_cold
929eio_set_min_parallel (unsigned int nthreads) 532eio_set_min_parallel (unsigned int nthreads)
930{ 533{
931 etp_set_min_parallel (nthreads); 534 etp_set_min_parallel (EIO_POOL, nthreads);
932} 535}
933 536
934void ecb_cold 537void ecb_cold
935eio_set_max_parallel (unsigned int nthreads) 538eio_set_max_parallel (unsigned int nthreads)
936{ 539{
937 etp_set_max_parallel (nthreads); 540 etp_set_max_parallel (EIO_POOL, nthreads);
938} 541}
939 542
940int eio_poll (void) 543int eio_poll (void)
941{ 544{
942 return etp_poll (); 545 return etp_poll (EIO_POOL);
943} 546}
944 547
945/*****************************************************************************/ 548/*****************************************************************************/
946/* work around various missing functions */ 549/* work around various missing functions */
947
948#if !HAVE_PREADWRITE
949# undef pread
950# undef pwrite
951# define pread eio__pread
952# define pwrite eio__pwrite
953
954static eio_ssize_t
955eio__pread (int fd, void *buf, size_t count, off_t offset)
956{
957 eio_ssize_t res;
958 off_t ooffset;
959
960 X_LOCK (preadwritelock);
961 ooffset = lseek (fd, 0, SEEK_CUR);
962 lseek (fd, offset, SEEK_SET);
963 res = read (fd, buf, count);
964 lseek (fd, ooffset, SEEK_SET);
965 X_UNLOCK (preadwritelock);
966
967 return res;
968}
969
970static eio_ssize_t
971eio__pwrite (int fd, void *buf, size_t count, off_t offset)
972{
973 eio_ssize_t res;
974 off_t ooffset;
975
976 X_LOCK (preadwritelock);
977 ooffset = lseek (fd, 0, SEEK_CUR);
978 lseek (fd, offset, SEEK_SET);
979 res = write (fd, buf, count);
980 lseek (fd, ooffset, SEEK_SET);
981 X_UNLOCK (preadwritelock);
982
983 return res;
984}
985#endif
986 550
987#ifndef HAVE_UTIMES 551#ifndef HAVE_UTIMES
988 552
989# undef utimes 553# undef utimes
990# define utimes(path,times) eio__utimes (path, times) 554# define utimes(path,times) eio__utimes (path, times)
1396 req->result = req->offs == (off_t)-1 ? -1 : 0; 960 req->result = req->offs == (off_t)-1 ? -1 : 0;
1397} 961}
1398 962
1399/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 963/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1400static int 964static int
1401eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 965eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1402{ 966{
967 char *res;
1403 const char *rel = path; 968 const char *rel = path;
1404 char *res;
1405 char *tmp1, *tmp2; 969 char *tmp1, *tmp2;
1406#if SYMLOOP_MAX > 32 970#if SYMLOOP_MAX > 32
1407 int symlinks = SYMLOOP_MAX; 971 int symlinks = SYMLOOP_MAX;
1408#else 972#else
1409 int symlinks = 32; 973 int symlinks = 32;
1415 979
1416 errno = ENOENT; 980 errno = ENOENT;
1417 if (!*rel) 981 if (!*rel)
1418 return -1; 982 return -1;
1419 983
1420 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 984 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
985#ifdef _WIN32
986 if (_access (rel, 4) != 0)
987 return -1;
988
989 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
990
991 errno = ENAMETOOLONG;
992 if (symlinks >= PATH_MAX * 3)
993 return -1;
994
995 errno = EIO;
996 if (symlinks <= 0)
997 return -1;
998
999 return symlinks;
1000
1001#else
1421 tmp1 = res + PATH_MAX; 1002 tmp1 = res + PATH_MAX;
1422 tmp2 = tmp1 + PATH_MAX; 1003 tmp2 = tmp1 + PATH_MAX;
1423 1004
1424#if 0 /* disabled, the musl way to do things is just too racy */ 1005#if 0 /* disabled, the musl way to do things is just too racy */
1425#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1006#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1429 1010
1430 if (fd >= 0) 1011 if (fd >= 0)
1431 { 1012 {
1432 sprintf (tmp1, "/proc/self/fd/%d", fd); 1013 sprintf (tmp1, "/proc/self/fd/%d", fd);
1433 req->result = readlink (tmp1, res, PATH_MAX); 1014 req->result = readlink (tmp1, res, PATH_MAX);
1015 /* here we should probably stat the open file and the disk file, to make sure they still match */
1434 close (fd); 1016 close (fd);
1435
1436 /* here we should probably stat the open file and the disk file, to make sure they still match */
1437 1017
1438 if (req->result > 0) 1018 if (req->result > 0)
1439 goto done; 1019 goto done;
1440 } 1020 }
1441 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1021 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1442 return; 1022 return -1;
1443 } 1023 }
1444#endif 1024#endif
1445#endif 1025#endif
1446 1026
1447 if (*rel != '/') 1027 if (*rel != '/')
1549 /* special case for the lone root path */ 1129 /* special case for the lone root path */
1550 if (res == tmpbuf->ptr) 1130 if (res == tmpbuf->ptr)
1551 *res++ = '/'; 1131 *res++ = '/';
1552 1132
1553 return res - (char *)tmpbuf->ptr; 1133 return res - (char *)tmpbuf->ptr;
1134#endif
1554} 1135}
1555 1136
1556static signed char 1137static signed char
1557eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1138eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1558{ 1139{
1931 #ifdef DT_FIFO 1512 #ifdef DT_FIFO
1932 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1513 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1933 #endif 1514 #endif
1934 #ifdef DT_CHR 1515 #ifdef DT_CHR
1935 case DT_CHR: ent->type = EIO_DT_CHR; break; 1516 case DT_CHR: ent->type = EIO_DT_CHR; break;
1936 #endif 1517 #endif
1937 #ifdef DT_MPC 1518 #ifdef DT_MPC
1938 case DT_MPC: ent->type = EIO_DT_MPC; break; 1519 case DT_MPC: ent->type = EIO_DT_MPC; break;
1939 #endif 1520 #endif
1940 #ifdef DT_DIR 1521 #ifdef DT_DIR
1941 case DT_DIR: ent->type = EIO_DT_DIR; break; 1522 case DT_DIR: ent->type = EIO_DT_DIR; break;
1942 #endif 1523 #endif
1943 #ifdef DT_NAM 1524 #ifdef DT_NAM
1944 case DT_NAM: ent->type = EIO_DT_NAM; break; 1525 case DT_NAM: ent->type = EIO_DT_NAM; break;
1945 #endif 1526 #endif
1946 #ifdef DT_BLK 1527 #ifdef DT_BLK
1947 case DT_BLK: ent->type = EIO_DT_BLK; break; 1528 case DT_BLK: ent->type = EIO_DT_BLK; break;
1948 #endif 1529 #endif
1949 #ifdef DT_MPB 1530 #ifdef DT_MPB
1950 case DT_MPB: ent->type = EIO_DT_MPB; break; 1531 case DT_MPB: ent->type = EIO_DT_MPB; break;
1951 #endif 1532 #endif
1952 #ifdef DT_REG 1533 #ifdef DT_REG
1953 case DT_REG: ent->type = EIO_DT_REG; break; 1534 case DT_REG: ent->type = EIO_DT_REG; break;
1954 #endif 1535 #endif
1955 #ifdef DT_NWK 1536 #ifdef DT_NWK
1956 case DT_NWK: ent->type = EIO_DT_NWK; break; 1537 case DT_NWK: ent->type = EIO_DT_NWK; break;
1957 #endif 1538 #endif
1958 #ifdef DT_CMP 1539 #ifdef DT_CMP
1959 case DT_CMP: ent->type = EIO_DT_CMP; break; 1540 case DT_CMP: ent->type = EIO_DT_CMP; break;
1960 #endif 1541 #endif
1961 #ifdef DT_LNK 1542 #ifdef DT_LNK
1962 case DT_LNK: ent->type = EIO_DT_LNK; break; 1543 case DT_LNK: ent->type = EIO_DT_LNK; break;
1963 #endif 1544 #endif
1964 #ifdef DT_SOCK 1545 #ifdef DT_SOCK
1965 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1546 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
2017#if !HAVE_AT 1598#if !HAVE_AT
2018 1599
2019/* a bit like realpath, but usually faster because it doesn'T have to return */ 1600/* a bit like realpath, but usually faster because it doesn'T have to return */
2020/* an absolute or canonical path */ 1601/* an absolute or canonical path */
2021static const char * 1602static const char *
2022wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1603wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
2023{ 1604{
2024 if (!wd || *path == '/') 1605 if (!wd || *path == '/')
2025 return path; 1606 return path;
2026 1607
2027 if (path [0] == '.' && !path [1]) 1608 if (path [0] == '.' && !path [1])
2029 1610
2030 { 1611 {
2031 int l1 = wd->len; 1612 int l1 = wd->len;
2032 int l2 = strlen (path); 1613 int l2 = strlen (path);
2033 1614
2034 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2); 1615 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
2035 1616
2036 memcpy (res, wd->str, l1); 1617 memcpy (res, wd->str, l1);
2037 res [l1] = '/'; 1618 res [l1] = '/';
2038 memcpy (res + l1 + 1, path, l2 + 1); 1619 memcpy (res + l1 + 1, path, l2 + 1);
2039 1620
2042} 1623}
2043 1624
2044#endif 1625#endif
2045 1626
2046static eio_wd 1627static eio_wd
2047eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1628eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
2048{ 1629{
2049 int fd; 1630 int fd;
2050 eio_wd res; 1631 eio_wd res;
2051 int len = eio__realpath (tmpbuf, wd, path); 1632 int len = eio__realpath (tmpbuf, wd, path);
2052 1633
2074} 1655}
2075 1656
2076eio_wd 1657eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path) 1658eio_wd_open_sync (eio_wd wd, const char *path)
2078{ 1659{
2079 struct tmpbuf tmpbuf = { 0 }; 1660 struct etp_tmpbuf tmpbuf = { };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1661 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr); 1662 free (tmpbuf.ptr);
2082 1663
2083 return wd; 1664 return wd;
2084} 1665}
2133/*****************************************************************************/ 1714/*****************************************************************************/
2134 1715
2135#define ALLOC(len) \ 1716#define ALLOC(len) \
2136 if (!req->ptr2) \ 1717 if (!req->ptr2) \
2137 { \ 1718 { \
2138 X_LOCK (wrklock); \ 1719 X_LOCK (EIO_POOL->wrklock); \
2139 req->flags |= EIO_FLAG_PTR2_FREE; \ 1720 req->flags |= EIO_FLAG_PTR2_FREE; \
2140 X_UNLOCK (wrklock); \ 1721 X_UNLOCK (EIO_POOL->wrklock); \
2141 req->ptr2 = malloc (len); \ 1722 req->ptr2 = malloc (len); \
2142 if (!req->ptr2) \ 1723 if (!req->ptr2) \
2143 { \ 1724 { \
2144 errno = ENOMEM; \ 1725 errno = ENOMEM; \
2145 req->result = -1; \ 1726 req->result = -1; \
2146 break; \ 1727 break; \
2147 } \ 1728 } \
2148 } 1729 }
2149 1730
2150static void ecb_noinline ecb_cold
2151etp_proc_init (void)
2152{
2153#if HAVE_PRCTL_SET_NAME
2154 /* provide a more sensible "thread name" */
2155 char name[16 + 1];
2156 const int namelen = sizeof (name) - 1;
2157 int len;
2158
2159 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
2160 name [namelen] = 0;
2161 len = strlen (name);
2162 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
2163 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
2164#endif
2165}
2166
2167X_THREAD_PROC (etp_proc)
2168{
2169 ETP_REQ *req;
2170 struct timespec ts;
2171 etp_worker *self = (etp_worker *)thr_arg;
2172
2173 etp_proc_init ();
2174
2175 /* try to distribute timeouts somewhat evenly */
2176 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2177
2178 for (;;)
2179 {
2180 ts.tv_sec = 0;
2181
2182 X_LOCK (reqlock);
2183
2184 for (;;)
2185 {
2186 req = reqq_shift (&req_queue);
2187
2188 if (req)
2189 break;
2190
2191 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2192 {
2193 X_UNLOCK (reqlock);
2194 X_LOCK (wrklock);
2195 --started;
2196 X_UNLOCK (wrklock);
2197 goto quit;
2198 }
2199
2200 ++idle;
2201
2202 if (idle <= max_idle)
2203 /* we are allowed to idle, so do so without any timeout */
2204 X_COND_WAIT (reqwait, reqlock);
2205 else
2206 {
2207 /* initialise timeout once */
2208 if (!ts.tv_sec)
2209 ts.tv_sec = time (0) + idle_timeout;
2210
2211 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2212 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
2213 }
2214
2215 --idle;
2216 }
2217
2218 --nready;
2219
2220 X_UNLOCK (reqlock);
2221
2222 if (req->type < 0)
2223 goto quit;
2224
2225 ETP_EXECUTE (self, req);
2226
2227 X_LOCK (reslock);
2228
2229 ++npending;
2230
2231 if (!reqq_push (&res_queue, req) && want_poll_cb)
2232 want_poll_cb ();
2233
2234 etp_worker_clear (self);
2235
2236 X_UNLOCK (reslock);
2237 }
2238
2239quit:
2240 free (req);
2241
2242 X_LOCK (wrklock);
2243 etp_worker_free (self);
2244 X_UNLOCK (wrklock);
2245}
2246
2247/*****************************************************************************/ 1731/*****************************************************************************/
2248 1732
2249int ecb_cold 1733int ecb_cold
2250eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1734eio_init (void (*want_poll)(void), void (*done_poll)(void))
2251{ 1735{
2252#if !HAVE_PREADWRITE 1736 eio_want_poll_cb = want_poll;
2253 X_MUTEX_CREATE (preadwritelock); 1737 eio_done_poll_cb = done_poll;
2254#endif
2255 1738
2256 return etp_init (want_poll, done_poll); 1739 return etp_init (EIO_POOL, 0, 0, 0);
2257} 1740}
2258 1741
2259ecb_inline void 1742ecb_inline void
2260eio_api_destroy (eio_req *req) 1743eio_api_destroy (eio_req *req)
2261{ 1744{
2262 free (req); 1745 free (req);
2263} 1746}
2264 1747
2265#define REQ(rtype) \ 1748#define REQ(rtype) \
2266 eio_req *req; \ 1749 eio_req *req; \
2267 \ 1750 \
2268 req = (eio_req *)calloc (1, sizeof *req); \ 1751 req = (eio_req *)calloc (1, sizeof *req); \
2269 if (!req) \ 1752 if (!req) \
2270 return 0; \ 1753 return 0; \
2284 { \ 1767 { \
2285 eio_api_destroy (req); \ 1768 eio_api_destroy (req); \
2286 return 0; \ 1769 return 0; \
2287 } 1770 }
2288 1771
1772#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1773
2289static void 1774static void
2290eio_execute (etp_worker *self, eio_req *req) 1775eio_execute (etp_worker *self, eio_req *req)
2291{ 1776{
2292#if HAVE_AT 1777#if HAVE_AT
2293 int dirfd; 1778 int dirfd;
2333 : read (req->int1, req->ptr2, req->size); break; 1818 : read (req->int1, req->ptr2, req->size); break;
2334 case EIO_WRITE: req->result = req->offs >= 0 1819 case EIO_WRITE: req->result = req->offs >= 0
2335 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1820 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2336 : write (req->int1, req->ptr2, req->size); break; 1821 : write (req->int1, req->ptr2, req->size); break;
2337 1822
1823 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1824 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1825
2338 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1826 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2339 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1827 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2340 1828
2341#if HAVE_AT 1829#if HAVE_AT
2342 1830
2348 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1836 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2349 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1837 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2350 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1838 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2351 1839
2352 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1840 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2353 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1841 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1)
1843 ? rmdir (req->wd->str)
1844 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2354 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1845 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1846 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1847 req->result = req->wd && SINGLEDOT (req->ptr1)
1848 ? rename (req->wd->str, req->ptr2)
1849 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2356 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1850 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2357 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1851 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1852 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX); 1853 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break; 1854 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2478 req->result = select (0, 0, 0, 0, &tv); 1972 req->result = select (0, 0, 0, 0, &tv);
2479 } 1973 }
2480#endif 1974#endif
2481 break; 1975 break;
2482 1976
1977#if 0
2483 case EIO_GROUP: 1978 case EIO_GROUP:
2484 abort (); /* handled in eio_request */ 1979 abort (); /* handled in eio_request */
1980#endif
2485 1981
2486 case EIO_NOP: 1982 case EIO_NOP:
2487 req->result = 0; 1983 req->result = 0;
2488 break; 1984 break;
2489 1985
2592} 2088}
2593 2089
2594eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2090eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2595{ 2091{
2596 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2092 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2093}
2094
2095eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2096{
2097 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2098}
2099
2100eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2101{
2102 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2597} 2103}
2598 2104
2599eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2105eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2600{ 2106{
2601 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2107 REQ (EIO_FSTAT); req->int1 = fd; SEND;
2789void 2295void
2790eio_grp_add (eio_req *grp, eio_req *req) 2296eio_grp_add (eio_req *grp, eio_req *req)
2791{ 2297{
2792 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2298 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2793 2299
2794 grp->flags |= EIO_FLAG_GROUPADD; 2300 grp->flags |= ETP_FLAG_GROUPADD;
2795 2301
2796 ++grp->size; 2302 ++grp->size;
2797 req->grp = grp; 2303 req->grp = grp;
2798 2304
2799 req->grp_prev = 0; 2305 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines