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

Comparing libeio/eio.c (file contents):
Revision 1.99 by root, Tue Jul 26 11:07:08 2011 UTC vs.
Revision 1.153 by root, Fri Aug 17 17:17:07 2018 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,2017 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 XTHREAD_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>
105#ifdef _WIN32 100#ifdef _WIN32
106 101
107 #undef PAGESIZE 102 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */ 103 #define PAGESIZE 4096 /* GetSystemInfo? */
109 104
105 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
106
110 #ifdef EIO_STRUCT_STATI64 107 #ifdef EIO_STRUCT_STATI64
108 /* look at perl's non-sloppy stat */
111 #define stat(path,buf) _stati64 (path,buf) 109 #define stat(path,buf) _stati64 (path,buf)
112 #define fstat(fd,buf) _fstati64 (fd,buf) 110 #define fstat(fd,buf) _fstati64 (fd,buf)
113 #endif 111 #endif
114 #define lstat(path,buf) stat (path,buf) 112 #define lstat(path,buf) stat (path,buf)
115 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1)) 113 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
117 #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))
118 116
119 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
120 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
121 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
122 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
123 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
124 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
125 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
126 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
127 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
128 #define mknod(path,mode,dev) EIO_ENOSYS () 129 #define mknod(path,mode,dev) EIO_ENOSYS ()
129 #define sync() EIO_ENOSYS () 130 #define sync() EIO_ENOSYS ()
130 #define readlink(path,buf,s) EIO_ENOSYS () 131 #define readlink(path,buf,s) EIO_ENOSYS ()
131 #define statvfs(path,buf) EIO_ENOSYS () 132 #define statvfs(path,buf) EIO_ENOSYS ()
132 #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 }
133 169
134 /* rename() uses MoveFile, which fails to overwrite */ 170 /* rename() uses MoveFile, which fails to overwrite */
135 #define rename(old,neu) eio__rename (old, neu) 171 #define rename(old,neu) eio__rename (old, neu)
136 172
137 static int 173 static int
165 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
166 static int 202 static int
167 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
168 { 204 {
169 #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)
170 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
171 return 0; 214 return 0;
172
173 if (CreateSymbolicLink (neu, old, 0))
174 return 0;
175 #endif 215 #endif
176 216
177 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
178 } 218 }
179 219
180 /* POSIX API only */ 220 /* POSIX API only, causing trouble for win32 apps */
181 #define CreateHardLink(neu,old,flags) 0 221 #define CreateHardLink(neu,old,flags) 0 /* not really creating hardlink, still using relative paths? */
182 #define CreateSymbolicLink(neu,old,flags) 0 222 #define CreateSymbolicLink(neu,old,flags) 0 /* vista+ only */
183 223
184 struct statvfs 224 struct statvfs
185 { 225 {
186 int dummy; 226 int dummy;
187 }; 227 };
191 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
192 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG) 232 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
193 233
194#else 234#else
195 235
236 #include <sys/ioctl.h>
196 #include <sys/time.h> 237 #include <sys/time.h>
197 #include <sys/select.h> 238 #include <sys/select.h>
198 #include <sys/statvfs.h>
199 #include <unistd.h> 239 #include <unistd.h>
200 #include <signal.h> 240 #include <signal.h>
201 #include <dirent.h> 241 #include <dirent.h>
202 242
243 #ifdef ANDROID
244 #include <sys/vfs.h>
245 #define statvfs statfs
246 #define fstatvfs fstatfs
247 #include <asm/page.h> /* supposedly limits.h does #define PAGESIZE PAGESIZE */
248 #else
249 #include <sys/statvfs.h>
250 #endif
251
203 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 252 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
204 #include <sys/mman.h> 253 #include <sys/mman.h>
205 #endif 254 #endif
206 255
207 #define D_NAME(entp) entp->d_name 256 #define D_NAME(entp) entp->d_name
208 257
209 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 258 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
210 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 259 #if __FreeBSD__ || __NetBSD__ || __OpenBSD__
211 #define _DIRENT_HAVE_D_TYPE /* sigh */ 260 #define _DIRENT_HAVE_D_TYPE /* sigh */
212 #define D_INO(de) (de)->d_fileno 261 #define D_INO(de) (de)->d_fileno
213 #define D_NAMLEN(de) (de)->d_namlen 262 #define D_NAMLEN(de) (de)->d_namlen
214 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 263 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
215 #define D_INO(de) (de)->d_ino 264 #define D_INO(de) (de)->d_ino
234# include <utime.h> 283# include <utime.h>
235#endif 284#endif
236 285
237#if HAVE_SYS_SYSCALL_H 286#if HAVE_SYS_SYSCALL_H
238# include <sys/syscall.h> 287# include <sys/syscall.h>
239#endif
240
241#if HAVE_SYS_PRCTL_H
242# include <sys/prctl.h>
243#endif 288#endif
244 289
245#if HAVE_SENDFILE 290#if HAVE_SENDFILE
246# if __linux 291# if __linux
247# include <sys/sendfile.h> 292# include <sys/sendfile.h>
255# else 300# else
256# error sendfile support requested but not available 301# error sendfile support requested but not available
257# endif 302# endif
258#endif 303#endif
259 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
260#ifndef D_TYPE 310#ifndef D_TYPE
261# define D_TYPE(de) 0 311# define D_TYPE(de) 0
262#endif 312#endif
263#ifndef D_INO 313#ifndef D_INO
264# define D_INO(de) 0 314# define D_INO(de) 0
272# define NAME_MAX 4096 322# define NAME_MAX 4096
273#endif 323#endif
274 324
275/* used for readlink etc. */ 325/* used for readlink etc. */
276#ifndef PATH_MAX 326#ifndef PATH_MAX
277# define PATH_MAX 4096 327# define PATH_MAX 0
278#endif 328#endif
329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
334#ifndef EIO_PATH_MIN
335# define EIO_PATH_MIN 8160
336#endif
337
338#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
279 339
280/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
281#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
282 342
283#define dBUF \ 343#define dBUF \
284 char *eio_buf = malloc (EIO_BUFSIZE); \ 344 char *eio_buf = malloc (EIO_BUFSIZE); \
285 errno = ENOMEM; \ 345 errno = ENOMEM; \
286 if (!eio_buf) \ 346 if (!eio_buf) \
287 return -1 347 return -1
288 348
289#define FUBd \ 349#define FUBd \
290 free (eio_buf) 350 free (eio_buf)
291 351
292#define EIO_TICKS ((1000000 + 1023) >> 10) 352/*****************************************************************************/
353
354struct etp_tmpbuf;
355
356#if _POSIX_VERSION >= 200809L
357 #define HAVE_AT 1
358 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
359 #ifndef O_SEARCH
360 #define O_SEARCH O_RDONLY
361 #endif
362#else
363 #define HAVE_AT 0
364 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
365#endif
366
367struct eio_pwd
368{
369#if HAVE_AT
370 int fd;
371#endif
372 int len;
373 char str[1]; /* actually, a 0-terminated canonical path */
374};
375
376/*****************************************************************************/
293 377
294#define ETP_PRI_MIN EIO_PRI_MIN 378#define ETP_PRI_MIN EIO_PRI_MIN
295#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
296 380
381#define ETP_TYPE_QUIT -1
382#define ETP_TYPE_GROUP EIO_GROUP
383
384static void eio_nop_callback (void) { }
385static void (*eio_want_poll_cb)(void) = eio_nop_callback;
386static void (*eio_done_poll_cb)(void) = eio_nop_callback;
387
388#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
389#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
390
297struct etp_worker; 391struct etp_worker;
298
299#define ETP_REQ eio_req 392#define ETP_REQ eio_req
300#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
301static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
302#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
303static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
304#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
305 398
306/*****************************************************************************/ 399#include "etp.c"
307 400
308#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 401static struct etp_pool eio_pool;
309 402#define EIO_POOL (&eio_pool)
310/* calculate time difference in ~1/EIO_TICKS of a second */
311ecb_inline int
312tvdiff (struct timeval *tv1, struct timeval *tv2)
313{
314 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
315 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
316}
317
318static unsigned int started, idle, wanted = 4;
319
320static void (*want_poll_cb) (void);
321static void (*done_poll_cb) (void);
322
323static unsigned int max_poll_time; /* reslock */
324static unsigned int max_poll_reqs; /* reslock */
325
326static volatile unsigned int nreqs; /* reqlock */
327static volatile unsigned int nready; /* reqlock */
328static volatile unsigned int npending; /* reqlock */
329static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
330static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
331
332static xmutex_t wrklock;
333static xmutex_t reslock;
334static xmutex_t reqlock;
335static xcond_t reqwait;
336
337#if !HAVE_PREADWRITE
338/*
339 * make our pread/pwrite emulation safe against themselves, but not against
340 * normal read/write by using a mutex. slows down execution a lot,
341 * but that's your problem, not mine.
342 */
343static xmutex_t preadwritelock;
344#endif
345
346typedef struct etp_worker
347{
348 /* locked by wrklock */
349 struct etp_worker *prev, *next;
350
351 xthread_t tid;
352
353 /* locked by reslock, reqlock or wrklock */
354 ETP_REQ *req; /* currently processed request */
355
356#ifdef ETP_WORKER_COMMON
357 ETP_WORKER_COMMON
358#endif
359} etp_worker;
360
361static etp_worker wrk_first; /* NOT etp */
362
363#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
364#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
365
366/* worker threads management */
367
368static void ecb_cold
369etp_worker_clear (etp_worker *wrk)
370{
371}
372
373static void ecb_cold
374etp_worker_free (etp_worker *wrk)
375{
376 wrk->next->prev = wrk->prev;
377 wrk->prev->next = wrk->next;
378
379 free (wrk);
380}
381
382static unsigned int
383etp_nreqs (void)
384{
385 int retval;
386 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
387 retval = nreqs;
388 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
389 return retval;
390}
391
392static unsigned int
393etp_nready (void)
394{
395 unsigned int retval;
396
397 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
398 retval = nready;
399 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
400
401 return retval;
402}
403
404static unsigned int
405etp_npending (void)
406{
407 unsigned int retval;
408
409 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
410 retval = npending;
411 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
412
413 return retval;
414}
415
416static unsigned int
417etp_nthreads (void)
418{
419 unsigned int retval;
420
421 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
422 retval = started;
423 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
424
425 return retval;
426}
427
428/*
429 * a somewhat faster data structure might be nice, but
430 * with 8 priorities this actually needs <20 insns
431 * per shift, the most expensive operation.
432 */
433typedef struct {
434 ETP_REQ *qs[ETP_NUM_PRI], *qe[ETP_NUM_PRI]; /* qstart, qend */
435 int size;
436} etp_reqq;
437
438static etp_reqq req_queue;
439static etp_reqq res_queue;
440
441static void ecb_noinline ecb_cold
442reqq_init (etp_reqq *q)
443{
444 int pri;
445
446 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
447 q->qs[pri] = q->qe[pri] = 0;
448
449 q->size = 0;
450}
451
452static int ecb_noinline
453reqq_push (etp_reqq *q, ETP_REQ *req)
454{
455 int pri = req->pri;
456 req->next = 0;
457
458 if (q->qe[pri])
459 {
460 q->qe[pri]->next = req;
461 q->qe[pri] = req;
462 }
463 else
464 q->qe[pri] = q->qs[pri] = req;
465
466 return q->size++;
467}
468
469static ETP_REQ * ecb_noinline
470reqq_shift (etp_reqq *q)
471{
472 int pri;
473
474 if (!q->size)
475 return 0;
476
477 --q->size;
478
479 for (pri = ETP_NUM_PRI; pri--; )
480 {
481 eio_req *req = q->qs[pri];
482
483 if (req)
484 {
485 if (!(q->qs[pri] = (eio_req *)req->next))
486 q->qe[pri] = 0;
487
488 return req;
489 }
490 }
491
492 abort ();
493}
494
495static int ecb_cold
496etp_init (void (*want_poll)(void), void (*done_poll)(void))
497{
498 X_MUTEX_CREATE (wrklock);
499 X_MUTEX_CREATE (reslock);
500 X_MUTEX_CREATE (reqlock);
501 X_COND_CREATE (reqwait);
502
503 reqq_init (&req_queue);
504 reqq_init (&res_queue);
505
506 wrk_first.next =
507 wrk_first.prev = &wrk_first;
508
509 started = 0;
510 idle = 0;
511 nreqs = 0;
512 nready = 0;
513 npending = 0;
514
515 want_poll_cb = want_poll;
516 done_poll_cb = done_poll;
517
518 return 0;
519}
520
521X_THREAD_PROC (etp_proc);
522
523static void ecb_cold
524etp_start_thread (void)
525{
526 etp_worker *wrk = calloc (1, sizeof (etp_worker));
527
528 /*TODO*/
529 assert (("unable to allocate worker thread data", wrk));
530
531 X_LOCK (wrklock);
532
533 if (thread_create (&wrk->tid, etp_proc, (void *)wrk))
534 {
535 wrk->prev = &wrk_first;
536 wrk->next = wrk_first.next;
537 wrk_first.next->prev = wrk;
538 wrk_first.next = wrk;
539 ++started;
540 }
541 else
542 free (wrk);
543
544 X_UNLOCK (wrklock);
545}
546
547static void
548etp_maybe_start_thread (void)
549{
550 if (ecb_expect_true (etp_nthreads () >= wanted))
551 return;
552
553 /* todo: maybe use idle here, but might be less exact */
554 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
555 return;
556
557 etp_start_thread ();
558}
559
560static void ecb_cold
561etp_end_thread (void)
562{
563 eio_req *req = calloc (1, sizeof (eio_req));
564
565 req->type = -1;
566 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
567
568 X_LOCK (reqlock);
569 reqq_push (&req_queue, req);
570 X_COND_SIGNAL (reqwait);
571 X_UNLOCK (reqlock);
572
573 X_LOCK (wrklock);
574 --started;
575 X_UNLOCK (wrklock);
576}
577
578static int
579etp_poll (void)
580{
581 unsigned int maxreqs;
582 unsigned int maxtime;
583 struct timeval tv_start, tv_now;
584
585 X_LOCK (reslock);
586 maxreqs = max_poll_reqs;
587 maxtime = max_poll_time;
588 X_UNLOCK (reslock);
589
590 if (maxtime)
591 gettimeofday (&tv_start, 0);
592
593 for (;;)
594 {
595 ETP_REQ *req;
596
597 etp_maybe_start_thread ();
598
599 X_LOCK (reslock);
600 req = reqq_shift (&res_queue);
601
602 if (req)
603 {
604 --npending;
605
606 if (!res_queue.size && done_poll_cb)
607 done_poll_cb ();
608 }
609
610 X_UNLOCK (reslock);
611
612 if (!req)
613 return 0;
614
615 X_LOCK (reqlock);
616 --nreqs;
617 X_UNLOCK (reqlock);
618
619 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
620 {
621 req->int1 = 1; /* mark request as delayed */
622 continue;
623 }
624 else
625 {
626 int res = ETP_FINISH (req);
627 if (ecb_expect_false (res))
628 return res;
629 }
630
631 if (ecb_expect_false (maxreqs && !--maxreqs))
632 break;
633
634 if (maxtime)
635 {
636 gettimeofday (&tv_now, 0);
637
638 if (tvdiff (&tv_start, &tv_now) >= maxtime)
639 break;
640 }
641 }
642
643 errno = EAGAIN;
644 return -1;
645}
646
647static void
648etp_cancel (ETP_REQ *req)
649{
650 req->cancelled = 1;
651
652 eio_grp_cancel (req);
653}
654
655static void
656etp_submit (ETP_REQ *req)
657{
658 req->pri -= ETP_PRI_MIN;
659
660 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
661 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
662
663 if (ecb_expect_false (req->type == EIO_GROUP))
664 {
665 /* I hope this is worth it :/ */
666 X_LOCK (reqlock);
667 ++nreqs;
668 X_UNLOCK (reqlock);
669
670 X_LOCK (reslock);
671
672 ++npending;
673
674 if (!reqq_push (&res_queue, req) && want_poll_cb)
675 want_poll_cb ();
676
677 X_UNLOCK (reslock);
678 }
679 else
680 {
681 X_LOCK (reqlock);
682 ++nreqs;
683 ++nready;
684 reqq_push (&req_queue, req);
685 X_COND_SIGNAL (reqwait);
686 X_UNLOCK (reqlock);
687
688 etp_maybe_start_thread ();
689 }
690}
691
692static void ecb_cold
693etp_set_max_poll_time (double nseconds)
694{
695 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
696 max_poll_time = nseconds * EIO_TICKS;
697 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
698}
699
700static void ecb_cold
701etp_set_max_poll_reqs (unsigned int maxreqs)
702{
703 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
704 max_poll_reqs = maxreqs;
705 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
706}
707
708static void ecb_cold
709etp_set_max_idle (unsigned int nthreads)
710{
711 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
712 max_idle = nthreads;
713 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
714}
715
716static void ecb_cold
717etp_set_idle_timeout (unsigned int seconds)
718{
719 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
720 idle_timeout = seconds;
721 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
722}
723
724static void ecb_cold
725etp_set_min_parallel (unsigned int nthreads)
726{
727 if (wanted < nthreads)
728 wanted = nthreads;
729}
730
731static void ecb_cold
732etp_set_max_parallel (unsigned int nthreads)
733{
734 if (wanted > nthreads)
735 wanted = nthreads;
736
737 while (started > wanted)
738 etp_end_thread ();
739}
740 403
741/*****************************************************************************/ 404/*****************************************************************************/
742 405
743static void 406static void
744grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
745{ 408{
746 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
747 { 410 {
748 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
749 412
750 EIO_FEED (grp); 413 EIO_FEED (grp);
751 414
752 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
753 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
754 { 417 {
755 grp->feed = 0; 418 grp->feed = 0;
756 break; 419 break;
757 } 420 }
758 } 421 }
765 428
766 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
767 grp_try_feed (grp); 430 grp_try_feed (grp);
768 431
769 /* finish, if done */ 432 /* finish, if done */
770 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
771 return eio_finish (grp); 434 return eio_finish (grp);
772 else 435 else
773 return 0; 436 return 0;
774} 437}
775 438
811} 474}
812 475
813void 476void
814eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
815{ 478{
816 for (grp = grp->grp_first; grp; grp = grp->grp_next) 479 etp_grp_cancel (EIO_POOL, grp);
817 eio_cancel (grp);
818} 480}
819 481
820void 482void
821eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
822{ 484{
823 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
824} 486}
825 487
826void 488void
827eio_submit (eio_req *req) 489eio_submit (eio_req *req)
828{ 490{
829 etp_submit (req); 491 etp_submit (EIO_POOL, req);
830} 492}
831 493
832unsigned int 494unsigned int
833eio_nreqs (void) 495eio_nreqs (void)
834{ 496{
835 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
836} 498}
837 499
838unsigned int 500unsigned int
839eio_nready (void) 501eio_nready (void)
840{ 502{
841 return etp_nready (); 503 return etp_nready (EIO_POOL);
842} 504}
843 505
844unsigned int 506unsigned int
845eio_npending (void) 507eio_npending (void)
846{ 508{
847 return etp_npending (); 509 return etp_npending (EIO_POOL);
848} 510}
849 511
850unsigned int ecb_cold 512unsigned int ecb_cold
851eio_nthreads (void) 513eio_nthreads (void)
852{ 514{
853 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
854} 516}
855 517
856void ecb_cold 518void ecb_cold
857eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
858{ 520{
859 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
860} 522}
861 523
862void ecb_cold 524void ecb_cold
863eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
864{ 526{
865 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
866} 528}
867 529
868void ecb_cold 530void ecb_cold
869eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
870{ 532{
871 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
872} 534}
873 535
874void ecb_cold 536void ecb_cold
875eio_set_idle_timeout (unsigned int seconds) 537eio_set_idle_timeout (unsigned int seconds)
876{ 538{
877 etp_set_idle_timeout (seconds); 539 etp_set_idle_timeout (EIO_POOL, seconds);
878} 540}
879 541
880void ecb_cold 542void ecb_cold
881eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
882{ 544{
883 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
884} 546}
885 547
886void ecb_cold 548void ecb_cold
887eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
888{ 550{
889 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
890} 552}
891 553
892int eio_poll (void) 554int eio_poll (void)
893{ 555{
894 return etp_poll (); 556 return etp_poll (EIO_POOL);
895} 557}
896 558
897/*****************************************************************************/ 559/*****************************************************************************/
898/* work around various missing functions */ 560/* work around various missing functions */
899 561
900#if !HAVE_PREADWRITE 562#if HAVE_POSIX_CLOSE && !__linux
901# undef pread 563# define eio__close(fd) posix_close (fd, 0)
902# undef pwrite 564#else
903# define pread eio__pread 565# define eio__close(fd) close (fd)
904# define pwrite eio__pwrite
905
906static eio_ssize_t
907eio__pread (int fd, void *buf, size_t count, off_t offset)
908{
909 eio_ssize_t res;
910 off_t ooffset;
911
912 X_LOCK (preadwritelock);
913 ooffset = lseek (fd, 0, SEEK_CUR);
914 lseek (fd, offset, SEEK_SET);
915 res = read (fd, buf, count);
916 lseek (fd, ooffset, SEEK_SET);
917 X_UNLOCK (preadwritelock);
918
919 return res;
920}
921
922static eio_ssize_t
923eio__pwrite (int fd, void *buf, size_t count, off_t offset)
924{
925 eio_ssize_t res;
926 off_t ooffset;
927
928 X_LOCK (preadwritelock);
929 ooffset = lseek (fd, 0, SEEK_CUR);
930 lseek (fd, offset, SEEK_SET);
931 res = write (fd, buf, count);
932 lseek (fd, ooffset, SEEK_SET);
933 X_UNLOCK (preadwritelock);
934
935 return res;
936}
937#endif 566#endif
567
568/* close() without disturbing errno */
569static void
570silent_close (int fd)
571{
572 int saved_errno = errno;
573 eio__close (fd);
574 errno = saved_errno;
575}
938 576
939#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
940 578
941# undef utimes 579# undef utimes
942# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
984 int res; 622 int res;
985 623
986#if HAVE_SYS_SYNCFS 624#if HAVE_SYS_SYNCFS
987 res = (int)syscall (__NR_syncfs, (int)(fd)); 625 res = (int)syscall (__NR_syncfs, (int)(fd));
988#else 626#else
989 res = -1; 627 res = EIO_ENOSYS ();
990 errno = ENOSYS;
991#endif 628#endif
992 629
993 if (res < 0 && errno == ENOSYS && fd >= 0) 630 if (res < 0 && errno == ENOSYS && fd >= 0)
994 sync (); 631 sync ();
995 632
1025} 662}
1026 663
1027static int 664static int
1028eio__fallocate (int fd, int mode, off_t offset, size_t len) 665eio__fallocate (int fd, int mode, off_t offset, size_t len)
1029{ 666{
1030#if HAVE_FALLOCATE 667#if HAVE_LINUX_FALLOCATE
1031 return fallocate (fd, mode, offset, len); 668 return fallocate (fd, mode, offset, len);
1032#else 669#else
1033 errno = ENOSYS; 670 return EIO_ENOSYS ();
1034 return -1;
1035#endif 671#endif
1036} 672}
1037 673
1038#if !HAVE_READAHEAD 674#if !HAVE_READAHEAD
1039# undef readahead 675# undef readahead
1054 todo -= len; 690 todo -= len;
1055 } 691 }
1056 692
1057 FUBd; 693 FUBd;
1058 694
1059 errno = 0; 695 /* linux's readahead basically only fails for EBADF or EINVAL (not mmappable) */
696 /* but not for e.g. EIO or eof, so we also never fail */
1060 return count; 697 return 0;
1061} 698}
1062 699
1063#endif 700#endif
1064 701
1065/* sendfile always needs emulation */ 702/* sendfile always needs emulation */
1100 737
1101 /* according to source inspection, this is correct, and useful behaviour */ 738 /* according to source inspection, this is correct, and useful behaviour */
1102 if (sbytes) 739 if (sbytes)
1103 res = sbytes; 740 res = sbytes;
1104 741
1105# elif defined (__APPLE__) 742# elif defined __APPLE__
1106 off_t sbytes = count; 743 off_t sbytes = count;
1107 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0); 744 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
1108 745
1109 /* according to the manpage, sbytes is always valid */ 746 /* according to the manpage, sbytes is always valid */
1110 if (sbytes) 747 if (sbytes)
1137 HANDLE h = TO_SOCKET (ifd); 774 HANDLE h = TO_SOCKET (ifd);
1138 SetFilePointer (h, offset, 0, FILE_BEGIN); 775 SetFilePointer (h, offset, 0, FILE_BEGIN);
1139 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0); 776 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
1140 777
1141#else 778#else
1142 res = -1; 779 res = EIO_ENOSYS ();
1143 errno = ENOSYS;
1144#endif 780#endif
1145 781
1146 /* we assume sendfile can copy at least 128mb in one go */ 782 /* we assume sendfile can copy at least 128mb in one go */
1147 if (res <= 128 * 1024 * 1024) 783 if (res <= 128 * 1024 * 1024)
1148 { 784 {
1323 intptr_t end = addr + len; 959 intptr_t end = addr + len;
1324 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
1325 961
1326 if (addr < end) 962 if (addr < end)
1327 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
1328 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req)); 964 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < end && !EIO_CANCELLED (req));
1329 else 965 else
1330 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req)); 966 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < end && !EIO_CANCELLED (req));
1331 } 967 }
1332 968
1333 return 0; 969 return 0;
1334} 970}
1335 971
1336/*****************************************************************************/ 972/*****************************************************************************/
1337/* requests implemented outside eio_execute, because they are so large */ 973/* requests implemented outside eio_execute, because they are so large */
1338 974
1339static void 975static void
1340eio__realpath (eio_req *req, etp_worker *self) 976eio__lseek (eio_req *req)
1341{ 977{
1342 char *rel = req->ptr1; 978 /* this usually gets optimised away completely, or your compiler sucks, */
979 /* or the whence constants really are not 0, 1, 2 */
980 int whence = req->int2 == EIO_SEEK_SET ? SEEK_SET
981 : req->int2 == EIO_SEEK_CUR ? SEEK_CUR
982 : req->int2 == EIO_SEEK_END ? SEEK_END
983 : req->int2;
984
985 req->offs = lseek (req->int1, req->offs, whence);
986 req->result = req->offs == (off_t)-1 ? -1 : 0;
987}
988
989/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
990static int
991eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
992{
1343 char *res; 993 char *res;
994 const char *rel = path;
1344 char *tmp1, *tmp2; 995 char *tmp1, *tmp2;
1345#if SYMLOOP_MAX > 32 996#if SYMLOOP_MAX > 32
1346 int symlinks = SYMLOOP_MAX; 997 int symlinks = SYMLOOP_MAX;
1347#else 998#else
1348 int symlinks = 32; 999 int symlinks = 32;
1349#endif 1000#endif
1350 1001
1351 req->result = -1;
1352
1353 errno = EINVAL; 1002 errno = EINVAL;
1354 if (!rel) 1003 if (!rel)
1355 return; 1004 return -1;
1356 1005
1357 errno = ENOENT; 1006 errno = ENOENT;
1358 if (!*rel) 1007 if (!*rel)
1359 return; 1008 return -1;
1360 1009
1361 if (!req->ptr2) 1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
1362 { 1011#ifdef _WIN32
1363 X_LOCK (wrklock); 1012 if (_access (rel, 4) != 0)
1364 req->flags |= EIO_FLAG_PTR2_FREE;
1365 X_UNLOCK (wrklock);
1366 req->ptr2 = malloc (PATH_MAX * 3);
1367
1368 errno = ENOMEM;
1369 if (!req->ptr2)
1370 return; 1013 return -1;
1371 }
1372 1014
1373 res = req->ptr2; 1015 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
1016
1017 errno = ENAMETOOLONG;
1018 if (symlinks >= EIO_PATH_MAX * 3)
1019 return -1;
1020
1021 errno = EIO;
1022 if (symlinks <= 0)
1023 return -1;
1024
1025 return symlinks;
1026
1027#else
1374 tmp1 = res + PATH_MAX; 1028 tmp1 = res + EIO_PATH_MAX;
1375 tmp2 = tmp1 + PATH_MAX; 1029 tmp2 = tmp1 + EIO_PATH_MAX;
1376 1030
1377#if 0 /* disabled, the musl way to do things is just too racy */ 1031#if 0 /* disabled, the musl way to do things is just too racy */
1378#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1379 /* on linux we may be able to ask the kernel */ 1033 /* on linux we may be able to ask the kernel */
1380 { 1034 {
1381 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1035 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1382 1036
1383 if (fd >= 0) 1037 if (fd >= 0)
1384 { 1038 {
1385 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1386 req->result = readlink (tmp1, res, PATH_MAX); 1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1387 close (fd);
1388
1389 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1041 /* here we should probably stat the open file and the disk file, to make sure they still match */
1042 eio__close (fd);
1390 1043
1391 if (req->result > 0) 1044 if (req->result > 0)
1392 goto done; 1045 goto done;
1393 } 1046 }
1394 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1047 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1395 return; 1048 return -1;
1396 } 1049 }
1397#endif 1050#endif
1398#endif 1051#endif
1399 1052
1400 if (*rel != '/') 1053 if (*rel != '/')
1401 { 1054 {
1402 if (!getcwd (res, PATH_MAX)) 1055 int len;
1056
1057 errno = ENOENT;
1058 if (wd == EIO_INVALID_WD)
1403 return; 1059 return -1;
1060
1061 if (wd == EIO_CWD)
1062 {
1063 if (!getcwd (res, EIO_PATH_MAX))
1064 return -1;
1065
1066 len = strlen (res);
1067 }
1068 else
1069 memcpy (res, wd->str, len = wd->len);
1404 1070
1405 if (res [1]) /* only use if not / */ 1071 if (res [1]) /* only use if not / */
1406 res += strlen (res); 1072 res += len;
1407 } 1073 }
1408 1074
1409 while (*rel) 1075 while (*rel)
1410 { 1076 {
1411 eio_ssize_t len, linklen; 1077 eio_ssize_t len, linklen;
1412 char *beg = rel; 1078 const char *beg = rel;
1413 1079
1414 while (*rel && *rel != '/') 1080 while (*rel && *rel != '/')
1415 ++rel; 1081 ++rel;
1416 1082
1417 len = rel - beg; 1083 len = rel - beg;
1429 1095
1430 if (beg [1] == '.' && len == 2) 1096 if (beg [1] == '.' && len == 2)
1431 { 1097 {
1432 /* .. - back up one component, if possible */ 1098 /* .. - back up one component, if possible */
1433 1099
1434 while (res != req->ptr2) 1100 while (res != tmpbuf->ptr)
1435 if (*--res == '/') 1101 if (*--res == '/')
1436 break; 1102 break;
1437 1103
1438 continue; 1104 continue;
1439 } 1105 }
1440 } 1106 }
1441 1107
1442 errno = ENAMETOOLONG; 1108 errno = ENAMETOOLONG;
1443 if (res + 1 + len + 1 >= tmp1) 1109 if (res + 1 + len + 1 >= tmp1)
1444 return; 1110 return -1;
1445 1111
1446 /* copy one component */ 1112 /* copy one component */
1447 *res = '/'; 1113 *res = '/';
1448 memcpy (res + 1, beg, len); 1114 memcpy (res + 1, beg, len);
1449 1115
1450 /* zero-terminate, for readlink */ 1116 /* zero-terminate, for readlink */
1451 res [len + 1] = 0; 1117 res [len + 1] = 0;
1452 1118
1453 /* now check if it's a symlink */ 1119 /* now check if it's a symlink */
1454 linklen = readlink (req->ptr2, tmp1, PATH_MAX); 1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1455 1121
1456 if (linklen < 0) 1122 if (linklen < 0)
1457 { 1123 {
1458 if (errno != EINVAL) 1124 if (errno != EINVAL)
1459 return; 1125 return -1;
1460 1126
1461 /* it's a normal directory. hopefully */ 1127 /* it's a normal directory. hopefully */
1462 res += len + 1; 1128 res += len + 1;
1463 } 1129 }
1464 else 1130 else
1465 { 1131 {
1466 /* yay, it was a symlink - build new path in tmp2 */ 1132 /* yay, it was a symlink - build new path in tmp2 */
1467 int rellen = strlen (rel); 1133 int rellen = strlen (rel);
1468 1134
1469 errno = ENAMETOOLONG; 1135 errno = ENAMETOOLONG;
1470 if (linklen + 1 + rellen >= PATH_MAX) 1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1471 return; 1137 return -1;
1472 1138
1473 errno = ELOOP; 1139 errno = ELOOP;
1474 if (!--symlinks) 1140 if (!--symlinks)
1475 return; 1141 return -1;
1476 1142
1477 if (*tmp1 == '/') 1143 if (*tmp1 == '/')
1478 res = req->ptr2; /* symlink resolves to an absolute path */ 1144 res = tmpbuf->ptr; /* symlink resolves to an absolute path */
1479 1145
1480 /* we need to be careful, as rel might point into tmp2 already */ 1146 /* we need to be careful, as rel might point into tmp2 already */
1481 memmove (tmp2 + linklen + 1, rel, rellen + 1); 1147 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1482 tmp2 [linklen] = '/'; 1148 tmp2 [linklen] = '/';
1483 memcpy (tmp2, tmp1, linklen); 1149 memcpy (tmp2, tmp1, linklen);
1485 rel = tmp2; 1151 rel = tmp2;
1486 } 1152 }
1487 } 1153 }
1488 1154
1489 /* special case for the lone root path */ 1155 /* special case for the lone root path */
1490 if (res == req->ptr2) 1156 if (res == tmpbuf->ptr)
1491 *res++ = '/'; 1157 *res++ = '/';
1492 1158
1493 req->result = res - (char *)req->ptr2; 1159 return res - (char *)tmpbuf->ptr;
1494 1160#endif
1495done:
1496 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1497} 1161}
1498 1162
1499static signed char 1163static signed char
1500eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1164eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1501{ 1165{
1689#ifdef _WIN32 1353#ifdef _WIN32
1690 { 1354 {
1691 int len = strlen ((const char *)req->ptr1); 1355 int len = strlen ((const char *)req->ptr1);
1692 char *path = malloc (MAX_PATH); 1356 char *path = malloc (MAX_PATH);
1693 const char *fmt; 1357 const char *fmt;
1358 const char *reqpath = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1694 1359
1695 if (!len) 1360 if (!len)
1696 fmt = "./*"; 1361 fmt = "./*";
1697 else if (((const char *)req->ptr1)[len - 1] == '/' || ((const char *)req->ptr1)[len - 1] == '\\') 1362 else if (reqpath[len - 1] == '/' || reqpath[len - 1] == '\\')
1698 fmt = "%s*"; 1363 fmt = "%s*";
1699 else 1364 else
1700 fmt = "%s/*"; 1365 fmt = "%s/*";
1701 1366
1702 _snprintf (path, MAX_PATH, fmt, (const char *)req->ptr1); 1367 _snprintf (path, MAX_PATH, fmt, reqpath);
1703 dirp = FindFirstFile (path, &entp); 1368 dirp = FindFirstFile (path, &entp);
1704 free (path); 1369 free (path);
1705 1370
1706 if (dirp == INVALID_HANDLE_VALUE) 1371 if (dirp == INVALID_HANDLE_VALUE)
1707 { 1372 {
1708 dirp = 0;
1709
1710 /* should steal _dosmaperr */ 1373 /* should steal _dosmaperr */
1711 switch (GetLastError ()) 1374 switch (GetLastError ())
1712 { 1375 {
1713 case ERROR_FILE_NOT_FOUND: 1376 case ERROR_FILE_NOT_FOUND:
1714 req->result = 0; 1377 req->result = 0;
1715 break; 1378 break;
1716 1379
1717 case ERROR_INVALID_NAME: 1380 case ERROR_INVALID_NAME:
1718 case ERROR_PATH_NOT_FOUND: 1381 case ERROR_PATH_NOT_FOUND:
1719 case ERROR_NO_MORE_FILES: 1382 case ERROR_NO_MORE_FILES:
1720 errno = ENOENT; 1383 errno = ENOENT;
1721 break; 1384 break;
1722 1385
1723 case ERROR_NOT_ENOUGH_MEMORY: 1386 case ERROR_NOT_ENOUGH_MEMORY:
1724 errno = ENOMEM; 1387 errno = ENOMEM;
1725 break; 1388 break;
1726 1389
1727 default: 1390 default:
1728 errno = EINVAL; 1391 errno = EINVAL;
1729 break; 1392 break;
1730 } 1393 }
1394
1395 return;
1731 } 1396 }
1732 } 1397 }
1733#else 1398#else
1734 dirp = opendir (req->ptr1); 1399 #if HAVE_AT
1400 {
1401 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1402
1403 if (fd < 0)
1404 return;
1405
1406 dirp = fdopendir (fd);
1407
1408 if (!dirp)
1409 {
1410 silent_close (fd);
1411 return;
1412 }
1413 }
1414 #else
1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1416
1417 if (!dirp)
1418 return;
1419 #endif
1735#endif 1420#endif
1736 1421
1737 if (req->flags & EIO_FLAG_PTR1_FREE) 1422 if (req->flags & EIO_FLAG_PTR1_FREE)
1738 free (req->ptr1); 1423 free (req->ptr1);
1739 1424
1740 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1425 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1741 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1426 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1742 req->ptr2 = names = malloc (namesalloc); 1427 req->ptr2 = names = malloc (namesalloc);
1743 1428
1744 if (dirp && names && (!flags || dents)) 1429 if (!names || (flags && !dents))
1430 return;
1431
1745 for (;;) 1432 for (;;)
1746 { 1433 {
1747 int done; 1434 int done;
1748 1435
1749#ifdef _WIN32 1436#ifdef _WIN32
1750 done = !dirp; 1437 done = !dirp;
1751#else 1438#else
1752 errno = 0; 1439 errno = 0;
1753 entp = readdir (dirp); 1440 entp = readdir (dirp);
1754 done = !entp; 1441 done = !entp;
1755#endif 1442#endif
1756 1443
1757 if (done) 1444 if (done)
1758 { 1445 {
1759#ifndef _WIN32 1446#ifndef _WIN32
1760 int old_errno = errno; 1447 int old_errno = errno;
1761 closedir (dirp); 1448 closedir (dirp);
1762 errno = old_errno; 1449 errno = old_errno;
1763 1450
1764 if (errno) 1451 if (errno)
1765 break; 1452 break;
1766#endif 1453#endif
1767 1454
1768 /* sort etc. */ 1455 /* sort etc. */
1769 req->int1 = flags; 1456 req->int1 = flags;
1770 req->result = dentoffs; 1457 req->result = dentoffs;
1771 1458
1772 if (flags & EIO_READDIR_STAT_ORDER) 1459 if (flags & EIO_READDIR_STAT_ORDER)
1773 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits); 1460 eio_dent_sort (dents, dentoffs, flags & EIO_READDIR_DIRS_FIRST ? 7 : 0, inode_bits);
1774 else if (flags & EIO_READDIR_DIRS_FIRST) 1461 else if (flags & EIO_READDIR_DIRS_FIRST)
1775 if (flags & EIO_READDIR_FOUND_UNKNOWN) 1462 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1776 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */ 1463 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1777 else 1464 else
1465 {
1466 /* in this case, all is known, and we just put dirs first and sort them */
1467 eio_dirent *oth = dents + dentoffs;
1468 eio_dirent *dir = dents;
1469
1470 /* now partition dirs to the front, and non-dirs to the back */
1471 /* by walking from both sides and swapping if necessary */
1472 while (oth > dir)
1473 {
1474 if (dir->type == EIO_DT_DIR)
1475 ++dir;
1476 else if ((--oth)->type == EIO_DT_DIR)
1477 {
1478 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1479
1480 ++dir;
1481 }
1482 }
1483
1484 /* now sort the dirs only (dirs all have the same score) */
1485 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1486 }
1487
1488 break;
1489 }
1490
1491 /* now add the entry to our list(s) */
1492 name = D_NAME (entp);
1493
1494 /* skip . and .. entries */
1495 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1496 {
1497 int len = D_NAMLEN (entp) + 1;
1498
1499 while (ecb_expect_false (namesoffs + len > namesalloc))
1500 {
1501 namesalloc *= 2;
1502 req->ptr2 = names = realloc (names, namesalloc);
1503
1504 if (!names)
1505 break;
1506 }
1507
1508 memcpy (names + namesoffs, name, len);
1509
1510 if (dents)
1511 {
1512 struct eio_dirent *ent;
1513
1514 if (ecb_expect_false (dentoffs == dentalloc))
1778 { 1515 {
1779 /* in this case, all is known, and we just put dirs first and sort them */ 1516 dentalloc *= 2;
1517 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1518
1519 if (!dents)
1520 break;
1521 }
1522
1780 eio_dirent *oth = dents + dentoffs; 1523 ent = dents + dentoffs;
1781 eio_dirent *dir = dents;
1782 1524
1783 /* now partition dirs to the front, and non-dirs to the back */ 1525 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1784 /* by walking from both sides and swapping if necessary */ 1526 ent->namelen = len - 1;
1785 while (oth > dir) 1527 ent->inode = D_INO (entp);
1528
1529 inode_bits |= ent->inode;
1530
1531 switch (D_TYPE (entp))
1532 {
1533 default:
1534 ent->type = EIO_DT_UNKNOWN;
1535 flags |= EIO_READDIR_FOUND_UNKNOWN;
1536 break;
1537
1538 #ifdef DT_FIFO
1539 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1540 #endif
1541 #ifdef DT_CHR
1542 case DT_CHR: ent->type = EIO_DT_CHR; break;
1543 #endif
1544 #ifdef DT_MPC
1545 case DT_MPC: ent->type = EIO_DT_MPC; break;
1546 #endif
1547 #ifdef DT_DIR
1548 case DT_DIR: ent->type = EIO_DT_DIR; break;
1549 #endif
1550 #ifdef DT_NAM
1551 case DT_NAM: ent->type = EIO_DT_NAM; break;
1552 #endif
1553 #ifdef DT_BLK
1554 case DT_BLK: ent->type = EIO_DT_BLK; break;
1555 #endif
1556 #ifdef DT_MPB
1557 case DT_MPB: ent->type = EIO_DT_MPB; break;
1558 #endif
1559 #ifdef DT_REG
1560 case DT_REG: ent->type = EIO_DT_REG; break;
1561 #endif
1562 #ifdef DT_NWK
1563 case DT_NWK: ent->type = EIO_DT_NWK; break;
1564 #endif
1565 #ifdef DT_CMP
1566 case DT_CMP: ent->type = EIO_DT_CMP; break;
1567 #endif
1568 #ifdef DT_LNK
1569 case DT_LNK: ent->type = EIO_DT_LNK; break;
1570 #endif
1571 #ifdef DT_SOCK
1572 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1573 #endif
1574 #ifdef DT_DOOR
1575 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1576 #endif
1577 #ifdef DT_WHT
1578 case DT_WHT: ent->type = EIO_DT_WHT; break;
1579 #endif
1580 }
1581
1582 ent->score = 7;
1583
1584 if (flags & EIO_READDIR_DIRS_FIRST)
1585 {
1586 if (ent->type == EIO_DT_UNKNOWN)
1786 { 1587 {
1787 if (dir->type == EIO_DT_DIR) 1588 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1788 ++dir; 1589 ent->score = 1;
1789 else if ((--oth)->type == EIO_DT_DIR) 1590 else if (!strchr (name, '.')) /* absence of dots indicate likely dirs */
1790 { 1591 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1791 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1792
1793 ++dir;
1794 }
1795 } 1592 }
1796 1593 else if (ent->type == EIO_DT_DIR)
1797 /* now sort the dirs only (dirs all have the same score) */ 1594 ent->score = 0;
1798 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1799 } 1595 }
1800
1801 break;
1802 }
1803
1804 /* now add the entry to our list(s) */
1805 name = D_NAME (entp);
1806
1807 /* skip . and .. entries */
1808 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1809 {
1810 int len = D_NAMLEN (entp) + 1;
1811
1812 while (ecb_expect_false (namesoffs + len > namesalloc))
1813 {
1814 namesalloc *= 2;
1815 req->ptr2 = names = realloc (names, namesalloc);
1816
1817 if (!names)
1818 break;
1819 } 1596 }
1820 1597
1821 memcpy (names + namesoffs, name, len);
1822
1823 if (dents)
1824 {
1825 struct eio_dirent *ent;
1826
1827 if (ecb_expect_false (dentoffs == dentalloc))
1828 {
1829 dentalloc *= 2;
1830 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1831
1832 if (!dents)
1833 break;
1834 }
1835
1836 ent = dents + dentoffs;
1837
1838 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1839 ent->namelen = len - 1;
1840 ent->inode = D_INO (entp);
1841
1842 inode_bits |= ent->inode;
1843
1844 switch (D_TYPE (entp))
1845 {
1846 default:
1847 ent->type = EIO_DT_UNKNOWN;
1848 flags |= EIO_READDIR_FOUND_UNKNOWN;
1849 break;
1850
1851 #ifdef DT_FIFO
1852 case DT_FIFO: ent->type = EIO_DT_FIFO; break;
1853 #endif
1854 #ifdef DT_CHR
1855 case DT_CHR: ent->type = EIO_DT_CHR; break;
1856 #endif
1857 #ifdef DT_MPC
1858 case DT_MPC: ent->type = EIO_DT_MPC; break;
1859 #endif
1860 #ifdef DT_DIR
1861 case DT_DIR: ent->type = EIO_DT_DIR; break;
1862 #endif
1863 #ifdef DT_NAM
1864 case DT_NAM: ent->type = EIO_DT_NAM; break;
1865 #endif
1866 #ifdef DT_BLK
1867 case DT_BLK: ent->type = EIO_DT_BLK; break;
1868 #endif
1869 #ifdef DT_MPB
1870 case DT_MPB: ent->type = EIO_DT_MPB; break;
1871 #endif
1872 #ifdef DT_REG
1873 case DT_REG: ent->type = EIO_DT_REG; break;
1874 #endif
1875 #ifdef DT_NWK
1876 case DT_NWK: ent->type = EIO_DT_NWK; break;
1877 #endif
1878 #ifdef DT_CMP
1879 case DT_CMP: ent->type = EIO_DT_CMP; break;
1880 #endif
1881 #ifdef DT_LNK
1882 case DT_LNK: ent->type = EIO_DT_LNK; break;
1883 #endif
1884 #ifdef DT_SOCK
1885 case DT_SOCK: ent->type = EIO_DT_SOCK; break;
1886 #endif
1887 #ifdef DT_DOOR
1888 case DT_DOOR: ent->type = EIO_DT_DOOR; break;
1889 #endif
1890 #ifdef DT_WHT
1891 case DT_WHT: ent->type = EIO_DT_WHT; break;
1892 #endif
1893 }
1894
1895 ent->score = 7;
1896
1897 if (flags & EIO_READDIR_DIRS_FIRST)
1898 {
1899 if (ent->type == EIO_DT_UNKNOWN)
1900 {
1901 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1902 ent->score = 1;
1903 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1904 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1905 }
1906 else if (ent->type == EIO_DT_DIR)
1907 ent->score = 0;
1908 }
1909 }
1910
1911 namesoffs += len; 1598 namesoffs += len;
1912 ++dentoffs; 1599 ++dentoffs;
1913 } 1600 }
1914 1601
1915 if (EIO_CANCELLED (req)) 1602 if (EIO_CANCELLED (req))
1916 { 1603 {
1917 errno = ECANCELED; 1604 errno = ECANCELED;
1918 break; 1605 break;
1919 } 1606 }
1920 1607
1921#ifdef _WIN32 1608#ifdef _WIN32
1922 if (!FindNextFile (dirp, &entp)) 1609 if (!FindNextFile (dirp, &entp))
1923 { 1610 {
1924 FindClose (dirp); 1611 FindClose (dirp);
1925 dirp = 0; 1612 dirp = 0;
1926 } 1613 }
1927#endif 1614#endif
1928 } 1615 }
1929} 1616}
1617
1618/*****************************************************************************/
1619/* working directory stuff */
1620/* various deficiencies in the posix 2008 api force us to */
1621/* keep the absolute path in string form at all times */
1622/* fuck yeah. */
1623
1624#if !HAVE_AT
1625
1626/* a bit like realpath, but usually faster because it doesn'T have to return */
1627/* an absolute or canonical path */
1628static const char *
1629wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1630{
1631 if (!wd || *path == '/')
1632 return path;
1633
1634 if (path [0] == '.' && !path [1])
1635 return wd->str;
1636
1637 {
1638 int l1 = wd->len;
1639 int l2 = strlen (path);
1640
1641 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1642
1643 memcpy (res, wd->str, l1);
1644 res [l1] = '/';
1645 memcpy (res + l1 + 1, path, l2 + 1);
1646
1647 return res;
1648 }
1649}
1650
1651#endif
1652
1653static eio_wd
1654eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1655{
1656 int fd;
1657 eio_wd res;
1658 int len = eio__realpath (tmpbuf, wd, path);
1659
1660 if (len < 0)
1661 return EIO_INVALID_WD;
1662
1663#if HAVE_AT
1664 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY);
1665
1666 if (fd < 0)
1667 return EIO_INVALID_WD;
1668#endif
1669
1670 res = malloc (sizeof (*res) + len); /* one extra 0-byte */
1671
1672#if HAVE_AT
1673 res->fd = fd;
1674#endif
1675
1676 res->len = len;
1677 memcpy (res->str, tmpbuf->ptr, len);
1678 res->str [len] = 0;
1679
1680 return res;
1681}
1682
1683eio_wd
1684eio_wd_open_sync (eio_wd wd, const char *path)
1685{
1686 struct etp_tmpbuf tmpbuf = { 0 };
1687 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1688 free (tmpbuf.ptr);
1689
1690 return wd;
1691}
1692
1693void
1694eio_wd_close_sync (eio_wd wd)
1695{
1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1697 {
1698 #if HAVE_AT
1699 eio__close (wd->fd);
1700 #endif
1701 free (wd);
1702 }
1703}
1704
1705#if HAVE_AT
1706
1707static int
1708eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1709{
1710#if HAVE_RENAMEAT2
1711 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1712#else
1713 if (flags)
1714 return EIO_ENOSYS ();
1715
1716 return renameat (olddirfd, oldpath, newdirfd, newpath);
1717#endif
1718}
1719
1720/* they forgot these */
1721
1722static int
1723eio__truncateat (int dirfd, const char *path, off_t length)
1724{
1725 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC);
1726 int res;
1727
1728 if (fd < 0)
1729 return fd;
1730
1731 res = ftruncate (fd, length);
1732 silent_close (fd);
1733 return res;
1734}
1735
1736static int
1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1738{
1739 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC);
1740 int res;
1741
1742 if (fd < 0)
1743 return fd;
1744
1745 res = fstatvfs (fd, buf);
1746 silent_close (fd);
1747 return res;
1748}
1749
1750#endif
1930 1751
1931/*****************************************************************************/ 1752/*****************************************************************************/
1932 1753
1933#define ALLOC(len) \ 1754#define ALLOC(len) \
1934 if (!req->ptr2) \ 1755 if (!req->ptr2) \
1935 { \ 1756 { \
1936 X_LOCK (wrklock); \ 1757 X_LOCK (EIO_POOL->wrklock); \
1937 req->flags |= EIO_FLAG_PTR2_FREE; \ 1758 req->flags |= EIO_FLAG_PTR2_FREE; \
1938 X_UNLOCK (wrklock); \ 1759 X_UNLOCK (EIO_POOL->wrklock); \
1939 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
1940 if (!req->ptr2) \ 1761 if (!req->ptr2) \
1941 { \ 1762 { \
1942 errno = ENOMEM; \ 1763 errno = ENOMEM; \
1943 req->result = -1; \ 1764 req->result = -1; \
1944 break; \ 1765 goto alloc_fail; \
1945 } \ 1766 } \
1946 } 1767 }
1947 1768
1948X_THREAD_PROC (etp_proc) 1769/*****************************************************************************/
1949{
1950 ETP_REQ *req;
1951 struct timespec ts;
1952 etp_worker *self = (etp_worker *)thr_arg;
1953 1770
1954#if HAVE_PRCTL_SET_NAME 1771static void
1955 prctl (PR_SET_NAME, (unsigned long)"eio_thread", 0, 0, 0); 1772eio__slurp (int fd, eio_req *req)
1956#endif 1773{
1774 req->result = fd;
1957 1775
1958 /* try to distribute timeouts somewhat evenly */ 1776 if (fd < 0)
1959 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1777 return;
1960 1778
1961 for (;;) 1779 if (req->offs < 0 || !req->size) /* do we need the size? */
1962 { 1780 {
1963 ts.tv_sec = 0; 1781 off_t size = lseek (fd, 0, SEEK_END);
1964 1782
1965 X_LOCK (reqlock);
1966
1967 for (;;)
1968 {
1969 self->req = req = reqq_shift (&req_queue);
1970
1971 if (req)
1972 break;
1973
1974 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1975 {
1976 X_UNLOCK (reqlock);
1977 X_LOCK (wrklock);
1978 --started;
1979 X_UNLOCK (wrklock);
1980 goto quit;
1981 }
1982
1983 ++idle;
1984
1985 if (idle <= max_idle)
1986 /* we are allowed to idle, so do so without any timeout */
1987 X_COND_WAIT (reqwait, reqlock);
1988 else
1989 {
1990 /* initialise timeout once */
1991 if (!ts.tv_sec)
1992 ts.tv_sec = time (0) + idle_timeout;
1993
1994 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1995 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1996 }
1997
1998 --idle;
1999 }
2000
2001 --nready;
2002
2003 X_UNLOCK (reqlock);
2004
2005 if (req->type < 0) 1783 if (req->offs < 0)
2006 goto quit; 1784 req->offs += size;
2007 1785
2008 ETP_EXECUTE (self, req); 1786 if (!req->size)
2009 1787 req->size = size - req->offs;
2010 X_LOCK (reslock);
2011
2012 ++npending;
2013
2014 if (!reqq_push (&res_queue, req) && want_poll_cb)
2015 want_poll_cb ();
2016
2017 self->req = 0;
2018 etp_worker_clear (self);
2019
2020 X_UNLOCK (reslock);
2021 } 1788 }
2022 1789
2023quit: 1790 ALLOC (req->size);
2024 X_LOCK (wrklock); 1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
2025 etp_worker_free (self);
2026 X_UNLOCK (wrklock);
2027 1792
2028 return 0; 1793 silent_close (fd);
2029}
2030 1794
2031/*****************************************************************************/ 1795alloc_fail:
1796 ;
1797}
2032 1798
2033int ecb_cold 1799int ecb_cold
2034eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
2035{ 1801{
2036#if !HAVE_PREADWRITE 1802 eio_want_poll_cb = want_poll;
2037 X_MUTEX_CREATE (preadwritelock); 1803 eio_done_poll_cb = done_poll;
2038#endif
2039 1804
2040 return etp_init (want_poll, done_poll); 1805 return etp_init (EIO_POOL, 0, 0, 0);
2041} 1806}
2042 1807
2043ecb_inline void 1808ecb_inline void
2044eio_api_destroy (eio_req *req) 1809eio_api_destroy (eio_req *req)
2045{ 1810{
2046 free (req); 1811 free (req);
2047} 1812}
2048 1813
2049#define REQ(rtype) \ 1814#define REQ(rtype) \
2050 eio_req *req; \ 1815 eio_req *req; \
2051 \ 1816 \
2052 req = (eio_req *)calloc (1, sizeof *req); \ 1817 req = (eio_req *)calloc (1, sizeof *req); \
2053 if (!req) \ 1818 if (!req) \
2054 return 0; \ 1819 return 0; \
2068 { \ 1833 { \
2069 eio_api_destroy (req); \ 1834 eio_api_destroy (req); \
2070 return 0; \ 1835 return 0; \
2071 } 1836 }
2072 1837
1838#define SINGLEDOT(ptr) (0[(char *)(ptr)] == '.' && !1[(char *)(ptr)])
1839
2073static void 1840static void
2074eio_execute (etp_worker *self, eio_req *req) 1841eio_execute (etp_worker *self, eio_req *req)
2075{ 1842{
1843#if HAVE_AT
1844 int dirfd;
1845#else
1846 const char *path;
1847#endif
1848
2076 if (ecb_expect_false (EIO_CANCELLED (req))) 1849 if (ecb_expect_false (EIO_CANCELLED (req)))
2077 { 1850 {
2078 req->result = -1; 1851 req->result = -1;
2079 req->errorno = ECANCELED; 1852 req->errorno = ECANCELED;
2080 return; 1853 return;
2081 } 1854 }
2082 1855
1856 if (ecb_expect_false (req->wd == EIO_INVALID_WD))
1857 {
1858 req->result = -1;
1859 req->errorno = ENOENT;
1860 return;
1861 }
1862
1863 if (req->type >= EIO_OPEN)
1864 {
1865 #if HAVE_AT
1866 dirfd = WD2FD (req->wd);
1867 #else
1868 path = wd_expand (&self->tmpbuf, req->wd, req->ptr1);
1869 #endif
1870 }
1871
2083 switch (req->type) 1872 switch (req->type)
2084 { 1873 {
1874 case EIO_WD_OPEN: req->wd = eio__wd_open_sync (&self->tmpbuf, req->wd, req->ptr1);
1875 req->result = req->wd == EIO_INVALID_WD ? -1 : 0;
1876 break;
1877 case EIO_WD_CLOSE: req->result = 0;
1878 eio_wd_close_sync (req->wd); break;
1879
1880 case EIO_SEEK: eio__lseek (req); break;
2085 case EIO_READ: ALLOC (req->size); 1881 case EIO_READ: ALLOC (req->size);
2086 req->result = req->offs >= 0 1882 req->result = req->offs >= 0
2087 ? pread (req->int1, req->ptr2, req->size, req->offs) 1883 ? pread (req->int1, req->ptr2, req->size, req->offs)
2088 : read (req->int1, req->ptr2, req->size); break; 1884 : read (req->int1, req->ptr2, req->size); break;
2089 case EIO_WRITE: req->result = req->offs >= 0 1885 case EIO_WRITE: req->result = req->offs >= 0
2090 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1886 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
2091 : write (req->int1, req->ptr2, req->size); break; 1887 : write (req->int1, req->ptr2, req->size); break;
2092 1888
1889 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1890 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1891
2093 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1892 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
2094 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1893 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
2095 1894
1895#if HAVE_AT
1896
2096 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1897 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2097 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1898 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, 0); break;
2098 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1899 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1900 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1901 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1902 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1903 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1904 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1905 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1906
1907 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1910 ? rmdir (req->wd->str)
1911 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1912 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1913 case EIO_RENAME: req->result = eio__renameat2 (
1914 dirfd,
1915 /* complications arise because "." cannot be renamed, so we might have to expand */
1916 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1917 WD2FD ((eio_wd)req->int3),
1918 req->ptr2,
1919 req->int2
1920 );
1921 break;
1922 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1923 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1924 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1925 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1926 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1927 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1928 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1929 if (req->result == EIO_PATH_MAX)
1930 {
1931 req->result = -1;
1932 errno = ENAMETOOLONG;
1933 }
1934 break;
1935 case EIO_UTIME:
1936 case EIO_FUTIME:
1937 {
1938 struct timespec ts[2];
1939 struct timespec *times;
1940
1941 if (req->nv1 != -1. || req->nv2 != -1.)
1942 {
1943 ts[0].tv_sec = req->nv1;
1944 ts[0].tv_nsec = (req->nv1 - ts[0].tv_sec) * 1e9;
1945 ts[1].tv_sec = req->nv2;
1946 ts[1].tv_nsec = (req->nv2 - ts[1].tv_sec) * 1e9;
1947
1948 times = ts;
1949 }
1950 else
1951 times = 0;
1952
1953 req->result = req->type == EIO_FUTIME
1954 ? futimens (req->int1, times)
1955 : utimensat (dirfd, req->ptr1, times, 0);
1956 }
1957 break;
1958
1959#else
1960
1961 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1962 req->result = stat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1963 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2099 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1965 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1966 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1967 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1968 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1969 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1970
1971 case EIO_UNLINK: req->result = unlink (path ); break;
1972 case EIO_RMDIR: req->result = rmdir (path ); break;
1973 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1974 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
1975 case EIO_LINK: req->result = link (path , req->ptr2); break;
1976 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1977 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1978 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1979 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1980 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1981 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1982 if (req->result == EIO_PATH_MAX)
1983 {
1984 req->result = -1;
1985 errno = ENAMETOOLONG;
1986 }
1987 break;
1988
1989 case EIO_UTIME:
1990 case EIO_FUTIME:
1991 {
1992 struct timeval tv[2];
1993 struct timeval *times;
1994
1995 if (req->nv1 != -1. || req->nv2 != -1.)
1996 {
1997 tv[0].tv_sec = req->nv1;
1998 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1e6;
1999 tv[1].tv_sec = req->nv2;
2000 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1e6;
2001
2002 times = tv;
2003 }
2004 else
2005 times = 0;
2006
2007 req->result = req->type == EIO_FUTIME
2008 ? futimes (req->int1, times)
2009 : utimes (req->ptr1, times);
2010 }
2011 break;
2012
2013#endif
2014
2015 case EIO_REALPATH: if (0 <= (req->result = eio__realpath (&self->tmpbuf, req->wd, req->ptr1)))
2016 {
2017 ALLOC (req->result);
2018 memcpy (req->ptr2, self->tmpbuf.ptr, req->result);
2019 }
2020 break;
2021
2100 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 2022 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
2101 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 2023 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
2102 2024
2103 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2104 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2105 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2025 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2106 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 2026 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
2107 2027
2108 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
2109 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2028 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
2110 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
2111 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2029 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
2112 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
2113 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2114 2031
2115 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
2116 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2117 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2118 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
2119 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
2120 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
2121 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
2122 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
2123 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
2124 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
2125
2126 case EIO_REALPATH: eio__realpath (req, self); break;
2127
2128 case EIO_READLINK: ALLOC (PATH_MAX);
2129 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
2130
2131 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
2132 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
2133 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2134 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
2135 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2038 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2154 req->result = select (0, 0, 0, 0, &tv); 2057 req->result = select (0, 0, 0, 0, &tv);
2155 } 2058 }
2156#endif 2059#endif
2157 break; 2060 break;
2158 2061
2159 case EIO_UTIME: 2062#if 0
2160 case EIO_FUTIME:
2161 {
2162 struct timeval tv[2];
2163 struct timeval *times;
2164
2165 if (req->nv1 != -1. || req->nv2 != -1.)
2166 {
2167 tv[0].tv_sec = req->nv1;
2168 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
2169 tv[1].tv_sec = req->nv2;
2170 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
2171
2172 times = tv;
2173 }
2174 else
2175 times = 0;
2176
2177 req->result = req->type == EIO_FUTIME
2178 ? futimes (req->int1, times)
2179 : utimes (req->ptr1, times);
2180 }
2181 break;
2182
2183 case EIO_GROUP: 2063 case EIO_GROUP:
2184 abort (); /* handled in eio_request */ 2064 abort (); /* handled in eio_request */
2065#endif
2185 2066
2186 case EIO_NOP: 2067 case EIO_NOP:
2187 req->result = 0; 2068 req->result = 0;
2188 break; 2069 break;
2189 2070
2190 case EIO_CUSTOM: 2071 case EIO_CUSTOM:
2191 req->feed (req); 2072 req->feed (req);
2192 break; 2073 break;
2193 2074
2194 default: 2075 default:
2195 errno = ENOSYS;
2196 req->result = -1; 2076 req->result = EIO_ENOSYS ();
2197 break; 2077 break;
2198 } 2078 }
2199 2079
2080alloc_fail:
2200 req->errorno = errno; 2081 req->errorno = errno;
2201} 2082}
2202 2083
2203#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2204 2085
2086eio_req *eio_wd_open (const char *path, int pri, eio_cb cb, void *data)
2087{
2088 REQ (EIO_WD_OPEN); PATH; SEND;
2089}
2090
2091eio_req *eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data)
2092{
2093 REQ (EIO_WD_CLOSE); req->wd = wd; SEND;
2094}
2095
2205eio_req *eio_nop (int pri, eio_cb cb, void *data) 2096eio_req *eio_nop (int pri, eio_cb cb, void *data)
2206{ 2097{
2207 REQ (EIO_NOP); SEND; 2098 REQ (EIO_NOP); SEND;
2208} 2099}
2209 2100
2270eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) 2161eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data)
2271{ 2162{
2272 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND; 2163 REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
2273} 2164}
2274 2165
2166eio_req *eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data)
2167{
2168 REQ (EIO_SEEK); req->int1 = fd; req->offs = offset; req->int2 = whence; SEND;
2169}
2170
2275eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2171eio_req *eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2276{ 2172{
2277 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2173 REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2278} 2174}
2279 2175
2280eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2176eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2281{ 2177{
2282 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2178 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2179}
2180
2181eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2182{
2183 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2184}
2185
2186eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2187{
2188 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2283} 2189}
2284 2190
2285eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2191eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2286{ 2192{
2287 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2193 REQ (EIO_FSTAT); req->int1 = fd; SEND;
2432eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2338eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2433{ 2339{
2434 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2435} 2341}
2436 2342
2343eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2344{
2345 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2346}
2347
2437eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2348eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2438{ 2349{
2439 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2440} 2351}
2441 2352
2475void 2386void
2476eio_grp_add (eio_req *grp, eio_req *req) 2387eio_grp_add (eio_req *grp, eio_req *req)
2477{ 2388{
2478 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2389 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2479 2390
2480 grp->flags |= EIO_FLAG_GROUPADD; 2391 grp->flags |= ETP_FLAG_GROUPADD;
2481 2392
2482 ++grp->size; 2393 ++grp->size;
2483 req->grp = grp; 2394 req->grp = grp;
2484 2395
2485 req->grp_prev = 0; 2396 req->grp_prev = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines