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

Comparing libeio/eio.c (file contents):
Revision 1.105 by root, Mon Sep 26 18:23:18 2011 UTC vs.
Revision 1.139 by root, Thu Jun 25 18:14:19 2015 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 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
126 #define fchmod(fd,mode) EIO_ENOSYS () 127 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS () 128 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS () 129 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
131 #define mknod(path,mode,dev) EIO_ENOSYS () 132 #define mknod(path,mode,dev) EIO_ENOSYS ()
132 #define sync() EIO_ENOSYS () 133 #define sync() EIO_ENOSYS ()
133 #define readlink(path,buf,s) EIO_ENOSYS () 134 #define readlink(path,buf,s) EIO_ENOSYS ()
134 #define statvfs(path,buf) EIO_ENOSYS () 135 #define statvfs(path,buf) EIO_ENOSYS ()
135 #define fstatvfs(fd,buf) EIO_ENOSYS () 136 #define fstatvfs(fd,buf) EIO_ENOSYS ()
137
138 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
139 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
140
141 #if __GNUC__
142 typedef long long eio_off_t; /* signed for compatibility to msvc */
143 #else
144 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
145 #endif
146
147 static eio_ssize_t
148 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
149 {
150 OVERLAPPED o = { 0 };
151 DWORD got;
152
153 o.Offset = offset;
154 o.OffsetHigh = offset >> 32;
155
156 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
157 ? got : -1;
158 }
159
160 static eio_ssize_t
161 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
162 {
163 OVERLAPPED o = { 0 };
164 DWORD got;
165
166 o.Offset = offset;
167 o.OffsetHigh = offset >> 32;
168
169 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
170 ? got : -1;
171 }
136 172
137 /* rename() uses MoveFile, which fails to overwrite */ 173 /* rename() uses MoveFile, which fails to overwrite */
138 #define rename(old,neu) eio__rename (old, neu) 174 #define rename(old,neu) eio__rename (old, neu)
139 175
140 static int 176 static int
178 #endif 214 #endif
179 215
180 return EIO_ERRNO (ENOENT, -1); 216 return EIO_ERRNO (ENOENT, -1);
181 } 217 }
182 218
183 /* POSIX API only */ 219 /* POSIX API only, causing trouble for win32 apps */
184 #define CreateHardLink(neu,old,flags) 0 220 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
185 #define CreateSymbolicLink(neu,old,flags) 0 221 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
186 222
187 struct statvfs 223 struct statvfs
188 { 224 {
189 int dummy; 225 int dummy;
190 }; 226 };
196 232
197#else 233#else
198 234
199 #include <sys/time.h> 235 #include <sys/time.h>
200 #include <sys/select.h> 236 #include <sys/select.h>
201 #include <sys/statvfs.h>
202 #include <unistd.h> 237 #include <unistd.h>
203 #include <signal.h> 238 #include <signal.h>
204 #include <dirent.h> 239 #include <dirent.h>
205 240
241 #ifdef ANDROID
242 #include <sys/vfs.h>
243 #define statvfs statfs
244 #define fstatvfs fstatfs
245 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
246 #else
247 #include <sys/statvfs.h>
248 #endif
249
206 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 250 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
207 #include <sys/mman.h> 251 #include <sys/mman.h>
208 #endif 252 #endif
209 253
210 #define D_NAME(entp) entp->d_name 254 #define D_NAME(entp) entp->d_name
211 255
212 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 256 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
213 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 257 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
214 #define _DIRENT_HAVE_D_TYPE /* sigh */ 258 #define _DIRENT_HAVE_D_TYPE /* sigh */
215 #define D_INO(de) (de)->d_fileno 259 #define D_INO(de) (de)->d_fileno
216 #define D_NAMLEN(de) (de)->d_namlen 260 #define D_NAMLEN(de) (de)->d_namlen
217 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 261 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
218 #define D_INO(de) (de)->d_ino 262 #define D_INO(de) (de)->d_ino
281#endif 325#endif
282 326
283/* buffer size for various temporary buffers */ 327/* buffer size for various temporary buffers */
284#define EIO_BUFSIZE 65536 328#define EIO_BUFSIZE 65536
285 329
286#define dBUF \ 330#define dBUF \
287 char *eio_buf = malloc (EIO_BUFSIZE); \ 331 char *eio_buf = malloc (EIO_BUFSIZE); \
288 errno = ENOMEM; \ 332 errno = ENOMEM; \
289 if (!eio_buf) \ 333 if (!eio_buf) \
290 return -1 334 return -1
291 335
292#define FUBd \ 336#define FUBd \
293 free (eio_buf) 337 free (eio_buf)
294 338
295#define EIO_TICKS ((1000000 + 1023) >> 10)
296
297/*****************************************************************************/ 339/*****************************************************************************/
298 340
299struct tmpbuf 341struct etp_tmpbuf;
342
343#if _POSIX_VERSION >= 200809L
344 #define HAVE_AT 1
345 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
346 #ifndef O_SEARCH
347 #define O_SEARCH O_RDONLY
348 #endif
349#else
350 #define HAVE_AT 0
351 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
352#endif
353
354struct eio_pwd
300{ 355{
301 void *ptr; 356#if HAVE_AT
357 int fd;
358#endif
302 int len; 359 int len;
360 char str[1]; /* actually, a 0-terminated canonical path */
303}; 361};
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 362
317/*****************************************************************************/ 363/*****************************************************************************/
318 364
319#define ETP_PRI_MIN EIO_PRI_MIN 365#define ETP_PRI_MIN EIO_PRI_MIN
320#define ETP_PRI_MAX EIO_PRI_MAX 366#define ETP_PRI_MAX EIO_PRI_MAX
321 367
368#define ETP_TYPE_QUIT -1
369#define ETP_TYPE_GROUP EIO_GROUP
370
371static void eio_nop_callback (void) { }
372static void (*eio_want_poll_cb)(void) = eio_nop_callback;
373static void (*eio_done_poll_cb)(void) = eio_nop_callback;
374
375#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
376#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
377
322struct etp_worker; 378struct etp_worker;
323
324#define ETP_REQ eio_req 379#define ETP_REQ eio_req
325#define ETP_DESTROY(req) eio_destroy (req) 380#define ETP_DESTROY(req) eio_destroy (req)
326static int eio_finish (eio_req *req); 381static int eio_finish (eio_req *req);
327#define ETP_FINISH(req) eio_finish (req) 382#define ETP_FINISH(req) eio_finish (req)
328static void eio_execute (struct etp_worker *self, eio_req *req); 383static void eio_execute (struct etp_worker *self, eio_req *req);
329#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 384#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
330 385
331/*****************************************************************************/ 386#include "etp.c"
332 387
333#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 388static struct etp_pool eio_pool;
334 389#define EIO_POOL (&eio_pool)
335/* calculate time difference in ~1/EIO_TICKS of a second */
336ecb_inline int
337tvdiff (struct timeval *tv1, struct timeval *tv2)
338{
339 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
340 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
341}
342
343static unsigned int started, idle, wanted = 4;
344
345static void (*want_poll_cb) (void);
346static void (*done_poll_cb) (void);
347
348static unsigned int max_poll_time; /* reslock */
349static unsigned int max_poll_reqs; /* reslock */
350
351static unsigned int nreqs; /* reqlock */
352static unsigned int nready; /* reqlock */
353static unsigned int npending; /* reqlock */
354static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
355static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
356
357static xmutex_t wrklock;
358static xmutex_t reslock;
359static xmutex_t reqlock;
360static xcond_t reqwait;
361
362#if !HAVE_PREADWRITE
363/*
364 * make our pread/pwrite emulation safe against themselves, but not against
365 * normal read/write by using a mutex. slows down execution a lot,
366 * but that's your problem, not mine.
367 */
368static xmutex_t preadwritelock;
369#endif
370
371typedef struct etp_worker
372{
373 struct tmpbuf tmpbuf;
374
375 /* locked by wrklock */
376 struct etp_worker *prev, *next;
377
378 xthread_t tid;
379
380#ifdef ETP_WORKER_COMMON
381 ETP_WORKER_COMMON
382#endif
383} etp_worker;
384
385static etp_worker wrk_first; /* NOT etp */
386
387#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
388#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
389
390/* worker threads management */
391
392static void ecb_cold
393etp_worker_clear (etp_worker *wrk)
394{
395}
396
397static void ecb_cold
398etp_worker_free (etp_worker *wrk)
399{
400 free (wrk->tmpbuf.ptr);
401
402 wrk->next->prev = wrk->prev;
403 wrk->prev->next = wrk->next;
404
405 free (wrk);
406}
407
408static unsigned int
409etp_nreqs (void)
410{
411 int retval;
412 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
413 retval = nreqs;
414 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
415 return retval;
416}
417
418static unsigned int
419etp_nready (void)
420{
421 unsigned int retval;
422
423 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
424 retval = nready;
425 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
426
427 return retval;
428}
429
430static unsigned int
431etp_npending (void)
432{
433 unsigned int retval;
434
435 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
436 retval = npending;
437 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
438
439 return retval;
440}
441
442static unsigned int
443etp_nthreads (void)
444{
445 unsigned int retval;
446
447 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
448 retval = started;
449 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
450
451 return retval;
452}
453
454/*
455 * a somewhat faster data structure might be nice, but
456 * with 8 priorities this actually needs <20 insns
457 * per shift, the most expensive operation.
458 */
459typedef struct {
460 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
461 int size;
462} etp_reqq;
463
464static etp_reqq req_queue;
465static etp_reqq res_queue;
466
467static void ecb_noinline ecb_cold
468reqq_init (etp_reqq *q)
469{
470 int pri;
471
472 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
473 q->qs[pri] = q->qe[pri] = 0;
474
475 q->size = 0;
476}
477
478static int ecb_noinline
479reqq_push (etp_reqq *q, ETP_REQ *req)
480{
481 int pri = req->pri;
482 req->next = 0;
483
484 if (q->qe[pri])
485 {
486 q->qe[pri]->next = req;
487 q->qe[pri] = req;
488 }
489 else
490 q->qe[pri] = q->qs[pri] = req;
491
492 return q->size++;
493}
494
495static ETP_REQ * ecb_noinline
496reqq_shift (etp_reqq *q)
497{
498 int pri;
499
500 if (!q->size)
501 return 0;
502
503 --q->size;
504
505 for (pri = ETP_NUM_PRI; pri--; )
506 {
507 eio_req *req = q->qs[pri];
508
509 if (req)
510 {
511 if (!(q->qs[pri] = (eio_req *)req->next))
512 q->qe[pri] = 0;
513
514 return req;
515 }
516 }
517
518 abort ();
519}
520
521static int ecb_cold
522etp_init (void (*want_poll)(void), void (*done_poll)(void))
523{
524 X_MUTEX_CREATE (wrklock);
525 X_MUTEX_CREATE (reslock);
526 X_MUTEX_CREATE (reqlock);
527 X_COND_CREATE (reqwait);
528
529 reqq_init (&req_queue);
530 reqq_init (&res_queue);
531
532 wrk_first.next =
533 wrk_first.prev = &wrk_first;
534
535 started = 0;
536 idle = 0;
537 nreqs = 0;
538 nready = 0;
539 npending = 0;
540
541 want_poll_cb = want_poll;
542 done_poll_cb = done_poll;
543
544 return 0;
545}
546
547X_THREAD_PROC (etp_proc);
548
549static void ecb_cold
550etp_start_thread (void)
551{
552 etp_worker *wrk = calloc (1, sizeof (etp_worker));
553
554 /*TODO*/
555 assert (("unable to allocate worker thread data", wrk));
556
557 X_LOCK (wrklock);
558
559 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
560 {
561 wrk->prev = &wrk_first;
562 wrk->next = wrk_first.next;
563 wrk_first.next->prev = wrk;
564 wrk_first.next = wrk;
565 ++started;
566 }
567 else
568 free (wrk);
569
570 X_UNLOCK (wrklock);
571}
572
573static void
574etp_maybe_start_thread (void)
575{
576 if (ecb_expect_true (etp_nthreads () >= wanted))
577 return;
578
579 /* todo: maybe use idle here, but might be less exact */
580 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
581 return;
582
583 etp_start_thread ();
584}
585
586static void ecb_cold
587etp_end_thread (void)
588{
589 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
590
591 req->type = -1;
592 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
593
594 X_LOCK (reqlock);
595 reqq_push (&req_queue, req);
596 X_COND_SIGNAL (reqwait);
597 X_UNLOCK (reqlock);
598
599 X_LOCK (wrklock);
600 --started;
601 X_UNLOCK (wrklock);
602}
603
604static int
605etp_poll (void)
606{
607 unsigned int maxreqs;
608 unsigned int maxtime;
609 struct timeval tv_start, tv_now;
610
611 X_LOCK (reslock);
612 maxreqs = max_poll_reqs;
613 maxtime = max_poll_time;
614 X_UNLOCK (reslock);
615
616 if (maxtime)
617 gettimeofday (&tv_start, 0);
618
619 for (;;)
620 {
621 ETP_REQ *req;
622
623 etp_maybe_start_thread ();
624
625 X_LOCK (reslock);
626 req = reqq_shift (&res_queue);
627
628 if (req)
629 {
630 --npending;
631
632 if (!res_queue.size && done_poll_cb)
633 done_poll_cb ();
634 }
635
636 X_UNLOCK (reslock);
637
638 if (!req)
639 return 0;
640
641 X_LOCK (reqlock);
642 --nreqs;
643 X_UNLOCK (reqlock);
644
645 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
646 {
647 req->int1 = 1; /* mark request as delayed */
648 continue;
649 }
650 else
651 {
652 int res = ETP_FINISH (req);
653 if (ecb_expect_false (res))
654 return res;
655 }
656
657 if (ecb_expect_false (maxreqs && !--maxreqs))
658 break;
659
660 if (maxtime)
661 {
662 gettimeofday (&tv_now, 0);
663
664 if (tvdiff (&tv_start, &tv_now) >= maxtime)
665 break;
666 }
667 }
668
669 errno = EAGAIN;
670 return -1;
671}
672
673static void
674etp_cancel (ETP_REQ *req)
675{
676 req->cancelled = 1;
677
678 eio_grp_cancel (req);
679}
680
681static void
682etp_submit (ETP_REQ *req)
683{
684 req->pri -= ETP_PRI_MIN;
685
686 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
687 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
688
689 if (ecb_expect_false (req->type == EIO_GROUP))
690 {
691 /* I hope this is worth it :/ */
692 X_LOCK (reqlock);
693 ++nreqs;
694 X_UNLOCK (reqlock);
695
696 X_LOCK (reslock);
697
698 ++npending;
699
700 if (!reqq_push (&res_queue, req) && want_poll_cb)
701 want_poll_cb ();
702
703 X_UNLOCK (reslock);
704 }
705 else
706 {
707 X_LOCK (reqlock);
708 ++nreqs;
709 ++nready;
710 reqq_push (&req_queue, req);
711 X_COND_SIGNAL (reqwait);
712 X_UNLOCK (reqlock);
713
714 etp_maybe_start_thread ();
715 }
716}
717
718static void ecb_cold
719etp_set_max_poll_time (double nseconds)
720{
721 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
722 max_poll_time = nseconds * EIO_TICKS;
723 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
724}
725
726static void ecb_cold
727etp_set_max_poll_reqs (unsigned int maxreqs)
728{
729 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
730 max_poll_reqs = maxreqs;
731 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
732}
733
734static void ecb_cold
735etp_set_max_idle (unsigned int nthreads)
736{
737 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
738 max_idle = nthreads;
739 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
740}
741
742static void ecb_cold
743etp_set_idle_timeout (unsigned int seconds)
744{
745 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
746 idle_timeout = seconds;
747 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
748}
749
750static void ecb_cold
751etp_set_min_parallel (unsigned int nthreads)
752{
753 if (wanted < nthreads)
754 wanted = nthreads;
755}
756
757static void ecb_cold
758etp_set_max_parallel (unsigned int nthreads)
759{
760 if (wanted > nthreads)
761 wanted = nthreads;
762
763 while (started > wanted)
764 etp_end_thread ();
765}
766 390
767/*****************************************************************************/ 391/*****************************************************************************/
768 392
769static void 393static void
770grp_try_feed (eio_req *grp) 394grp_try_feed (eio_req *grp)
771{ 395{
772 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 396 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
773 { 397 {
774 grp->flags &= ~EIO_FLAG_GROUPADD; 398 grp->flags &= ~ETP_FLAG_GROUPADD;
775 399
776 EIO_FEED (grp); 400 EIO_FEED (grp);
777 401
778 /* stop if no progress has been made */ 402 /* stop if no progress has been made */
779 if (!(grp->flags & EIO_FLAG_GROUPADD)) 403 if (!(grp->flags & ETP_FLAG_GROUPADD))
780 { 404 {
781 grp->feed = 0; 405 grp->feed = 0;
782 break; 406 break;
783 } 407 }
784 } 408 }
791 415
792 /* call feeder, if applicable */ 416 /* call feeder, if applicable */
793 grp_try_feed (grp); 417 grp_try_feed (grp);
794 418
795 /* finish, if done */ 419 /* finish, if done */
796 if (!grp->size && grp->int1) 420 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
797 return eio_finish (grp); 421 return eio_finish (grp);
798 else 422 else
799 return 0; 423 return 0;
800} 424}
801 425
837} 461}
838 462
839void 463void
840eio_grp_cancel (eio_req *grp) 464eio_grp_cancel (eio_req *grp)
841{ 465{
842 for (grp = grp->grp_first; grp; grp = grp->grp_next) 466 etp_grp_cancel (EIO_POOL, grp);
843 eio_cancel (grp);
844} 467}
845 468
846void 469void
847eio_cancel (eio_req *req) 470eio_cancel (eio_req *req)
848{ 471{
849 etp_cancel (req); 472 etp_cancel (EIO_POOL, req);
850} 473}
851 474
852void 475void
853eio_submit (eio_req *req) 476eio_submit (eio_req *req)
854{ 477{
855 etp_submit (req); 478 etp_submit (EIO_POOL, req);
856} 479}
857 480
858unsigned int 481unsigned int
859eio_nreqs (void) 482eio_nreqs (void)
860{ 483{
861 return etp_nreqs (); 484 return etp_nreqs (EIO_POOL);
862} 485}
863 486
864unsigned int 487unsigned int
865eio_nready (void) 488eio_nready (void)
866{ 489{
867 return etp_nready (); 490 return etp_nready (EIO_POOL);
868} 491}
869 492
870unsigned int 493unsigned int
871eio_npending (void) 494eio_npending (void)
872{ 495{
873 return etp_npending (); 496 return etp_npending (EIO_POOL);
874} 497}
875 498
876unsigned int ecb_cold 499unsigned int ecb_cold
877eio_nthreads (void) 500eio_nthreads (void)
878{ 501{
879 return etp_nthreads (); 502 return etp_nthreads (EIO_POOL);
880} 503}
881 504
882void ecb_cold 505void ecb_cold
883eio_set_max_poll_time (double nseconds) 506eio_set_max_poll_time (double nseconds)
884{ 507{
885 etp_set_max_poll_time (nseconds); 508 etp_set_max_poll_time (EIO_POOL, nseconds);
886} 509}
887 510
888void ecb_cold 511void ecb_cold
889eio_set_max_poll_reqs (unsigned int maxreqs) 512eio_set_max_poll_reqs (unsigned int maxreqs)
890{ 513{
891 etp_set_max_poll_reqs (maxreqs); 514 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
892} 515}
893 516
894void ecb_cold 517void ecb_cold
895eio_set_max_idle (unsigned int nthreads) 518eio_set_max_idle (unsigned int nthreads)
896{ 519{
897 etp_set_max_idle (nthreads); 520 etp_set_max_idle (EIO_POOL, nthreads);
898} 521}
899 522
900void ecb_cold 523void ecb_cold
901eio_set_idle_timeout (unsigned int seconds) 524eio_set_idle_timeout (unsigned int seconds)
902{ 525{
903 etp_set_idle_timeout (seconds); 526 etp_set_idle_timeout (EIO_POOL, seconds);
904} 527}
905 528
906void ecb_cold 529void ecb_cold
907eio_set_min_parallel (unsigned int nthreads) 530eio_set_min_parallel (unsigned int nthreads)
908{ 531{
909 etp_set_min_parallel (nthreads); 532 etp_set_min_parallel (EIO_POOL, nthreads);
910} 533}
911 534
912void ecb_cold 535void ecb_cold
913eio_set_max_parallel (unsigned int nthreads) 536eio_set_max_parallel (unsigned int nthreads)
914{ 537{
915 etp_set_max_parallel (nthreads); 538 etp_set_max_parallel (EIO_POOL, nthreads);
916} 539}
917 540
918int eio_poll (void) 541int eio_poll (void)
919{ 542{
920 return etp_poll (); 543 return etp_poll (EIO_POOL);
921} 544}
922 545
923/*****************************************************************************/ 546/*****************************************************************************/
924/* work around various missing functions */ 547/* work around various missing functions */
925
926#if !HAVE_PREADWRITE
927# undef pread
928# undef pwrite
929# define pread eio__pread
930# define pwrite eio__pwrite
931
932static eio_ssize_t
933eio__pread (int fd, void *buf, size_t count, off_t offset)
934{
935 eio_ssize_t res;
936 off_t ooffset;
937
938 X_LOCK (preadwritelock);
939 ooffset = lseek (fd, 0, SEEK_CUR);
940 lseek (fd, offset, SEEK_SET);
941 res = read (fd, buf, count);
942 lseek (fd, ooffset, SEEK_SET);
943 X_UNLOCK (preadwritelock);
944
945 return res;
946}
947
948static eio_ssize_t
949eio__pwrite (int fd, void *buf, size_t count, off_t offset)
950{
951 eio_ssize_t res;
952 off_t ooffset;
953
954 X_LOCK (preadwritelock);
955 ooffset = lseek (fd, 0, SEEK_CUR);
956 lseek (fd, offset, SEEK_SET);
957 res = write (fd, buf, count);
958 lseek (fd, ooffset, SEEK_SET);
959 X_UNLOCK (preadwritelock);
960
961 return res;
962}
963#endif
964 548
965#ifndef HAVE_UTIMES 549#ifndef HAVE_UTIMES
966 550
967# undef utimes 551# undef utimes
968# define utimes(path,times) eio__utimes (path, times) 552# define utimes(path,times) eio__utimes (path, times)
1010 int res; 594 int res;
1011 595
1012#if HAVE_SYS_SYNCFS 596#if HAVE_SYS_SYNCFS
1013 res = (int)syscall (__NR_syncfs, (int)(fd)); 597 res = (int)syscall (__NR_syncfs, (int)(fd));
1014#else 598#else
1015 res = -1; 599 res = EIO_ENOSYS ();
1016 errno = ENOSYS;
1017#endif 600#endif
1018 601
1019 if (res < 0 && errno == ENOSYS && fd >= 0) 602 if (res < 0 && errno == ENOSYS && fd >= 0)
1020 sync (); 603 sync ();
1021 604
1051} 634}
1052 635
1053static int 636static int
1054eio__fallocate (int fd, int mode, off_t offset, size_t len) 637eio__fallocate (int fd, int mode, off_t offset, size_t len)
1055{ 638{
1056#if HAVE_FALLOCATE 639#if HAVE_LINUX_FALLOCATE
1057 return fallocate (fd, mode, offset, len); 640 return fallocate (fd, mode, offset, len);
1058#else 641#else
1059 errno = ENOSYS; 642 return EIO_ENOSYS ();
1060 return -1;
1061#endif 643#endif
1062} 644}
1063 645
1064#if !HAVE_READAHEAD 646#if !HAVE_READAHEAD
1065# undef readahead 647# undef readahead
1080 todo -= len; 662 todo -= len;
1081 } 663 }
1082 664
1083 FUBd; 665 FUBd;
1084 666
1085 errno = 0; 667 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
668 /* but not for e.g. EIO or eof, so we also never fail */
1086 return count; 669 return 0;
1087} 670}
1088 671
1089#endif 672#endif
1090 673
1091/* sendfile always needs emulation */ 674/* sendfile always needs emulation */
1126 709
1127 /* according to source inspection, this is correct, and useful behaviour */ 710 /* according to source inspection, this is correct, and useful behaviour */
1128 if (sbytes) 711 if (sbytes)
1129 res = sbytes; 712 res = sbytes;
1130 713
1131# elif defined (__APPLE__) 714# elif defined __APPLE__
1132 off_t sbytes = count; 715 off_t sbytes = count;
1133 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 716 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1134 717
1135 /* according to the manpage, sbytes is always valid */ 718 /* according to the manpage, sbytes is always valid */
1136 if (sbytes) 719 if (sbytes)
1163 HANDLE h = TO_SOCKET (ifd); 746 HANDLE h = TO_SOCKET (ifd);
1164 SetFilePointer (h, offset, 0, FILE_BEGIN); 747 SetFilePointer (h, offset, 0, FILE_BEGIN);
1165 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 748 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1166 749
1167#else 750#else
1168 res = -1; 751 res = EIO_ENOSYS ();
1169 errno = ENOSYS;
1170#endif 752#endif
1171 753
1172 /* we assume sendfile can copy at least 128mb in one go */ 754 /* we assume sendfile can copy at least 128mb in one go */
1173 if (res <= 128 * 1024 * 1024) 755 if (res <= 128 * 1024 * 1024)
1174 { 756 {
1360} 942}
1361 943
1362/*****************************************************************************/ 944/*****************************************************************************/
1363/* requests implemented outside eio_execute, because they are so large */ 945/* requests implemented outside eio_execute, because they are so large */
1364 946
1365/* copies some absolute path to tmpbuf */ 947static void
1366static char * 948eio__lseek (eio_req *req)
1367eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1368{ 949{
1369 if (wd == EIO_CWD) 950 /* this usually gets optimised away completely, or your compiler sucks, */
1370 return getcwd (tmpbuf->ptr, PATH_MAX); 951 /* or the whence constants really are not 0, 1, 2 */
952 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
953 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
954 : req->int2 == EIO_SEEK_END ? SEEK_END
955 : req->int2;
1371 956
1372#if HAVE_AT 957 req->offs = lseek (req->int1, req->offs, whence);
1373 abort (); /*TODO*/ 958 req->result = req->offs == (off_t)-1 ? -1 : 0;
1374#else
1375 strcpy (tmpbuf->ptr, wd);
1376#endif
1377 return tmpbuf->ptr;
1378} 959}
1379 960
1380/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 961/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1381static int 962static int
1382eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 963eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1383{ 964{
965 char *res;
1384 const char *rel = path; 966 const char *rel = path;
1385 char *res;
1386 char *tmp1, *tmp2; 967 char *tmp1, *tmp2;
1387#if SYMLOOP_MAX > 32 968#if SYMLOOP_MAX > 32
1388 int symlinks = SYMLOOP_MAX; 969 int symlinks = SYMLOOP_MAX;
1389#else 970#else
1390 int symlinks = 32; 971 int symlinks = 32;
1391#endif 972#endif
1392 973
1393 /*D*/ /*TODO: wd ignored */
1394
1395 errno = EINVAL; 974 errno = EINVAL;
1396 if (!rel) 975 if (!rel)
1397 return -1; 976 return -1;
1398 977
1399 errno = ENOENT; 978 errno = ENOENT;
1400 if (!*rel) 979 if (!*rel)
1401 return -1; 980 return -1;
1402 981
1403 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3);
983#ifdef _WIN32
984 if (_access (rel, 4) != 0)
985 return -1;
986
987 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0);
988
989 errno = ENAMETOOLONG;
990 if (symlinks >= PATH_MAX * 3)
991 return -1;
992
993 errno = EIO;
994 if (symlinks <= 0)
995 return -1;
996
997 return symlinks;
998
999#else
1404 tmp1 = res + PATH_MAX; 1000 tmp1 = res + PATH_MAX;
1405 tmp2 = tmp1 + PATH_MAX; 1001 tmp2 = tmp1 + PATH_MAX;
1406 1002
1407#if 0 /* disabled, the musl way to do things is just too racy */ 1003#if 0 /* disabled, the musl way to do things is just too racy */
1408#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1412 1008
1413 if (fd >= 0) 1009 if (fd >= 0)
1414 { 1010 {
1415 sprintf (tmp1, "/proc/self/fd/%d", fd); 1011 sprintf (tmp1, "/proc/self/fd/%d", fd);
1416 req->result = readlink (tmp1, res, PATH_MAX); 1012 req->result = readlink (tmp1, res, PATH_MAX);
1013 /* here we should probably stat the open file and the disk file, to make sure they still match */
1417 close (fd); 1014 close (fd);
1418
1419 /* here we should probably stat the open file and the disk file, to make sure they still match */
1420 1015
1421 if (req->result > 0) 1016 if (req->result > 0)
1422 goto done; 1017 goto done;
1423 } 1018 }
1424 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1019 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1425 return; 1020 return -1;
1426 } 1021 }
1427#endif 1022#endif
1428#endif 1023#endif
1429 1024
1430 if (*rel != '/') 1025 if (*rel != '/')
1431 { 1026 {
1432 if (!eio__getwd (tmpbuf, wd)) 1027 int len;
1028
1029 errno = ENOENT;
1030 if (wd == EIO_INVALID_WD)
1433 return -1; 1031 return -1;
1032
1033 if (wd == EIO_CWD)
1034 {
1035 if (!getcwd (res, PATH_MAX))
1036 return -1;
1037
1038 len = strlen (res);
1039 }
1040 else
1041 memcpy (res, wd->str, len = wd->len);
1434 1042
1435 if (res [1]) /* only use if not / */ 1043 if (res [1]) /* only use if not / */
1436 res += strlen (res); 1044 res += len;
1437 } 1045 }
1438 1046
1439 while (*rel) 1047 while (*rel)
1440 { 1048 {
1441 eio_ssize_t len, linklen; 1049 eio_ssize_t len, linklen;
1469 } 1077 }
1470 } 1078 }
1471 1079
1472 errno = ENAMETOOLONG; 1080 errno = ENAMETOOLONG;
1473 if (res + 1 + len + 1 >= tmp1) 1081 if (res + 1 + len + 1 >= tmp1)
1474 return; 1082 return -1;
1475 1083
1476 /* copy one component */ 1084 /* copy one component */
1477 *res = '/'; 1085 *res = '/';
1478 memcpy (res + 1, beg, len); 1086 memcpy (res + 1, beg, len);
1479 1087
1519 /* special case for the lone root path */ 1127 /* special case for the lone root path */
1520 if (res == tmpbuf->ptr) 1128 if (res == tmpbuf->ptr)
1521 *res++ = '/'; 1129 *res++ = '/';
1522 1130
1523 return res - (char *)tmpbuf->ptr; 1131 return res - (char *)tmpbuf->ptr;
1132#endif
1524} 1133}
1525 1134
1526static signed char 1135static signed char
1527eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1136eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1528{ 1137{
1688 eio_dent_insertion_sort (dents, size); 1297 eio_dent_insertion_sort (dents, size);
1689} 1298}
1690 1299
1691/* read a full directory */ 1300/* read a full directory */
1692static void 1301static void
1693eio__scandir (eio_req *req) 1302eio__scandir (eio_req *req, etp_worker *self)
1694{ 1303{
1695 char *name, *names; 1304 char *name, *names;
1696 int namesalloc = 4096 - sizeof (void *) * 4; 1305 int namesalloc = 4096 - sizeof (void *) * 4;
1697 int namesoffs = 0; 1306 int namesoffs = 0;
1698 int flags = req->int1; 1307 int flags = req->int1;
1716#ifdef _WIN32 1325#ifdef _WIN32
1717 { 1326 {
1718 int len = strlen ((const char *)req->ptr1); 1327 int len = strlen ((const char *)req->ptr1);
1719 char *path = malloc (MAX_PATH); 1328 char *path = malloc (MAX_PATH);
1720 const char *fmt; 1329 const char *fmt;
1330 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1721 1331
1722 if (!len) 1332 if (!len)
1723 fmt = "./*"; 1333 fmt = "./*";
1724 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1334 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1725 fmt = "%s*"; 1335 fmt = "%s*";
1726 else 1336 else
1727 fmt = "%s/*"; 1337 fmt = "%s/*";
1728 1338
1729 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1339 _snprintf (path, MAX_PATH, fmt, reqpath);
1730 dirp = FindFirstFile (path, &entp); 1340 dirp = FindFirstFile (path, &entp);
1731 free (path); 1341 free (path);
1732 1342
1733 if (dirp == INVALID_HANDLE_VALUE) 1343 if (dirp == INVALID_HANDLE_VALUE)
1734 { 1344 {
1756 1366
1757 return; 1367 return;
1758 } 1368 }
1759 } 1369 }
1760#else 1370#else
1371 #if HAVE_AT
1372 if (req->wd)
1373 {
1374 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1375
1376 if (fd < 0)
1377 return;
1378
1379 dirp = fdopendir (fd);
1380
1381 if (!dirp)
1382 close (fd);
1383 }
1384 else
1761 dirp = opendir (req->ptr1); 1385 dirp = opendir (req->ptr1);
1386 #else
1387 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1388 #endif
1762 1389
1763 if (!dirp) 1390 if (!dirp)
1764 return; 1391 return;
1765#endif 1392#endif
1766 1393
1883 #ifdef DT_FIFO 1510 #ifdef DT_FIFO
1884 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1511 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1885 #endif 1512 #endif
1886 #ifdef DT_CHR 1513 #ifdef DT_CHR
1887 case DT_CHR: ent->type = EIO_DT_CHR; break; 1514 case DT_CHR: ent->type = EIO_DT_CHR; break;
1888 #endif 1515 #endif
1889 #ifdef DT_MPC 1516 #ifdef DT_MPC
1890 case DT_MPC: ent->type = EIO_DT_MPC; break; 1517 case DT_MPC: ent->type = EIO_DT_MPC; break;
1891 #endif 1518 #endif
1892 #ifdef DT_DIR 1519 #ifdef DT_DIR
1893 case DT_DIR: ent->type = EIO_DT_DIR; break; 1520 case DT_DIR: ent->type = EIO_DT_DIR; break;
1894 #endif 1521 #endif
1895 #ifdef DT_NAM 1522 #ifdef DT_NAM
1896 case DT_NAM: ent->type = EIO_DT_NAM; break; 1523 case DT_NAM: ent->type = EIO_DT_NAM; break;
1897 #endif 1524 #endif
1898 #ifdef DT_BLK 1525 #ifdef DT_BLK
1899 case DT_BLK: ent->type = EIO_DT_BLK; break; 1526 case DT_BLK: ent->type = EIO_DT_BLK; break;
1900 #endif 1527 #endif
1901 #ifdef DT_MPB 1528 #ifdef DT_MPB
1902 case DT_MPB: ent->type = EIO_DT_MPB; break; 1529 case DT_MPB: ent->type = EIO_DT_MPB; break;
1903 #endif 1530 #endif
1904 #ifdef DT_REG 1531 #ifdef DT_REG
1905 case DT_REG: ent->type = EIO_DT_REG; break; 1532 case DT_REG: ent->type = EIO_DT_REG; break;
1906 #endif 1533 #endif
1907 #ifdef DT_NWK 1534 #ifdef DT_NWK
1908 case DT_NWK: ent->type = EIO_DT_NWK; break; 1535 case DT_NWK: ent->type = EIO_DT_NWK; break;
1909 #endif 1536 #endif
1910 #ifdef DT_CMP 1537 #ifdef DT_CMP
1911 case DT_CMP: ent->type = EIO_DT_CMP; break; 1538 case DT_CMP: ent->type = EIO_DT_CMP; break;
1912 #endif 1539 #endif
1913 #ifdef DT_LNK 1540 #ifdef DT_LNK
1914 case DT_LNK: ent->type = EIO_DT_LNK; break; 1541 case DT_LNK: ent->type = EIO_DT_LNK; break;
1915 #endif 1542 #endif
1916 #ifdef DT_SOCK 1543 #ifdef DT_SOCK
1917 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1544 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1930 { 1557 {
1931 if (ent->type == EIO_DT_UNKNOWN) 1558 if (ent->type == EIO_DT_UNKNOWN)
1932 { 1559 {
1933 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1560 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1934 ent->score = 1; 1561 ent->score = 1;
1935 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1562 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1936 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */ 1563 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1937 } 1564 }
1938 else if (ent->type == EIO_DT_DIR) 1565 else if (ent->type == EIO_DT_DIR)
1939 ent->score = 0; 1566 ent->score = 0;
1940 } 1567 }
1960 } 1587 }
1961} 1588}
1962 1589
1963/*****************************************************************************/ 1590/*****************************************************************************/
1964/* working directory stuff */ 1591/* working directory stuff */
1592/* various deficiencies in the posix 2008 api force us to */
1593/* keep the absolute path in string form at all times */
1594/* fuck yeah. */
1595
1596#if !HAVE_AT
1597
1598/* a bit like realpath, but usually faster because it doesn'T have to return */
1599/* an absolute or canonical path */
1600static const char *
1601wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1602{
1603 if (!wd || *path == '/')
1604 return path;
1605
1606 if (path [0] == '.' && !path [1])
1607 return wd->str;
1608
1609 {
1610 int l1 = wd->len;
1611 int l2 = strlen (path);
1612
1613 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1614
1615 memcpy (res, wd->str, l1);
1616 res [l1] = '/';
1617 memcpy (res + l1 + 1, path, l2 + 1);
1618
1619 return res;
1620 }
1621}
1622
1623#endif
1624
1625static eio_wd
1626eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1627{
1628 int fd;
1629 eio_wd res;
1630 int len = eio__realpath (tmpbuf, wd, path);
1631
1632 if (len < 0)
1633 return EIO_INVALID_WD;
1965 1634
1966#if HAVE_AT 1635#if HAVE_AT
1636 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1967 1637
1968#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD) 1638 if (fd < 0)
1969 1639 return EIO_INVALID_WD;
1970#ifndef O_SEARCH
1971# define O_SEARCH O_RDONLY
1972#endif 1640#endif
1641
1642 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1643
1644#if HAVE_AT
1645 res->fd = fd;
1646#endif
1647
1648 res->len = len;
1649 memcpy (res->str, tmpbuf->ptr, len);
1650 res->str [len] = 0;
1651
1652 return res;
1653}
1973 1654
1974eio_wd 1655eio_wd
1975eio_wd_open_sync (eio_wd wd, const char *path) 1656eio_wd_open_sync (eio_wd wd, const char *path)
1976{ 1657{
1977 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1658 struct etp_tmpbuf tmpbuf = { };
1978
1979 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1980}
1981
1982static eio_wd
1983eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1984{
1985 return eio_wd_open_sync (wd, path); 1659 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1660 free (tmpbuf.ptr);
1661
1662 return wd;
1986} 1663}
1987 1664
1988void 1665void
1989eio_wd_close_sync (eio_wd wd) 1666eio_wd_close_sync (eio_wd wd)
1990{ 1667{
1991 int fd = WD2FD (wd); 1668 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1992 1669 {
1993 if (fd >= 0) 1670 #if HAVE_AT
1994 close (fd); 1671 close (wd->fd);
1672 #endif
1673 free (wd);
1674 }
1995} 1675}
1676
1677#if HAVE_AT
1678
1679/* they forgot these */
1996 1680
1997static int 1681static int
1998eio__truncateat (int dirfd, const char *path, off_t length) 1682eio__truncateat (int dirfd, const char *path, off_t length)
1999{ 1683{
2000 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1684 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
2021 close (fd); 1705 close (fd);
2022 return res; 1706 return res;
2023 1707
2024} 1708}
2025 1709
2026#else
2027
2028/* on legacy systems, we represent the working directories simply by their path strings */
2029
2030static const char *
2031wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2032{
2033 if (!wd || *path == '/')
2034 return path;
2035
2036 {
2037 int l1 = strlen ((const char *)wd);
2038 int l2 = strlen (path);
2039
2040 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2041
2042 memcpy (res, wd, l1);
2043 res [l1] = '/';
2044 memcpy (res + l1 + 1, path, l2 + 1);
2045
2046 return res;
2047 }
2048}
2049
2050static eio_wd
2051eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2052{
2053 if (*path == '/') /* absolute paths ignore wd */
2054 path = strdup (path);
2055 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2056 return wd;
2057 else
2058 {
2059 int len = eio__realpath (tmpbuf, wd, path);
2060
2061 path = EIO_INVALID_WD;
2062
2063 if (len >= 0)
2064 {
2065 ((char *)tmpbuf->ptr)[len] = 0;
2066 path = strdup (tmpbuf->ptr);
2067 }
2068 }
2069
2070 if (!path)
2071 path = EIO_INVALID_WD;
2072
2073 return (eio_wd)path;
2074}
2075
2076eio_wd
2077eio_wd_open_sync (eio_wd wd, const char *path)
2078{
2079 struct tmpbuf tmpbuf = { 0 };
2080 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2081 free (tmpbuf.ptr);
2082
2083 return wd;
2084}
2085
2086void
2087eio_wd_close_sync (eio_wd wd)
2088{
2089 if (wd != EIO_INVALID_WD)
2090 free (wd);
2091}
2092
2093#endif 1710#endif
2094 1711
2095/*****************************************************************************/ 1712/*****************************************************************************/
2096 1713
2097#define ALLOC(len) \ 1714#define ALLOC(len) \
2098 if (!req->ptr2) \ 1715 if (!req->ptr2) \
2099 { \ 1716 { \
2100 X_LOCK (wrklock); \ 1717 X_LOCK (EIO_POOL->wrklock); \
2101 req->flags |= EIO_FLAG_PTR2_FREE; \ 1718 req->flags |= EIO_FLAG_PTR2_FREE; \
2102 X_UNLOCK (wrklock); \ 1719 X_UNLOCK (EIO_POOL->wrklock); \
2103 req->ptr2 = malloc (len); \ 1720 req->ptr2 = malloc (len); \
2104 if (!req->ptr2) \ 1721 if (!req->ptr2) \
2105 { \ 1722 { \
2106 errno = ENOMEM; \ 1723 errno = ENOMEM; \
2107 req->result = -1; \ 1724 req->result = -1; \
2108 break; \ 1725 break; \
2109 } \ 1726 } \
2110 } 1727 }
2111 1728
2112X_THREAD_PROC (etp_proc)
2113{
2114 ETP_REQ *req;
2115 struct timespec ts;
2116 etp_worker *self = (etp_worker *)thr_arg;
2117
2118#if HAVE_PRCTL_SET_NAME
2119 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2120#endif
2121
2122 /* try to distribute timeouts somewhat evenly */
2123 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2124
2125 for (;;)
2126 {
2127 ts.tv_sec = 0;
2128
2129 X_LOCK (reqlock);
2130
2131 for (;;)
2132 {
2133 req = reqq_shift (&req_queue);
2134
2135 if (req)
2136 break;
2137
2138 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2139 {
2140 X_UNLOCK (reqlock);
2141 X_LOCK (wrklock);
2142 --started;
2143 X_UNLOCK (wrklock);
2144 goto quit;
2145 }
2146
2147 ++idle;
2148
2149 if (idle <= max_idle)
2150 /* we are allowed to idle, so do so without any timeout */
2151 X_COND_WAIT (reqwait, reqlock);
2152 else
2153 {
2154 /* initialise timeout once */
2155 if (!ts.tv_sec)
2156 ts.tv_sec = time (0) + idle_timeout;
2157
2158 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2159 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
2160 }
2161
2162 --idle;
2163 }
2164
2165 --nready;
2166
2167 X_UNLOCK (reqlock);
2168
2169 if (req->type < 0)
2170 goto quit;
2171
2172 ETP_EXECUTE (self, req);
2173
2174 X_LOCK (reslock);
2175
2176 ++npending;
2177
2178 if (!reqq_push (&res_queue, req) && want_poll_cb)
2179 want_poll_cb ();
2180
2181 etp_worker_clear (self);
2182
2183 X_UNLOCK (reslock);
2184 }
2185
2186quit:
2187 free (req);
2188
2189 X_LOCK (wrklock);
2190 etp_worker_free (self);
2191 X_UNLOCK (wrklock);
2192
2193 return 0;
2194}
2195
2196/*****************************************************************************/ 1729/*****************************************************************************/
2197 1730
2198int ecb_cold 1731int ecb_cold
2199eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1732eio_init (void (*want_poll)(void), void (*done_poll)(void))
2200{ 1733{
2201#if !HAVE_PREADWRITE 1734 eio_want_poll_cb = want_poll;
2202 X_MUTEX_CREATE (preadwritelock); 1735 eio_done_poll_cb = done_poll;
2203#endif
2204 1736
2205 return etp_init (want_poll, done_poll); 1737 return etp_init (EIO_POOL, 0, 0, 0);
2206} 1738}
2207 1739
2208ecb_inline void 1740ecb_inline void
2209eio_api_destroy (eio_req *req) 1741eio_api_destroy (eio_req *req)
2210{ 1742{
2211 free (req); 1743 free (req);
2212} 1744}
2213 1745
2214#define REQ(rtype) \ 1746#define REQ(rtype) \
2215 eio_req *req; \ 1747 eio_req *req; \
2216 \ 1748 \
2217 req = (eio_req *)calloc (1, sizeof *req); \ 1749 req = (eio_req *)calloc (1, sizeof *req); \
2218 if (!req) \ 1750 if (!req) \
2219 return 0; \ 1751 return 0; \
2233 { \ 1765 { \
2234 eio_api_destroy (req); \ 1766 eio_api_destroy (req); \
2235 return 0; \ 1767 return 0; \
2236 } 1768 }
2237 1769
1770#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1771
2238static void 1772static void
2239eio_execute (etp_worker *self, eio_req *req) 1773eio_execute (etp_worker *self, eio_req *req)
2240{ 1774{
2241#if HAVE_AT 1775#if HAVE_AT
2242 int dirfd; 1776 int dirfd;
2270 switch (req->type) 1804 switch (req->type)
2271 { 1805 {
2272 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1); 1806 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
2273 req->result = req->wd == EIO_INVALID_WD ? -1 : 0; 1807 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2274 break; 1808 break;
1809 case EIO_WD_CLOSE: req->result = 0;
1810 eio_wd_close_sync (req->wd); break;
1811
2275 case EIO_WD_CLOSE: eio_wd_close_sync (req->wd); break; 1812 case EIO_SEEK: eio__lseek (req); break;
2276
2277 case EIO_READ: ALLOC (req->size); 1813 case EIO_READ: ALLOC (req->size);
2278 req->result = req->offs >= 0 1814 req->result = req->offs >= 0
2279 ? pread (req->int1, req->ptr2, req->size, req->offs) 1815 ? pread (req->int1, req->ptr2, req->size, req->offs)
2280 : read (req->int1, req->ptr2, req->size); break; 1816 : read (req->int1, req->ptr2, req->size); break;
2281 case EIO_WRITE: req->result = req->offs >= 0 1817 case EIO_WRITE: req->result = req->offs >= 0
2284 1820
2285 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1821 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2286 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1822 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2287 1823
2288#if HAVE_AT 1824#if HAVE_AT
1825
2289 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1826 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2290 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break; 1827 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2291 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1828 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2292 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1829 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
2293 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1830 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
2294 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1831 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2295 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1832 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2296 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1833 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2297 1834
2298 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1835 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2299 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1836 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1837 req->result = req->wd && SINGLEDOT (req->ptr1)
1838 ? rmdir (req->wd->str)
1839 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2300 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1840 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2301 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break; 1841 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1)
1843 ? rename (req->wd->str, req->ptr2)
1844 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2302 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break; 1845 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2303 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1846 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2304 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1847 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2305 case EIO_READLINK: ALLOC (PATH_MAX); 1848 case EIO_READLINK: ALLOC (PATH_MAX);
2306 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break; 1849 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2307 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1850 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2308 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1851 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1852 case EIO_UTIME:
1853 case EIO_FUTIME:
1854 {
1855 struct timespec ts[2];
1856 struct timespec *times;
1857
1858 if (req->nv1 != -1. || req->nv2 != -1.)
1859 {
1860 ts[0].tv_sec = req->nv1;
1861 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1862 ts[1].tv_sec = req->nv2;
1863 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1864
1865 times = ts;
1866 }
1867 else
1868 times = 0;
1869
1870 req->result = req->type == EIO_FUTIME
1871 ? futimens (req->int1, times)
1872 : utimensat (dirfd, req->ptr1, times, 0);
1873 }
1874 break;
1875
2309#else 1876#else
1877
2310 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1878 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2311 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1879 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2312 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1880 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2313 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1881 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
2314 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1882 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
2325 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1893 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2326 case EIO_READLINK: ALLOC (PATH_MAX); 1894 case EIO_READLINK: ALLOC (PATH_MAX);
2327 req->result = readlink (path, req->ptr2, PATH_MAX); break; 1895 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2328 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1896 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2329 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1897 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1898
1899 case EIO_UTIME:
1900 case EIO_FUTIME:
1901 {
1902 struct timeval tv[2];
1903 struct timeval *times;
1904
1905 if (req->nv1 != -1. || req->nv2 != -1.)
1906 {
1907 tv[0].tv_sec = req->nv1;
1908 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1909 tv[1].tv_sec = req->nv2;
1910 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
1911
1912 times = tv;
1913 }
1914 else
1915 times = 0;
1916
1917 req->result = req->type == EIO_FUTIME
1918 ? futimes (req->int1, times)
1919 : utimes (req->ptr1, times);
1920 }
1921 break;
1922
2330#endif 1923#endif
2331 1924
2332 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1))) 1925 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2333 { 1926 {
2334 ALLOC (req->result); 1927 ALLOC (req->result);
2357 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 1950 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2358 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1951 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2359 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1952 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2360 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 1953 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2361 1954
2362 case EIO_READDIR: eio__scandir (req); break; 1955 case EIO_READDIR: eio__scandir (req, self); break;
2363 1956
2364 case EIO_BUSY: 1957 case EIO_BUSY:
2365#ifdef _WIN32 1958#ifdef _WIN32
2366 Sleep (req->nv1 * 1e3); 1959 Sleep (req->nv1 * 1e3);
2367#else 1960#else
2374 req->result = select (0, 0, 0, 0, &tv); 1967 req->result = select (0, 0, 0, 0, &tv);
2375 } 1968 }
2376#endif 1969#endif
2377 break; 1970 break;
2378 1971
2379 case EIO_UTIME: 1972#if 0
2380 case EIO_FUTIME:
2381 {
2382 struct timeval tv[2];
2383 struct timeval *times;
2384
2385 if (req->nv1 != -1. || req->nv2 != -1.)
2386 {
2387 tv[0].tv_sec = req->nv1;
2388 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2389 tv[1].tv_sec = req->nv2;
2390 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2391
2392 times = tv;
2393 }
2394 else
2395 times = 0;
2396
2397 req->result = req->type == EIO_FUTIME
2398 ? futimes (req->int1, times)
2399 : utimes (req->ptr1, times);
2400 }
2401 break;
2402
2403 case EIO_GROUP: 1973 case EIO_GROUP:
2404 abort (); /* handled in eio_request */ 1974 abort (); /* handled in eio_request */
1975#endif
2405 1976
2406 case EIO_NOP: 1977 case EIO_NOP:
2407 req->result = 0; 1978 req->result = 0;
2408 break; 1979 break;
2409 1980
2410 case EIO_CUSTOM: 1981 case EIO_CUSTOM:
2411 req->feed (req); 1982 req->feed (req);
2412 break; 1983 break;
2413 1984
2414 default: 1985 default:
2415 errno = ENOSYS;
2416 req->result = -1; 1986 req->result = EIO_ENOSYS ();
2417 break; 1987 break;
2418 } 1988 }
2419 1989
2420 req->errorno = errno; 1990 req->errorno = errno;
2421} 1991}
2422 1992
2423#ifndef EIO_NO_WRAPPERS 1993#ifndef EIO_NO_WRAPPERS
2424 1994
1995eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
1996{
1997 REQ (EIO_WD_OPEN); PATH; SEND;
1998}
1999
2000eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2001{
2002 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2003}
2004
2425eio_req *eio_nop (int pri, eio_cb cb, void *data) 2005eio_req *eio_nop (int pri, eio_cb cb, void *data)
2426{ 2006{
2427 REQ (EIO_NOP); SEND; 2007 REQ (EIO_NOP); SEND;
2428} 2008}
2429 2009
2488} 2068}
2489 2069
2490eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2070eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2491{ 2071{
2492 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2072 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2073}
2074
2075eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2076{
2077 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2493} 2078}
2494 2079
2495eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2080eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2496{ 2081{
2497 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2082 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2695void 2280void
2696eio_grp_add (eio_req *grp, eio_req *req) 2281eio_grp_add (eio_req *grp, eio_req *req)
2697{ 2282{
2698 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2283 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2699 2284
2700 grp->flags |= EIO_FLAG_GROUPADD; 2285 grp->flags |= ETP_FLAG_GROUPADD;
2701 2286
2702 ++grp->size; 2287 ++grp->size;
2703 req->grp = grp; 2288 req->grp = grp;
2704 2289
2705 req->grp_prev = 0; 2290 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines