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

Comparing libeio/eio.c (file contents):
Revision 1.106 by root, Mon Sep 26 20:19:08 2011 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 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,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,
… …
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE
48# define X_STACKSIZE EIO_STACKSIZE
49#endif
50#include "xthread.h"
51
52#include <errno.h> 47#include <errno.h>
53#include <stddef.h> 48#include <stddef.h>
54#include <stdlib.h> 49#include <stdlib.h>
55#include <string.h> 50#include <string.h>
56#include <errno.h> 51#include <errno.h>
… …
58#include <sys/stat.h> 53#include <sys/stat.h>
59#include <limits.h> 54#include <limits.h>
60#include <fcntl.h> 55#include <fcntl.h>
61#include <assert.h> 56#include <assert.h>
62 57
63#if _POSIX_VERSION >= 200809L
64# define HAVE_AT 1
65#else
66# define HAVE_AT 0
67#endif
68
69/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 58/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
70/* intptr_t only comes from stdint.h, says idiot openbsd coder */ 59/* intptr_t only comes from stdint.h, says idiot openbsd coder */
71#if HAVE_STDINT_H 60#if HAVE_STDINT_H
72# include <stdint.h> 61# include <stdint.h>
73#endif 62#endif
… …
126 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 115 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
127 116
128 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
129 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
130 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
131 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
132 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
133 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
134 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
135 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
136 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
137 #define mknod(path,mode,dev) EIO_ENOSYS () 129 #define mknod(path,mode,dev) EIO_ENOSYS ()
138 #define sync() EIO_ENOSYS () 130 #define sync() EIO_ENOSYS ()
139 #define readlink(path,buf,s) EIO_ENOSYS () 131 #define readlink(path,buf,s) EIO_ENOSYS ()
140 #define statvfs(path,buf) EIO_ENOSYS () 132 #define statvfs(path,buf) EIO_ENOSYS ()
141 #define fstatvfs(fd,buf) EIO_ENOSYS () 133 #define fstatvfs(fd,buf) EIO_ENOSYS ()
134
135 #define pread(fd,buf,count,offset) eio__pread (fd, buf, count, offset)
136 #define pwrite(fd,buf,count,offset) eio__pwrite (fd, buf, count, offset)
137
138 #if __GNUC__
139 typedef long long eio_off_t; /* signed for compatibility to msvc */
140 #else
141 typedef __int64 eio_off_t; /* unsigned not supported by msvc */
142 #endif
143
144 static eio_ssize_t
145 eio__pread (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
146 {
147 OVERLAPPED o = { 0 };
148 DWORD got;
149
150 o.Offset = offset;
151 o.OffsetHigh = offset >> 32;
152
153 return ReadFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
154 ? got : -1;
155 }
156
157 static eio_ssize_t
158 eio__pwrite (int fd, void *buf, eio_ssize_t count, eio_off_t offset)
159 {
160 OVERLAPPED o = { 0 };
161 DWORD got;
162
163 o.Offset = offset;
164 o.OffsetHigh = offset >> 32;
165
166 return WriteFile ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd), buf, count, &got, &o)
167 ? got : -1;
168 }
142 169
143 /* rename() uses MoveFile, which fails to overwrite */ 170 /* rename() uses MoveFile, which fails to overwrite */
144 #define rename(old,neu) eio__rename (old, neu) 171 #define rename(old,neu) eio__rename (old, neu)
145 172
146 static int 173 static int
… …
174 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
175 static int 202 static int
176 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
177 { 204 {
178 #if WINVER >= 0x0600 205 #if WINVER >= 0x0600
206 int flags;
207
208 /* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
209 * and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
210 * with directory first.
211 */
212 for (flags = 3; flags >= 0; --flags)
179 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
180 return 0; 214 return 0;
181
182 if (CreateSymbolicLink (neu, old, 0))
183 return 0;
184 #endif 215 #endif
185 216
186 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
187 } 218 }
188 219
189 /* POSIX API only */ 220 /* POSIX API only, causing trouble for win32 apps */
190 #define CreateHardLink(neu,old,flags) 0 221 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
191 #define CreateSymbolicLink(neu,old,flags) 0 222 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
192 223
193 struct statvfs 224 struct statvfs
194 { 225 {
195 int dummy; 226 int dummy;
196 }; 227 };
… …
202 233
203#else 234#else
204 235
205 #include <sys/time.h> 236 #include <sys/time.h>
206 #include <sys/select.h> 237 #include <sys/select.h>
207 #include <sys/statvfs.h>
208 #include <unistd.h> 238 #include <unistd.h>
209 #include <signal.h> 239 #include <signal.h>
210 #include <dirent.h> 240 #include <dirent.h>
211 241
242 #ifdef ANDROID
243 #include <sys/vfs.h>
244 #define statvfs statfs
245 #define fstatvfs fstatfs
246 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
247 #else
248 #include <sys/statvfs.h>
249 #endif
250
212 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 251 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
213 #include <sys/mman.h> 252 #include <sys/mman.h>
214 #endif 253 #endif
215 254
216 #define D_NAME(entp) entp->d_name 255 #define D_NAME(entp) entp->d_name
217 256
218 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 257 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
219 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 258 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
220 #define _DIRENT_HAVE_D_TYPE /* sigh */ 259 #define _DIRENT_HAVE_D_TYPE /* sigh */
221 #define D_INO(de) (de)->d_fileno 260 #define D_INO(de) (de)->d_fileno
222 #define D_NAMLEN(de) (de)->d_namlen 261 #define D_NAMLEN(de) (de)->d_namlen
223 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 262 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
224 #define D_INO(de) (de)->d_ino 263 #define D_INO(de) (de)->d_ino
… …
243# include <utime.h> 282# include <utime.h>
244#endif 283#endif
245 284
246#if HAVE_SYS_SYSCALL_H 285#if HAVE_SYS_SYSCALL_H
247# include <sys/syscall.h> 286# include <sys/syscall.h>
248#endif
249
250#if HAVE_SYS_PRCTL_H
251# include <sys/prctl.h>
252#endif 287#endif
253 288
254#if HAVE_SENDFILE 289#if HAVE_SENDFILE
255# if __linux 290# if __linux
256# include <sys/sendfile.h> 291# include <sys/sendfile.h>
… …
281# define NAME_MAX 4096 316# define NAME_MAX 4096
282#endif 317#endif
283 318
284/* used for readlink etc. */ 319/* used for readlink etc. */
285#ifndef PATH_MAX 320#ifndef PATH_MAX
286# define PATH_MAX 4096 321# define PATH_MAX 0
287#endif 322#endif
323
324#ifndef EIO_PATH_MIN
325# define EIO_PATH_MIN 8160
326#endif
327
328#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
288 329
289/* buffer size for various temporary buffers */ 330/* buffer size for various temporary buffers */
290#define EIO_BUFSIZE 65536 331#define EIO_BUFSIZE 65536
291 332
292#define dBUF \ 333#define dBUF \
293 char *eio_buf = malloc (EIO_BUFSIZE); \ 334 char *eio_buf = malloc (EIO_BUFSIZE); \
294 errno = ENOMEM; \ 335 errno = ENOMEM; \
295 if (!eio_buf) \ 336 if (!eio_buf) \
296 return -1 337 return -1
297 338
298#define FUBd \ 339#define FUBd \
299 free (eio_buf) 340 free (eio_buf)
300 341
301#define EIO_TICKS ((1000000 + 1023) >> 10)
302
303/*****************************************************************************/ 342/*****************************************************************************/
304 343
305struct tmpbuf 344struct etp_tmpbuf;
345
346#if _POSIX_VERSION >= 200809L
347 #define HAVE_AT 1
348 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
349 #ifndef O_SEARCH
350 #define O_SEARCH O_RDONLY
351 #endif
352#else
353 #define HAVE_AT 0
354 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
355#endif
356
357struct eio_pwd
306{ 358{
307 void *ptr; 359#if HAVE_AT
360 int fd;
361#endif
308 int len; 362 int len;
363 char str[1]; /* actually, a 0-terminated canonical path */
309}; 364};
310
311static void *
312tmpbuf_get (struct tmpbuf *buf, int len)
313{
314 if (buf->len < len)
315 {
316 free (buf->ptr);
317 buf->ptr = malloc (buf->len = len);
318 }
319
320 return buf->ptr;
321}
322 365
323/*****************************************************************************/ 366/*****************************************************************************/
324 367
325#define ETP_PRI_MIN EIO_PRI_MIN 368#define ETP_PRI_MIN EIO_PRI_MIN
326#define ETP_PRI_MAX EIO_PRI_MAX 369#define ETP_PRI_MAX EIO_PRI_MAX
327 370
371#define ETP_TYPE_QUIT -1
372#define ETP_TYPE_GROUP EIO_GROUP
373
374static void eio_nop_callback (void) { }
375static void (*eio_want_poll_cb)(void) = eio_nop_callback;
376static void (*eio_done_poll_cb)(void) = eio_nop_callback;
377
378#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
379#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
380
328struct etp_worker; 381struct etp_worker;
329
330#define ETP_REQ eio_req 382#define ETP_REQ eio_req
331#define ETP_DESTROY(req) eio_destroy (req) 383#define ETP_DESTROY(req) eio_destroy (req)
332static int eio_finish (eio_req *req); 384static int eio_finish (eio_req *req);
333#define ETP_FINISH(req) eio_finish (req) 385#define ETP_FINISH(req) eio_finish (req)
334static void eio_execute (struct etp_worker *self, eio_req *req); 386static void eio_execute (struct etp_worker *self, eio_req *req);
335#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 387#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
336 388
337/*****************************************************************************/ 389#include "etp.c"
338 390
339#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 391static struct etp_pool eio_pool;
340 392#define EIO_POOL (&eio_pool)
341/* calculate time difference in ~1/EIO_TICKS of a second */
342ecb_inline int
343tvdiff (struct timeval *tv1, struct timeval *tv2)
344{
345 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
346 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
347}
348
349static unsigned int started, idle, wanted = 4;
350
351static void (*want_poll_cb) (void);
352static void (*done_poll_cb) (void);
353
354static unsigned int max_poll_time; /* reslock */
355static unsigned int max_poll_reqs; /* reslock */
356
357static unsigned int nreqs; /* reqlock */
358static unsigned int nready; /* reqlock */
359static unsigned int npending; /* reqlock */
360static unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
361static unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
362
363static xmutex_t wrklock;
364static xmutex_t reslock;
365static xmutex_t reqlock;
366static xcond_t reqwait;
367
368#if !HAVE_PREADWRITE
369/*
370 * make our pread/pwrite emulation safe against themselves, but not against
371 * normal read/write by using a mutex. slows down execution a lot,
372 * but that's your problem, not mine.
373 */
374static xmutex_t preadwritelock;
375#endif
376
377typedef struct etp_worker
378{
379 struct tmpbuf tmpbuf;
380
381 /* locked by wrklock */
382 struct etp_worker *prev, *next;
383
384 xthread_t tid;
385
386#ifdef ETP_WORKER_COMMON
387 ETP_WORKER_COMMON
388#endif
389} etp_worker;
390
391static etp_worker wrk_first; /* NOT etp */
392
393#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
394#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
395
396/* worker threads management */
397
398static void ecb_cold
399etp_worker_clear (etp_worker *wrk)
400{
401}
402
403static void ecb_cold
404etp_worker_free (etp_worker *wrk)
405{
406 free (wrk->tmpbuf.ptr);
407
408 wrk->next->prev = wrk->prev;
409 wrk->prev->next = wrk->next;
410
411 free (wrk);
412}
413
414static unsigned int
415etp_nreqs (void)
416{
417 int retval;
418 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
419 retval = nreqs;
420 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
421 return retval;
422}
423
424static unsigned int
425etp_nready (void)
426{
427 unsigned int retval;
428
429 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
430 retval = nready;
431 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
432
433 return retval;
434}
435
436static unsigned int
437etp_npending (void)
438{
439 unsigned int retval;
440
441 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
442 retval = npending;
443 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
444
445 return retval;
446}
447
448static unsigned int
449etp_nthreads (void)
450{
451 unsigned int retval;
452
453 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
454 retval = started;
455 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
456
457 return retval;
458}
459
460/*
461 * a somewhat faster data structure might be nice, but
462 * with 8 priorities this actually needs <20 insns
463 * per shift, the most expensive operation.
464 */
465typedef struct {
466 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
467 int size;
468} etp_reqq;
469
470static etp_reqq req_queue;
471static etp_reqq res_queue;
472
473static void ecb_noinline ecb_cold
474reqq_init (etp_reqq *q)
475{
476 int pri;
477
478 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
479 q->qs[pri] = q->qe[pri] = 0;
480
481 q->size = 0;
482}
483
484static int ecb_noinline
485reqq_push (etp_reqq *q, ETP_REQ *req)
486{
487 int pri = req->pri;
488 req->next = 0;
489
490 if (q->qe[pri])
491 {
492 q->qe[pri]->next = req;
493 q->qe[pri] = req;
494 }
495 else
496 q->qe[pri] = q->qs[pri] = req;
497
498 return q->size++;
499}
500
501static ETP_REQ * ecb_noinline
502reqq_shift (etp_reqq *q)
503{
504 int pri;
505
506 if (!q->size)
507 return 0;
508
509 --q->size;
510
511 for (pri = ETP_NUM_PRI; pri--; )
512 {
513 eio_req *req = q->qs[pri];
514
515 if (req)
516 {
517 if (!(q->qs[pri] = (eio_req *)req->next))
518 q->qe[pri] = 0;
519
520 return req;
521 }
522 }
523
524 abort ();
525}
526
527static int ecb_cold
528etp_init (void (*want_poll)(void), void (*done_poll)(void))
529{
530 X_MUTEX_CREATE (wrklock);
531 X_MUTEX_CREATE (reslock);
532 X_MUTEX_CREATE (reqlock);
533 X_COND_CREATE (reqwait);
534
535 reqq_init (&req_queue);
536 reqq_init (&res_queue);
537
538 wrk_first.next =
539 wrk_first.prev = &wrk_first;
540
541 started = 0;
542 idle = 0;
543 nreqs = 0;
544 nready = 0;
545 npending = 0;
546
547 want_poll_cb = want_poll;
548 done_poll_cb = done_poll;
549
550 return 0;
551}
552
553X_THREAD_PROC (etp_proc);
554
555static void ecb_cold
556etp_start_thread (void)
557{
558 etp_worker *wrk = calloc (1, sizeof (etp_worker));
559
560 /*TODO*/
561 assert (("unable to allocate worker thread data", wrk));
562
563 X_LOCK (wrklock);
564
565 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
566 {
567 wrk->prev = &wrk_first;
568 wrk->next = wrk_first.next;
569 wrk_first.next->prev = wrk;
570 wrk_first.next = wrk;
571 ++started;
572 }
573 else
574 free (wrk);
575
576 X_UNLOCK (wrklock);
577}
578
579static void
580etp_maybe_start_thread (void)
581{
582 if (ecb_expect_true (etp_nthreads () >= wanted))
583 return;
584
585 /* todo: maybe use idle here, but might be less exact */
586 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
587 return;
588
589 etp_start_thread ();
590}
591
592static void ecb_cold
593etp_end_thread (void)
594{
595 eio_req *req = calloc (1, sizeof (eio_req)); /* will be freed by worker */
596
597 req->type = -1;
598 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
599
600 X_LOCK (reqlock);
601 reqq_push (&req_queue, req);
602 X_COND_SIGNAL (reqwait);
603 X_UNLOCK (reqlock);
604
605 X_LOCK (wrklock);
606 --started;
607 X_UNLOCK (wrklock);
608}
609
610static int
611etp_poll (void)
612{
613 unsigned int maxreqs;
614 unsigned int maxtime;
615 struct timeval tv_start, tv_now;
616
617 X_LOCK (reslock);
618 maxreqs = max_poll_reqs;
619 maxtime = max_poll_time;
620 X_UNLOCK (reslock);
621
622 if (maxtime)
623 gettimeofday (&tv_start, 0);
624
625 for (;;)
626 {
627 ETP_REQ *req;
628
629 etp_maybe_start_thread ();
630
631 X_LOCK (reslock);
632 req = reqq_shift (&res_queue);
633
634 if (req)
635 {
636 --npending;
637
638 if (!res_queue.size && done_poll_cb)
639 done_poll_cb ();
640 }
641
642 X_UNLOCK (reslock);
643
644 if (!req)
645 return 0;
646
647 X_LOCK (reqlock);
648 --nreqs;
649 X_UNLOCK (reqlock);
650
651 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
652 {
653 req->int1 = 1; /* mark request as delayed */
654 continue;
655 }
656 else
657 {
658 int res = ETP_FINISH (req);
659 if (ecb_expect_false (res))
660 return res;
661 }
662
663 if (ecb_expect_false (maxreqs && !--maxreqs))
664 break;
665
666 if (maxtime)
667 {
668 gettimeofday (&tv_now, 0);
669
670 if (tvdiff (&tv_start, &tv_now) >= maxtime)
671 break;
672 }
673 }
674
675 errno = EAGAIN;
676 return -1;
677}
678
679static void
680etp_cancel (ETP_REQ *req)
681{
682 req->cancelled = 1;
683
684 eio_grp_cancel (req);
685}
686
687static void
688etp_submit (ETP_REQ *req)
689{
690 req->pri -= ETP_PRI_MIN;
691
692 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
693 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
694
695 if (ecb_expect_false (req->type == EIO_GROUP))
696 {
697 /* I hope this is worth it :/ */
698 X_LOCK (reqlock);
699 ++nreqs;
700 X_UNLOCK (reqlock);
701
702 X_LOCK (reslock);
703
704 ++npending;
705
706 if (!reqq_push (&res_queue, req) && want_poll_cb)
707 want_poll_cb ();
708
709 X_UNLOCK (reslock);
710 }
711 else
712 {
713 X_LOCK (reqlock);
714 ++nreqs;
715 ++nready;
716 reqq_push (&req_queue, req);
717 X_COND_SIGNAL (reqwait);
718 X_UNLOCK (reqlock);
719
720 etp_maybe_start_thread ();
721 }
722}
723
724static void ecb_cold
725etp_set_max_poll_time (double nseconds)
726{
727 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
728 max_poll_time = nseconds * EIO_TICKS;
729 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
730}
731
732static void ecb_cold
733etp_set_max_poll_reqs (unsigned int maxreqs)
734{
735 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
736 max_poll_reqs = maxreqs;
737 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
738}
739
740static void ecb_cold
741etp_set_max_idle (unsigned int nthreads)
742{
743 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
744 max_idle = nthreads;
745 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
746}
747
748static void ecb_cold
749etp_set_idle_timeout (unsigned int seconds)
750{
751 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
752 idle_timeout = seconds;
753 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
754}
755
756static void ecb_cold
757etp_set_min_parallel (unsigned int nthreads)
758{
759 if (wanted < nthreads)
760 wanted = nthreads;
761}
762
763static void ecb_cold
764etp_set_max_parallel (unsigned int nthreads)
765{
766 if (wanted > nthreads)
767 wanted = nthreads;
768
769 while (started > wanted)
770 etp_end_thread ();
771}
772 393
773/*****************************************************************************/ 394/*****************************************************************************/
774 395
775static void 396static void
776grp_try_feed (eio_req *grp) 397grp_try_feed (eio_req *grp)
777{ 398{
778 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 399 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
779 { 400 {
780 grp->flags &= ~EIO_FLAG_GROUPADD; 401 grp->flags &= ~ETP_FLAG_GROUPADD;
781 402
782 EIO_FEED (grp); 403 EIO_FEED (grp);
783 404
784 /* stop if no progress has been made */ 405 /* stop if no progress has been made */
785 if (!(grp->flags & EIO_FLAG_GROUPADD)) 406 if (!(grp->flags & ETP_FLAG_GROUPADD))
786 { 407 {
787 grp->feed = 0; 408 grp->feed = 0;
788 break; 409 break;
789 } 410 }
790 } 411 }
… …
797 418
798 /* call feeder, if applicable */ 419 /* call feeder, if applicable */
799 grp_try_feed (grp); 420 grp_try_feed (grp);
800 421
801 /* finish, if done */ 422 /* finish, if done */
802 if (!grp->size && grp->int1) 423 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
803 return eio_finish (grp); 424 return eio_finish (grp);
804 else 425 else
805 return 0; 426 return 0;
806} 427}
807 428
… …
843} 464}
844 465
845void 466void
846eio_grp_cancel (eio_req *grp) 467eio_grp_cancel (eio_req *grp)
847{ 468{
848 for (grp = grp->grp_first; grp; grp = grp->grp_next) 469 etp_grp_cancel (EIO_POOL, grp);
849 eio_cancel (grp);
850} 470}
851 471
852void 472void
853eio_cancel (eio_req *req) 473eio_cancel (eio_req *req)
854{ 474{
855 etp_cancel (req); 475 etp_cancel (EIO_POOL, req);
856} 476}
857 477
858void 478void
859eio_submit (eio_req *req) 479eio_submit (eio_req *req)
860{ 480{
861 etp_submit (req); 481 etp_submit (EIO_POOL, req);
862} 482}
863 483
864unsigned int 484unsigned int
865eio_nreqs (void) 485eio_nreqs (void)
866{ 486{
867 return etp_nreqs (); 487 return etp_nreqs (EIO_POOL);
868} 488}
869 489
870unsigned int 490unsigned int
871eio_nready (void) 491eio_nready (void)
872{ 492{
873 return etp_nready (); 493 return etp_nready (EIO_POOL);
874} 494}
875 495
876unsigned int 496unsigned int
877eio_npending (void) 497eio_npending (void)
878{ 498{
879 return etp_npending (); 499 return etp_npending (EIO_POOL);
880} 500}
881 501
882unsigned int ecb_cold 502unsigned int ecb_cold
883eio_nthreads (void) 503eio_nthreads (void)
884{ 504{
885 return etp_nthreads (); 505 return etp_nthreads (EIO_POOL);
886} 506}
887 507
888void ecb_cold 508void ecb_cold
889eio_set_max_poll_time (double nseconds) 509eio_set_max_poll_time (double nseconds)
890{ 510{
891 etp_set_max_poll_time (nseconds); 511 etp_set_max_poll_time (EIO_POOL, nseconds);
892} 512}
893 513
894void ecb_cold 514void ecb_cold
895eio_set_max_poll_reqs (unsigned int maxreqs) 515eio_set_max_poll_reqs (unsigned int maxreqs)
896{ 516{
897 etp_set_max_poll_reqs (maxreqs); 517 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
898} 518}
899 519
900void ecb_cold 520void ecb_cold
901eio_set_max_idle (unsigned int nthreads) 521eio_set_max_idle (unsigned int nthreads)
902{ 522{
903 etp_set_max_idle (nthreads); 523 etp_set_max_idle (EIO_POOL, nthreads);
904} 524}
905 525
906void ecb_cold 526void ecb_cold
907eio_set_idle_timeout (unsigned int seconds) 527eio_set_idle_timeout (unsigned int seconds)
908{ 528{
909 etp_set_idle_timeout (seconds); 529 etp_set_idle_timeout (EIO_POOL, seconds);
910} 530}
911 531
912void ecb_cold 532void ecb_cold
913eio_set_min_parallel (unsigned int nthreads) 533eio_set_min_parallel (unsigned int nthreads)
914{ 534{
915 etp_set_min_parallel (nthreads); 535 etp_set_min_parallel (EIO_POOL, nthreads);
916} 536}
917 537
918void ecb_cold 538void ecb_cold
919eio_set_max_parallel (unsigned int nthreads) 539eio_set_max_parallel (unsigned int nthreads)
920{ 540{
921 etp_set_max_parallel (nthreads); 541 etp_set_max_parallel (EIO_POOL, nthreads);
922} 542}
923 543
924int eio_poll (void) 544int eio_poll (void)
925{ 545{
926 return etp_poll (); 546 return etp_poll (EIO_POOL);
927} 547}
928 548
929/*****************************************************************************/ 549/*****************************************************************************/
930/* work around various missing functions */ 550/* work around various missing functions */
931
932#if !HAVE_PREADWRITE
933# undef pread
934# undef pwrite
935# define pread eio__pread
936# define pwrite eio__pwrite
937
938static eio_ssize_t
939eio__pread (int fd, void *buf, size_t count, off_t offset)
940{
941 eio_ssize_t res;
942 off_t ooffset;
943
944 X_LOCK (preadwritelock);
945 ooffset = lseek (fd, 0, SEEK_CUR);
946 lseek (fd, offset, SEEK_SET);
947 res = read (fd, buf, count);
948 lseek (fd, ooffset, SEEK_SET);
949 X_UNLOCK (preadwritelock);
950
951 return res;
952}
953
954static eio_ssize_t
955eio__pwrite (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 = write (fd, buf, count);
964 lseek (fd, ooffset, SEEK_SET);
965 X_UNLOCK (preadwritelock);
966
967 return res;
968}
969#endif
970 551
971#ifndef HAVE_UTIMES 552#ifndef HAVE_UTIMES
972 553
973# undef utimes 554# undef utimes
974# define utimes(path,times) eio__utimes (path, times) 555# define utimes(path,times) eio__utimes (path, times)
… …
1016 int res; 597 int res;
1017 598
1018#if HAVE_SYS_SYNCFS 599#if HAVE_SYS_SYNCFS
1019 res = (int)syscall (__NR_syncfs, (int)(fd)); 600 res = (int)syscall (__NR_syncfs, (int)(fd));
1020#else 601#else
1021 res = -1; 602 res = EIO_ENOSYS ();
1022 errno = ENOSYS;
1023#endif 603#endif
1024 604
1025 if (res < 0 && errno == ENOSYS && fd >= 0) 605 if (res < 0 && errno == ENOSYS && fd >= 0)
1026 sync (); 606 sync ();
1027 607
… …
1057} 637}
1058 638
1059static int 639static int
1060eio__fallocate (int fd, int mode, off_t offset, size_t len) 640eio__fallocate (int fd, int mode, off_t offset, size_t len)
1061{ 641{
1062#if HAVE_FALLOCATE 642#if HAVE_LINUX_FALLOCATE
1063 return fallocate (fd, mode, offset, len); 643 return fallocate (fd, mode, offset, len);
1064#else 644#else
1065 errno = ENOSYS; 645 return EIO_ENOSYS ();
1066 return -1;
1067#endif 646#endif
1068} 647}
1069 648
1070#if !HAVE_READAHEAD 649#if !HAVE_READAHEAD
1071# undef readahead 650# undef readahead
… …
1086 todo -= len; 665 todo -= len;
1087 } 666 }
1088 667
1089 FUBd; 668 FUBd;
1090 669
1091 errno = 0; 670 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
671 /* but not for e.g. EIO or eof, so we also never fail */
1092 return count; 672 return 0;
1093} 673}
1094 674
1095#endif 675#endif
1096 676
1097/* sendfile always needs emulation */ 677/* sendfile always needs emulation */
… …
1132 712
1133 /* according to source inspection, this is correct, and useful behaviour */ 713 /* according to source inspection, this is correct, and useful behaviour */
1134 if (sbytes) 714 if (sbytes)
1135 res = sbytes; 715 res = sbytes;
1136 716
1137# elif defined (__APPLE__) 717# elif defined __APPLE__
1138 off_t sbytes = count; 718 off_t sbytes = count;
1139 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 719 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1140 720
1141 /* according to the manpage, sbytes is always valid */ 721 /* according to the manpage, sbytes is always valid */
1142 if (sbytes) 722 if (sbytes)
… …
1169 HANDLE h = TO_SOCKET (ifd); 749 HANDLE h = TO_SOCKET (ifd);
1170 SetFilePointer (h, offset, 0, FILE_BEGIN); 750 SetFilePointer (h, offset, 0, FILE_BEGIN);
1171 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 751 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1172 752
1173#else 753#else
1174 res = -1; 754 res = EIO_ENOSYS ();
1175 errno = ENOSYS;
1176#endif 755#endif
1177 756
1178 /* we assume sendfile can copy at least 128mb in one go */ 757 /* we assume sendfile can copy at least 128mb in one go */
1179 if (res <= 128 * 1024 * 1024) 758 if (res <= 128 * 1024 * 1024)
1180 { 759 {
… …
1366} 945}
1367 946
1368/*****************************************************************************/ 947/*****************************************************************************/
1369/* requests implemented outside eio_execute, because they are so large */ 948/* requests implemented outside eio_execute, because they are so large */
1370 949
1371/* copies some absolute path to tmpbuf */ 950static void
1372static char * 951eio__lseek (eio_req *req)
1373eio__getwd (struct tmpbuf *tmpbuf, eio_wd wd)
1374{ 952{
1375 if (wd == EIO_CWD) 953 /* this usually gets optimised away completely, or your compiler sucks, */
1376 return getcwd (tmpbuf->ptr, PATH_MAX); 954 /* or the whence constants really are not 0, 1, 2 */
955 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
956 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
957 : req->int2 == EIO_SEEK_END ? SEEK_END
958 : req->int2;
1377 959
1378#if HAVE_AT 960 req->offs = lseek (req->int1, req->offs, whence);
1379 abort (); /*TODO*/ 961 req->result = req->offs == (off_t)-1 ? -1 : 0;
1380#else
1381 strcpy (tmpbuf->ptr, wd);
1382#endif
1383 return tmpbuf->ptr;
1384} 962}
1385 963
1386/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 964/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
1387static int 965static int
1388eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 966eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1389{ 967{
968 char *res;
1390 const char *rel = path; 969 const char *rel = path;
1391 char *res;
1392 char *tmp1, *tmp2; 970 char *tmp1, *tmp2;
1393#if SYMLOOP_MAX > 32 971#if SYMLOOP_MAX > 32
1394 int symlinks = SYMLOOP_MAX; 972 int symlinks = SYMLOOP_MAX;
1395#else 973#else
1396 int symlinks = 32; 974 int symlinks = 32;
1397#endif 975#endif
1398 976
1399 /*D*/ /*TODO: wd ignored */
1400
1401 errno = EINVAL; 977 errno = EINVAL;
1402 if (!rel) 978 if (!rel)
1403 return -1; 979 return -1;
1404 980
1405 errno = ENOENT; 981 errno = ENOENT;
1406 if (!*rel) 982 if (!*rel)
1407 return -1; 983 return -1;
1408 984
1409 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 985 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
986#ifdef _WIN32
987 if (_access (rel, 4) != 0)
988 return -1;
989
990 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
991
992 errno = ENAMETOOLONG;
993 if (symlinks >= EIO_PATH_MAX * 3)
994 return -1;
995
996 errno = EIO;
997 if (symlinks <= 0)
998 return -1;
999
1000 return symlinks;
1001
1002#else
1410 tmp1 = res + PATH_MAX; 1003 tmp1 = res + EIO_PATH_MAX;
1411 tmp2 = tmp1 + PATH_MAX; 1004 tmp2 = tmp1 + EIO_PATH_MAX;
1412 1005
1413#if 0 /* disabled, the musl way to do things is just too racy */ 1006#if 0 /* disabled, the musl way to do things is just too racy */
1414#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1007#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1415 /* on linux we may be able to ask the kernel */ 1008 /* on linux we may be able to ask the kernel */
1416 { 1009 {
1417 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1010 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1418 1011
1419 if (fd >= 0) 1012 if (fd >= 0)
1420 { 1013 {
1421 sprintf (tmp1, "/proc/self/fd/%d", fd); 1014 sprintf (tmp1, "/proc/self/fd/%d", fd);
1422 req->result = readlink (tmp1, res, PATH_MAX); 1015 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1016 /* here we should probably stat the open file and the disk file, to make sure they still match */
1423 close (fd); 1017 close (fd);
1424
1425 /* here we should probably stat the open file and the disk file, to make sure they still match */
1426 1018
1427 if (req->result > 0) 1019 if (req->result > 0)
1428 goto done; 1020 goto done;
1429 } 1021 }
1430 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1022 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1431 return; 1023 return -1;
1432 } 1024 }
1433#endif 1025#endif
1434#endif 1026#endif
1435 1027
1436 if (*rel != '/') 1028 if (*rel != '/')
1437 { 1029 {
1438 if (!eio__getwd (tmpbuf, wd)) 1030 int len;
1031
1032 errno = ENOENT;
1033 if (wd == EIO_INVALID_WD)
1439 return -1; 1034 return -1;
1035
1036 if (wd == EIO_CWD)
1037 {
1038 if (!getcwd (res, EIO_PATH_MAX))
1039 return -1;
1040
1041 len = strlen (res);
1042 }
1043 else
1044 memcpy (res, wd->str, len = wd->len);
1440 1045
1441 if (res [1]) /* only use if not / */ 1046 if (res [1]) /* only use if not / */
1442 res += strlen (res); 1047 res += len;
1443 } 1048 }
1444 1049
1445 while (*rel) 1050 while (*rel)
1446 { 1051 {
1447 eio_ssize_t len, linklen; 1052 eio_ssize_t len, linklen;
… …
1475 } 1080 }
1476 } 1081 }
1477 1082
1478 errno = ENAMETOOLONG; 1083 errno = ENAMETOOLONG;
1479 if (res + 1 + len + 1 >= tmp1) 1084 if (res + 1 + len + 1 >= tmp1)
1480 return; 1085 return -1;
1481 1086
1482 /* copy one component */ 1087 /* copy one component */
1483 *res = '/'; 1088 *res = '/';
1484 memcpy (res + 1, beg, len); 1089 memcpy (res + 1, beg, len);
1485 1090
1486 /* zero-terminate, for readlink */ 1091 /* zero-terminate, for readlink */
1487 res [len + 1] = 0; 1092 res [len + 1] = 0;
1488 1093
1489 /* now check if it's a symlink */ 1094 /* now check if it's a symlink */
1490 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1095 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1491 1096
1492 if (linklen < 0) 1097 if (linklen < 0)
1493 { 1098 {
1494 if (errno != EINVAL) 1099 if (errno != EINVAL)
1495 return -1; 1100 return -1;
… …
1501 { 1106 {
1502 /* yay, it was a symlink - build new path in tmp2 */ 1107 /* yay, it was a symlink - build new path in tmp2 */
1503 int rellen = strlen (rel); 1108 int rellen = strlen (rel);
1504 1109
1505 errno = ENAMETOOLONG; 1110 errno = ENAMETOOLONG;
1506 if (linklen + 1 + rellen >= PATH_MAX) 1111 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1507 return -1; 1112 return -1;
1508 1113
1509 errno = ELOOP; 1114 errno = ELOOP;
1510 if (!--symlinks) 1115 if (!--symlinks)
1511 return -1; 1116 return -1;
… …
1525 /* special case for the lone root path */ 1130 /* special case for the lone root path */
1526 if (res == tmpbuf->ptr) 1131 if (res == tmpbuf->ptr)
1527 *res++ = '/'; 1132 *res++ = '/';
1528 1133
1529 return res - (char *)tmpbuf->ptr; 1134 return res - (char *)tmpbuf->ptr;
1135#endif
1530} 1136}
1531 1137
1532static signed char 1138static signed char
1533eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1139eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1534{ 1140{
… …
1694 eio_dent_insertion_sort (dents, size); 1300 eio_dent_insertion_sort (dents, size);
1695} 1301}
1696 1302
1697/* read a full directory */ 1303/* read a full directory */
1698static void 1304static void
1699eio__scandir (eio_req *req) 1305eio__scandir (eio_req *req, etp_worker *self)
1700{ 1306{
1701 char *name, *names; 1307 char *name, *names;
1702 int namesalloc = 4096 - sizeof (void *) * 4; 1308 int namesalloc = 4096 - sizeof (void *) * 4;
1703 int namesoffs = 0; 1309 int namesoffs = 0;
1704 int flags = req->int1; 1310 int flags = req->int1;
… …
1722#ifdef _WIN32 1328#ifdef _WIN32
1723 { 1329 {
1724 int len = strlen ((const char *)req->ptr1); 1330 int len = strlen ((const char *)req->ptr1);
1725 char *path = malloc (MAX_PATH); 1331 char *path = malloc (MAX_PATH);
1726 const char *fmt; 1332 const char *fmt;
1333 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1727 1334
1728 if (!len) 1335 if (!len)
1729 fmt = "./*"; 1336 fmt = "./*";
1730 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1337 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1731 fmt = "%s*"; 1338 fmt = "%s*";
1732 else 1339 else
1733 fmt = "%s/*"; 1340 fmt = "%s/*";
1734 1341
1735 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1342 _snprintf (path, MAX_PATH, fmt, reqpath);
1736 dirp = FindFirstFile (path, &entp); 1343 dirp = FindFirstFile (path, &entp);
1737 free (path); 1344 free (path);
1738 1345
1739 if (dirp == INVALID_HANDLE_VALUE) 1346 if (dirp == INVALID_HANDLE_VALUE)
1740 { 1347 {
… …
1762 1369
1763 return; 1370 return;
1764 } 1371 }
1765 } 1372 }
1766#else 1373#else
1374 #if HAVE_AT
1375 if (req->wd)
1376 {
1377 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1378
1379 if (fd < 0)
1380 return;
1381
1382 dirp = fdopendir (fd);
1383
1384 if (!dirp)
1385 close (fd);
1386 }
1387 else
1767 dirp = opendir (req->ptr1); 1388 dirp = opendir (req->ptr1);
1389 #else
1390 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1391 #endif
1768 1392
1769 if (!dirp) 1393 if (!dirp)
1770 return; 1394 return;
1771#endif 1395#endif
1772 1396
… …
1889 #ifdef DT_FIFO 1513 #ifdef DT_FIFO
1890 case DT_FIFO: ent->type = EIO_DT_FIFO; break; 1514 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1891 #endif 1515 #endif
1892 #ifdef DT_CHR 1516 #ifdef DT_CHR
1893 case DT_CHR: ent->type = EIO_DT_CHR; break; 1517 case DT_CHR: ent->type = EIO_DT_CHR; break;
1894 #endif 1518 #endif
1895 #ifdef DT_MPC 1519 #ifdef DT_MPC
1896 case DT_MPC: ent->type = EIO_DT_MPC; break; 1520 case DT_MPC: ent->type = EIO_DT_MPC; break;
1897 #endif 1521 #endif
1898 #ifdef DT_DIR 1522 #ifdef DT_DIR
1899 case DT_DIR: ent->type = EIO_DT_DIR; break; 1523 case DT_DIR: ent->type = EIO_DT_DIR; break;
1900 #endif 1524 #endif
1901 #ifdef DT_NAM 1525 #ifdef DT_NAM
1902 case DT_NAM: ent->type = EIO_DT_NAM; break; 1526 case DT_NAM: ent->type = EIO_DT_NAM; break;
1903 #endif 1527 #endif
1904 #ifdef DT_BLK 1528 #ifdef DT_BLK
1905 case DT_BLK: ent->type = EIO_DT_BLK; break; 1529 case DT_BLK: ent->type = EIO_DT_BLK; break;
1906 #endif 1530 #endif
1907 #ifdef DT_MPB 1531 #ifdef DT_MPB
1908 case DT_MPB: ent->type = EIO_DT_MPB; break; 1532 case DT_MPB: ent->type = EIO_DT_MPB; break;
1909 #endif 1533 #endif
1910 #ifdef DT_REG 1534 #ifdef DT_REG
1911 case DT_REG: ent->type = EIO_DT_REG; break; 1535 case DT_REG: ent->type = EIO_DT_REG; break;
1912 #endif 1536 #endif
1913 #ifdef DT_NWK 1537 #ifdef DT_NWK
1914 case DT_NWK: ent->type = EIO_DT_NWK; break; 1538 case DT_NWK: ent->type = EIO_DT_NWK; break;
1915 #endif 1539 #endif
1916 #ifdef DT_CMP 1540 #ifdef DT_CMP
1917 case DT_CMP: ent->type = EIO_DT_CMP; break; 1541 case DT_CMP: ent->type = EIO_DT_CMP; break;
1918 #endif 1542 #endif
1919 #ifdef DT_LNK 1543 #ifdef DT_LNK
1920 case DT_LNK: ent->type = EIO_DT_LNK; break; 1544 case DT_LNK: ent->type = EIO_DT_LNK; break;
1921 #endif 1545 #endif
1922 #ifdef DT_SOCK 1546 #ifdef DT_SOCK
1923 case DT_SOCK: ent->type = EIO_DT_SOCK; break; 1547 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
… …
1936 { 1560 {
1937 if (ent->type == EIO_DT_UNKNOWN) 1561 if (ent->type == EIO_DT_UNKNOWN)
1938 { 1562 {
1939 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1563 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1940 ent->score = 1; 1564 ent->score = 1;
1941 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1565 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1942 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */ 1566 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1943 } 1567 }
1944 else if (ent->type == EIO_DT_DIR) 1568 else if (ent->type == EIO_DT_DIR)
1945 ent->score = 0; 1569 ent->score = 0;
1946 } 1570 }
… …
1966 } 1590 }
1967} 1591}
1968 1592
1969/*****************************************************************************/ 1593/*****************************************************************************/
1970/* working directory stuff */ 1594/* working directory stuff */
1595/* various deficiencies in the posix 2008 api force us to */
1596/* keep the absolute path in string form at all times */
1597/* fuck yeah. */
1598
1599#if !HAVE_AT
1600
1601/* a bit like realpath, but usually faster because it doesn'T have to return */
1602/* an absolute or canonical path */
1603static const char *
1604wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1605{
1606 if (!wd || *path == '/')
1607 return path;
1608
1609 if (path [0] == '.' && !path [1])
1610 return wd->str;
1611
1612 {
1613 int l1 = wd->len;
1614 int l2 = strlen (path);
1615
1616 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1617
1618 memcpy (res, wd->str, l1);
1619 res [l1] = '/';
1620 memcpy (res + l1 + 1, path, l2 + 1);
1621
1622 return res;
1623 }
1624}
1625
1626#endif
1627
1628static eio_wd
1629eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1630{
1631 int fd;
1632 eio_wd res;
1633 int len = eio__realpath (tmpbuf, wd, path);
1634
1635 if (len < 0)
1636 return EIO_INVALID_WD;
1971 1637
1972#if HAVE_AT 1638#if HAVE_AT
1639 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1973 1640
1974#define WD2FD(wd) ((wd) ? ((int)(long)(wd)) - 1 : AT_FDCWD) 1641 if (fd < 0)
1975 1642 return EIO_INVALID_WD;
1976#ifndef O_SEARCH
1977# define O_SEARCH O_RDONLY
1978#endif 1643#endif
1644
1645 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1646
1647#if HAVE_AT
1648 res->fd = fd;
1649#endif
1650
1651 res->len = len;
1652 memcpy (res->str, tmpbuf->ptr, len);
1653 res->str [len] = 0;
1654
1655 return res;
1656}
1979 1657
1980eio_wd 1658eio_wd
1981eio_wd_open_sync (eio_wd wd, const char *path) 1659eio_wd_open_sync (eio_wd wd, const char *path)
1982{ 1660{
1983 int fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1661 struct etp_tmpbuf tmpbuf = { };
1984
1985 return fd >= 0 ? (eio_wd)(long)(fd + 1) : EIO_INVALID_WD;
1986}
1987
1988static eio_wd
1989eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
1990{
1991 return eio_wd_open_sync (wd, path); 1662 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1663 free (tmpbuf.ptr);
1664
1665 return wd;
1992} 1666}
1993 1667
1994void 1668void
1995eio_wd_close_sync (eio_wd wd) 1669eio_wd_close_sync (eio_wd wd)
1996{ 1670{
1997 int fd = WD2FD (wd); 1671 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1998 1672 {
1999 if (fd >= 0) 1673 #if HAVE_AT
2000 close (fd); 1674 close (wd->fd);
1675 #endif
1676 free (wd);
1677 }
2001} 1678}
1679
1680#if HAVE_AT
1681
1682/* they forgot these */
2002 1683
2003static int 1684static int
2004eio__truncateat (int dirfd, const char *path, off_t length) 1685eio__truncateat (int dirfd, const char *path, off_t length)
2005{ 1686{
2006 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1687 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
… …
2027 close (fd); 1708 close (fd);
2028 return res; 1709 return res;
2029 1710
2030} 1711}
2031 1712
2032#else
2033
2034/* on legacy systems, we represent the working directories simply by their path strings */
2035
2036static const char *
2037wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2038{
2039 if (!wd || *path == '/')
2040 return path;
2041
2042 {
2043 int l1 = strlen ((const char *)wd);
2044 int l2 = strlen (path);
2045
2046 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2);
2047
2048 memcpy (res, wd, l1);
2049 res [l1] = '/';
2050 memcpy (res + l1 + 1, path, l2 + 1);
2051
2052 return res;
2053 }
2054}
2055
2056static eio_wd
2057eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path)
2058{
2059 if (*path == '/') /* absolute paths ignore wd */
2060 path = strdup (path);
2061 else if (path [0] == '.' && !path [1]) /* special case '.', as it is common */
2062 return wd;
2063 else
2064 {
2065 int len = eio__realpath (tmpbuf, wd, path);
2066
2067 path = EIO_INVALID_WD;
2068
2069 if (len >= 0)
2070 {
2071 ((char *)tmpbuf->ptr)[len] = 0;
2072 path = strdup (tmpbuf->ptr);
2073 }
2074 }
2075
2076 if (!path)
2077 path = EIO_INVALID_WD;
2078
2079 return (eio_wd)path;
2080}
2081
2082eio_wd
2083eio_wd_open_sync (eio_wd wd, const char *path)
2084{
2085 struct tmpbuf tmpbuf = { 0 };
2086 wd = eio__wd_open_sync (&tmpbuf, wd, path);
2087 free (tmpbuf.ptr);
2088
2089 return wd;
2090}
2091
2092void
2093eio_wd_close_sync (eio_wd wd)
2094{
2095 if (wd != EIO_INVALID_WD)
2096 free (wd);
2097}
2098
2099#endif 1713#endif
2100 1714
2101/*****************************************************************************/ 1715/*****************************************************************************/
2102 1716
2103#define ALLOC(len) \ 1717#define ALLOC(len) \
2104 if (!req->ptr2) \ 1718 if (!req->ptr2) \
2105 { \ 1719 { \
2106 X_LOCK (wrklock); \ 1720 X_LOCK (EIO_POOL->wrklock); \
2107 req->flags |= EIO_FLAG_PTR2_FREE; \ 1721 req->flags |= EIO_FLAG_PTR2_FREE; \
2108 X_UNLOCK (wrklock); \ 1722 X_UNLOCK (EIO_POOL->wrklock); \
2109 req->ptr2 = malloc (len); \ 1723 req->ptr2 = malloc (len); \
2110 if (!req->ptr2) \ 1724 if (!req->ptr2) \
2111 { \ 1725 { \
2112 errno = ENOMEM; \ 1726 errno = ENOMEM; \
2113 req->result = -1; \ 1727 req->result = -1; \
2114 break; \ 1728 break; \
2115 } \ 1729 } \
2116 } 1730 }
2117 1731
2118X_THREAD_PROC (etp_proc)
2119{
2120 ETP_REQ *req;
2121 struct timespec ts;
2122 etp_worker *self = (etp_worker *)thr_arg;
2123
2124#if HAVE_PRCTL_SET_NAME
2125 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0);
2126#endif
2127
2128 /* try to distribute timeouts somewhat evenly */
2129 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
2130
2131 for (;;)
2132 {
2133 ts.tv_sec = 0;
2134
2135 X_LOCK (reqlock);
2136
2137 for (;;)
2138 {
2139 req = reqq_shift (&req_queue);
2140
2141 if (req)
2142 break;
2143
2144 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
2145 {
2146 X_UNLOCK (reqlock);
2147 X_LOCK (wrklock);
2148 --started;
2149 X_UNLOCK (wrklock);
2150 goto quit;
2151 }
2152
2153 ++idle;
2154
2155 if (idle <= max_idle)
2156 /* we are allowed to idle, so do so without any timeout */
2157 X_COND_WAIT (reqwait, reqlock);
2158 else
2159 {
2160 /* initialise timeout once */
2161 if (!ts.tv_sec)
2162 ts.tv_sec = time (0) + idle_timeout;
2163
2164 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
2165 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
2166 }
2167
2168 --idle;
2169 }
2170
2171 --nready;
2172
2173 X_UNLOCK (reqlock);
2174
2175 if (req->type < 0)
2176 goto quit;
2177
2178 ETP_EXECUTE (self, req);
2179
2180 X_LOCK (reslock);
2181
2182 ++npending;
2183
2184 if (!reqq_push (&res_queue, req) && want_poll_cb)
2185 want_poll_cb ();
2186
2187 etp_worker_clear (self);
2188
2189 X_UNLOCK (reslock);
2190 }
2191
2192quit:
2193 free (req);
2194
2195 X_LOCK (wrklock);
2196 etp_worker_free (self);
2197 X_UNLOCK (wrklock);
2198
2199 return 0;
2200}
2201
2202/*****************************************************************************/ 1732/*****************************************************************************/
2203 1733
2204int ecb_cold 1734int ecb_cold
2205eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1735eio_init (void (*want_poll)(void), void (*done_poll)(void))
2206{ 1736{
2207#if !HAVE_PREADWRITE 1737 eio_want_poll_cb = want_poll;
2208 X_MUTEX_CREATE (preadwritelock); 1738 eio_done_poll_cb = done_poll;
2209#endif
2210 1739
2211 return etp_init (want_poll, done_poll); 1740 return etp_init (EIO_POOL, 0, 0, 0);
2212} 1741}
2213 1742
2214ecb_inline void 1743ecb_inline void
2215eio_api_destroy (eio_req *req) 1744eio_api_destroy (eio_req *req)
2216{ 1745{
2217 free (req); 1746 free (req);
2218} 1747}
2219 1748
2220#define REQ(rtype) \ 1749#define REQ(rtype) \
2221 eio_req *req; \ 1750 eio_req *req; \
2222 \ 1751 \
2223 req = (eio_req *)calloc (1, sizeof *req); \ 1752 req = (eio_req *)calloc (1, sizeof *req); \
2224 if (!req) \ 1753 if (!req) \
2225 return 0; \ 1754 return 0; \
… …
2239 { \ 1768 { \
2240 eio_api_destroy (req); \ 1769 eio_api_destroy (req); \
2241 return 0; \ 1770 return 0; \
2242 } 1771 }
2243 1772
1773#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1774
2244static void 1775static void
2245eio_execute (etp_worker *self, eio_req *req) 1776eio_execute (etp_worker *self, eio_req *req)
2246{ 1777{
2247#if HAVE_AT 1778#if HAVE_AT
2248 int dirfd; 1779 int dirfd;
… …
2279 req->result = req->wd == EIO_INVALID_WD ? -1 : 0; 1810 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
2280 break; 1811 break;
2281 case EIO_WD_CLOSE: req->result = 0; 1812 case EIO_WD_CLOSE: req->result = 0;
2282 eio_wd_close_sync (req->wd); break; 1813 eio_wd_close_sync (req->wd); break;
2283 1814
1815 case EIO_SEEK: eio__lseek (req); break;
2284 case EIO_READ: ALLOC (req->size); 1816 case EIO_READ: ALLOC (req->size);
2285 req->result = req->offs >= 0 1817 req->result = req->offs >= 0
2286 ? pread (req->int1, req->ptr2, req->size, req->offs) 1818 ? pread (req->int1, req->ptr2, req->size, req->offs)
2287 : read (req->int1, req->ptr2, req->size); break; 1819 : read (req->int1, req->ptr2, req->size); break;
2288 case EIO_WRITE: req->result = req->offs >= 0 1820 case EIO_WRITE: req->result = req->offs >= 0
2289 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1821 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2290 : write (req->int1, req->ptr2, req->size); break; 1822 : write (req->int1, req->ptr2, req->size); break;
1823
1824 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1825 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
2291 1826
2292 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1827 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2293 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1828 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2294 1829
2295#if HAVE_AT 1830#if HAVE_AT
… …
2302 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1837 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
2303 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1838 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
2304 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1839 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
2305 1840
2306 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1841 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
2307 case EIO_RMDIR: req->result = unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1842 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1843 req->result = req->wd && SINGLEDOT (req->ptr1)
1844 ? rmdir (req->wd->str)
1845 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
2308 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1846 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
2309 case EIO_RENAME: req->result = renameat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2); break; 1847 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */
1848 req->result = req->wd && SINGLEDOT (req->ptr1)
1849 ? rename (req->wd->str, req->ptr2)
1850 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
2310 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD (req->int3), req->ptr2, 0); break; 1851 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
2311 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1852 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
2312 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1853 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2313 case EIO_READLINK: ALLOC (PATH_MAX);
2314 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
2315 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1854 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2316 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1855 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1856 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1857 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1858 if (req->result == EIO_PATH_MAX)
1859 {
1860 req->result = -1;
1861 errno = ENAMETOOLONG;
1862 }
1863 break;
2317 case EIO_UTIME: 1864 case EIO_UTIME:
2318 case EIO_FUTIME: 1865 case EIO_FUTIME:
2319 { 1866 {
2320 struct timespec ts[2]; 1867 struct timespec ts[2];
2321 struct timespec *times; 1868 struct timespec *times;
… …
2354 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1901 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
2355 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1902 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
2356 case EIO_LINK: req->result = link (path , req->ptr2); break; 1903 case EIO_LINK: req->result = link (path , req->ptr2); break;
2357 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
2358 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1905 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
2359 case EIO_READLINK: ALLOC (PATH_MAX);
2360 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2361 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1906 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2362 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1907 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1908 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1909 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1910 if (req->result == EIO_PATH_MAX)
1911 {
1912 req->result = -1;
1913 errno = ENAMETOOLONG;
1914 }
1915 break;
2363 1916
2364 case EIO_UTIME: 1917 case EIO_UTIME:
2365 case EIO_FUTIME: 1918 case EIO_FUTIME:
2366 { 1919 {
2367 struct timeval tv[2]; 1920 struct timeval tv[2];
… …
2415 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 1968 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
2416 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 1969 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
2417 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 1970 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
2418 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break; 1971 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
2419 1972
2420 case EIO_READDIR: eio__scandir (req); break; 1973 case EIO_READDIR: eio__scandir (req, self); break;
2421 1974
2422 case EIO_BUSY: 1975 case EIO_BUSY:
2423#ifdef _WIN32 1976#ifdef _WIN32
2424 Sleep (req->nv1 * 1e3); 1977 Sleep (req->nv1 * 1e3);
2425#else 1978#else
… …
2432 req->result = select (0, 0, 0, 0, &tv); 1985 req->result = select (0, 0, 0, 0, &tv);
2433 } 1986 }
2434#endif 1987#endif
2435 break; 1988 break;
2436 1989
1990#if 0
2437 case EIO_GROUP: 1991 case EIO_GROUP:
2438 abort (); /* handled in eio_request */ 1992 abort (); /* handled in eio_request */
1993#endif
2439 1994
2440 case EIO_NOP: 1995 case EIO_NOP:
2441 req->result = 0; 1996 req->result = 0;
2442 break; 1997 break;
2443 1998
2444 case EIO_CUSTOM: 1999 case EIO_CUSTOM:
2445 req->feed (req); 2000 req->feed (req);
2446 break; 2001 break;
2447 2002
2448 default: 2003 default:
2449 errno = ENOSYS;
2450 req->result = -1; 2004 req->result = EIO_ENOSYS ();
2451 break; 2005 break;
2452 } 2006 }
2453 2007
2454 req->errorno = errno; 2008 req->errorno = errno;
2455} 2009}
2456 2010
2457#ifndef EIO_NO_WRAPPERS 2011#ifndef EIO_NO_WRAPPERS
2458 2012
2013eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2014{
2015 REQ (EIO_WD_OPEN); PATH; SEND;
2016}
2017
2018eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2019{
2020 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2021}
2022
2459eio_req *eio_nop (int pri, eio_cb cb, void *data) 2023eio_req *eio_nop (int pri, eio_cb cb, void *data)
2460{ 2024{
2461 REQ (EIO_NOP); SEND; 2025 REQ (EIO_NOP); SEND;
2462} 2026}
2463 2027
… …
2524eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2088eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2525{ 2089{
2526 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2090 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2527} 2091}
2528 2092
2093eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2094{
2095 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2096}
2097
2529eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2098eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2530{ 2099{
2531 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2100 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2532} 2101}
2533 2102
2534eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2103eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2535{ 2104{
2536 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2105 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2106}
2107
2108eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2109{
2110 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2111}
2112
2113eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2114{
2115 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2537} 2116}
2538 2117
2539eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2118eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2540{ 2119{
2541 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2120 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2729void 2308void
2730eio_grp_add (eio_req *grp, eio_req *req) 2309eio_grp_add (eio_req *grp, eio_req *req)
2731{ 2310{
2732 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2311 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2733 2312
2734 grp->flags |= EIO_FLAG_GROUPADD; 2313 grp->flags |= ETP_FLAG_GROUPADD;
2735 2314
2736 ++grp->size; 2315 ++grp->size;
2737 req->grp = grp; 2316 req->grp = grp;
2738 2317
2739 req->grp_prev = 0; 2318 req->grp_prev = 0;

Diff Legend

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