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

Comparing libeio/eio.c (file contents):
Revision 1.130 by root, Thu May 9 03:03:24 2013 UTC vs.
Revision 1.150 by root, Fri Jun 15 02:57:36 2018 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 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 *
… …
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>
… …
120 #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))
121 116
122 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
125 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
126 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
203 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
204 static int 202 static int
205 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
206 { 204 {
207 #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)
208 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
209 return 0; 214 return 0;
210
211 if (CreateSymbolicLink (neu, old, 0))
212 return 0;
213 #endif 215 #endif
214 216
215 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
216 } 218 }
217 219
… …
229 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
230 #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)
231 233
232#else 234#else
233 235
236 #include <sys/ioctl.h>
234 #include <sys/time.h> 237 #include <sys/time.h>
235 #include <sys/select.h> 238 #include <sys/select.h>
236 #include <unistd.h> 239 #include <unistd.h>
237 #include <signal.h> 240 #include <signal.h>
238 #include <dirent.h> 241 #include <dirent.h>
… …
280# include <utime.h> 283# include <utime.h>
281#endif 284#endif
282 285
283#if HAVE_SYS_SYSCALL_H 286#if HAVE_SYS_SYSCALL_H
284# include <sys/syscall.h> 287# include <sys/syscall.h>
285#endif
286
287#if HAVE_SYS_PRCTL_H
288# include <sys/prctl.h>
289#endif 288#endif
290 289
291#if HAVE_SENDFILE 290#if HAVE_SENDFILE
292# if __linux 291# if __linux
293# include <sys/sendfile.h> 292# include <sys/sendfile.h>
… …
301# else 300# else
302# error sendfile support requested but not available 301# error sendfile support requested but not available
303# endif 302# endif
304#endif 303#endif
305 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
306#ifndef D_TYPE 310#ifndef D_TYPE
307# define D_TYPE(de) 0 311# define D_TYPE(de) 0
308#endif 312#endif
309#ifndef D_INO 313#ifndef D_INO
310# define D_INO(de) 0 314# define D_INO(de) 0
… …
318# define NAME_MAX 4096 322# define NAME_MAX 4096
319#endif 323#endif
320 324
321/* used for readlink etc. */ 325/* used for readlink etc. */
322#ifndef PATH_MAX 326#ifndef PATH_MAX
323# define PATH_MAX 4096 327# define PATH_MAX 0
324#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)
325 339
326/* buffer size for various temporary buffers */ 340/* buffer size for various temporary buffers */
327#define EIO_BUFSIZE 65536 341#define EIO_BUFSIZE 65536
328 342
329#define dBUF \ 343#define dBUF \
… …
335#define FUBd \ 349#define FUBd \
336 free (eio_buf) 350 free (eio_buf)
337 351
338/*****************************************************************************/ 352/*****************************************************************************/
339 353
340struct tmpbuf
341{
342 void *ptr;
343 int len;
344};
345
346static void *
347tmpbuf_get (struct tmpbuf *buf, int len)
348{
349 if (buf->len < len)
350 {
351 free (buf->ptr);
352 buf->ptr = malloc (buf->len = len);
353 }
354
355 return buf->ptr;
356}
357
358struct tmpbuf; 354struct etp_tmpbuf;
359 355
360#if _POSIX_VERSION >= 200809L 356#if _POSIX_VERSION >= 200809L
361 #define HAVE_AT 1 357 #define HAVE_AT 1
362 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 358 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
363 #ifndef O_SEARCH 359 #ifndef O_SEARCH
364 #define O_SEARCH O_RDONLY 360 #define O_SEARCH O_RDONLY
365 #endif 361 #endif
366#else 362#else
367 #define HAVE_AT 0 363 #define HAVE_AT 0
368 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path); 364 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
369#endif 365#endif
370 366
371struct eio_pwd 367struct eio_pwd
372{ 368{
373#if HAVE_AT 369#if HAVE_AT
… …
383#define ETP_PRI_MAX EIO_PRI_MAX 379#define ETP_PRI_MAX EIO_PRI_MAX
384 380
385#define ETP_TYPE_QUIT -1 381#define ETP_TYPE_QUIT -1
386#define ETP_TYPE_GROUP EIO_GROUP 382#define ETP_TYPE_GROUP EIO_GROUP
387 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
388struct etp_worker; 391struct etp_worker;
389
390#define ETP_REQ eio_req 392#define ETP_REQ eio_req
391#define ETP_DESTROY(req) eio_destroy (req) 393#define ETP_DESTROY(req) eio_destroy (req)
392static int eio_finish (eio_req *req); 394static int eio_finish (eio_req *req);
393#define ETP_FINISH(req) eio_finish (req) 395#define ETP_FINISH(req) eio_finish (req)
394static void eio_execute (struct etp_worker *self, eio_req *req); 396static void eio_execute (struct etp_worker *self, eio_req *req);
395#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req) 397#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
396 398
397#include "etp.c" 399#include "etp.c"
398 400
401static struct etp_pool eio_pool;
402#define EIO_POOL (&eio_pool)
403
399/*****************************************************************************/ 404/*****************************************************************************/
400 405
401static void 406static void
402grp_try_feed (eio_req *grp) 407grp_try_feed (eio_req *grp)
403{ 408{
404 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 409 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
405 { 410 {
406 grp->flags &= ~EIO_FLAG_GROUPADD; 411 grp->flags &= ~ETP_FLAG_GROUPADD;
407 412
408 EIO_FEED (grp); 413 EIO_FEED (grp);
409 414
410 /* stop if no progress has been made */ 415 /* stop if no progress has been made */
411 if (!(grp->flags & EIO_FLAG_GROUPADD)) 416 if (!(grp->flags & ETP_FLAG_GROUPADD))
412 { 417 {
413 grp->feed = 0; 418 grp->feed = 0;
414 break; 419 break;
415 } 420 }
416 } 421 }
… …
423 428
424 /* call feeder, if applicable */ 429 /* call feeder, if applicable */
425 grp_try_feed (grp); 430 grp_try_feed (grp);
426 431
427 /* finish, if done */ 432 /* finish, if done */
428 if (!grp->size && grp->int1) 433 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
429 return eio_finish (grp); 434 return eio_finish (grp);
430 else 435 else
431 return 0; 436 return 0;
432} 437}
433 438
… …
469} 474}
470 475
471void 476void
472eio_grp_cancel (eio_req *grp) 477eio_grp_cancel (eio_req *grp)
473{ 478{
474 etp_grp_cancel (grp); 479 etp_grp_cancel (EIO_POOL, grp);
475} 480}
476 481
477void 482void
478eio_cancel (eio_req *req) 483eio_cancel (eio_req *req)
479{ 484{
480 etp_cancel (req); 485 etp_cancel (EIO_POOL, req);
481} 486}
482 487
483void 488void
484eio_submit (eio_req *req) 489eio_submit (eio_req *req)
485{ 490{
486 etp_submit (req); 491 etp_submit (EIO_POOL, req);
487} 492}
488 493
489unsigned int 494unsigned int
490eio_nreqs (void) 495eio_nreqs (void)
491{ 496{
492 return etp_nreqs (); 497 return etp_nreqs (EIO_POOL);
493} 498}
494 499
495unsigned int 500unsigned int
496eio_nready (void) 501eio_nready (void)
497{ 502{
498 return etp_nready (); 503 return etp_nready (EIO_POOL);
499} 504}
500 505
501unsigned int 506unsigned int
502eio_npending (void) 507eio_npending (void)
503{ 508{
504 return etp_npending (); 509 return etp_npending (EIO_POOL);
505} 510}
506 511
507unsigned int ecb_cold 512unsigned int ecb_cold
508eio_nthreads (void) 513eio_nthreads (void)
509{ 514{
510 return etp_nthreads (); 515 return etp_nthreads (EIO_POOL);
511} 516}
512 517
513void ecb_cold 518void ecb_cold
514eio_set_max_poll_time (double nseconds) 519eio_set_max_poll_time (double nseconds)
515{ 520{
516 etp_set_max_poll_time (nseconds); 521 etp_set_max_poll_time (EIO_POOL, nseconds);
517} 522}
518 523
519void ecb_cold 524void ecb_cold
520eio_set_max_poll_reqs (unsigned int maxreqs) 525eio_set_max_poll_reqs (unsigned int maxreqs)
521{ 526{
522 etp_set_max_poll_reqs (maxreqs); 527 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
523} 528}
524 529
525void ecb_cold 530void ecb_cold
526eio_set_max_idle (unsigned int nthreads) 531eio_set_max_idle (unsigned int nthreads)
527{ 532{
528 etp_set_max_idle (nthreads); 533 etp_set_max_idle (EIO_POOL, nthreads);
529} 534}
530 535
531void ecb_cold 536void ecb_cold
532eio_set_idle_timeout (unsigned int seconds) 537eio_set_idle_timeout (unsigned int seconds)
533{ 538{
534 etp_set_idle_timeout (seconds); 539 etp_set_idle_timeout (EIO_POOL, seconds);
535} 540}
536 541
537void ecb_cold 542void ecb_cold
538eio_set_min_parallel (unsigned int nthreads) 543eio_set_min_parallel (unsigned int nthreads)
539{ 544{
540 etp_set_min_parallel (nthreads); 545 etp_set_min_parallel (EIO_POOL, nthreads);
541} 546}
542 547
543void ecb_cold 548void ecb_cold
544eio_set_max_parallel (unsigned int nthreads) 549eio_set_max_parallel (unsigned int nthreads)
545{ 550{
546 etp_set_max_parallel (nthreads); 551 etp_set_max_parallel (EIO_POOL, nthreads);
547} 552}
548 553
549int eio_poll (void) 554int eio_poll (void)
550{ 555{
551 return etp_poll (); 556 return etp_poll (EIO_POOL);
552} 557}
553 558
554/*****************************************************************************/ 559/*****************************************************************************/
555/* work around various missing functions */ 560/* work around various missing functions */
561
562#if HAVE_POSIX_CLOSE && !__linux
563# define eio__close(fd) posix_close (fd, 0)
564#else
565# define eio__close(fd) close (fd)
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}
556 576
557#ifndef HAVE_UTIMES 577#ifndef HAVE_UTIMES
558 578
559# undef utimes 579# undef utimes
560# define utimes(path,times) eio__utimes (path, times) 580# define utimes(path,times) eio__utimes (path, times)
… …
939 intptr_t end = addr + len; 959 intptr_t end = addr + len;
940 intptr_t page = eio_pagesize (); 960 intptr_t page = eio_pagesize ();
941 961
942 if (addr < end) 962 if (addr < end)
943 if (flags & EIO_MT_MODIFY) /* modify */ 963 if (flags & EIO_MT_MODIFY) /* modify */
944 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));
945 else 965 else
946 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));
947 } 967 }
948 968
949 return 0; 969 return 0;
950} 970}
951 971
… …
966 req->result = req->offs == (off_t)-1 ? -1 : 0; 986 req->result = req->offs == (off_t)-1 ? -1 : 0;
967} 987}
968 988
969/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 989/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
970static int 990static int
971eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 991eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
972{ 992{
973 char *res; 993 char *res;
974 const char *rel = path; 994 const char *rel = path;
975 char *tmp1, *tmp2; 995 char *tmp1, *tmp2;
976#if SYMLOOP_MAX > 32 996#if SYMLOOP_MAX > 32
… …
985 1005
986 errno = ENOENT; 1006 errno = ENOENT;
987 if (!*rel) 1007 if (!*rel)
988 return -1; 1008 return -1;
989 1009
990 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 1010 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
991#ifdef _WIN32 1011#ifdef _WIN32
992 if (_access (rel, 4) != 0) 1012 if (_access (rel, 4) != 0)
993 return -1; 1013 return -1;
994 1014
995 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 1015 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
996 1016
997 errno = ENAMETOOLONG; 1017 errno = ENAMETOOLONG;
998 if (symlinks >= PATH_MAX * 3) 1018 if (symlinks >= EIO_PATH_MAX * 3)
999 return -1; 1019 return -1;
1000 1020
1001 errno = EIO; 1021 errno = EIO;
1002 if (symlinks <= 0) 1022 if (symlinks <= 0)
1003 return -1; 1023 return -1;
1004 1024
1005 return symlinks; 1025 return symlinks;
1006 1026
1007#else 1027#else
1008 tmp1 = res + PATH_MAX; 1028 tmp1 = res + EIO_PATH_MAX;
1009 tmp2 = tmp1 + PATH_MAX; 1029 tmp2 = tmp1 + EIO_PATH_MAX;
1010 1030
1011#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 */
1012#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1032#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1013 /* on linux we may be able to ask the kernel */ 1033 /* on linux we may be able to ask the kernel */
1014 { 1034 {
1015 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);
1016 1036
1017 if (fd >= 0) 1037 if (fd >= 0)
1018 { 1038 {
1019 sprintf (tmp1, "/proc/self/fd/%d", fd); 1039 sprintf (tmp1, "/proc/self/fd/%d", fd);
1020 req->result = readlink (tmp1, res, PATH_MAX); 1040 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1021 /* 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 */
1022 close (fd); 1042 eio__close (fd);
1023 1043
1024 if (req->result > 0) 1044 if (req->result > 0)
1025 goto done; 1045 goto done;
1026 } 1046 }
1027 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)
… …
1038 if (wd == EIO_INVALID_WD) 1058 if (wd == EIO_INVALID_WD)
1039 return -1; 1059 return -1;
1040 1060
1041 if (wd == EIO_CWD) 1061 if (wd == EIO_CWD)
1042 { 1062 {
1043 if (!getcwd (res, PATH_MAX)) 1063 if (!getcwd (res, EIO_PATH_MAX))
1044 return -1; 1064 return -1;
1045 1065
1046 len = strlen (res); 1066 len = strlen (res);
1047 } 1067 }
1048 else 1068 else
… …
1095 1115
1096 /* zero-terminate, for readlink */ 1116 /* zero-terminate, for readlink */
1097 res [len + 1] = 0; 1117 res [len + 1] = 0;
1098 1118
1099 /* now check if it's a symlink */ 1119 /* now check if it's a symlink */
1100 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1120 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1101 1121
1102 if (linklen < 0) 1122 if (linklen < 0)
1103 { 1123 {
1104 if (errno != EINVAL) 1124 if (errno != EINVAL)
1105 return -1; 1125 return -1;
… …
1111 { 1131 {
1112 /* yay, it was a symlink - build new path in tmp2 */ 1132 /* yay, it was a symlink - build new path in tmp2 */
1113 int rellen = strlen (rel); 1133 int rellen = strlen (rel);
1114 1134
1115 errno = ENAMETOOLONG; 1135 errno = ENAMETOOLONG;
1116 if (linklen + 1 + rellen >= PATH_MAX) 1136 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1117 return -1; 1137 return -1;
1118 1138
1119 errno = ELOOP; 1139 errno = ELOOP;
1120 if (!--symlinks) 1140 if (!--symlinks)
1121 return -1; 1141 return -1;
… …
1385 return; 1405 return;
1386 1406
1387 dirp = fdopendir (fd); 1407 dirp = fdopendir (fd);
1388 1408
1389 if (!dirp) 1409 if (!dirp)
1390 close (fd); 1410 silent_close (fd);
1391 } 1411 }
1392 else 1412 else
1393 dirp = opendir (req->ptr1); 1413 dirp = opendir (req->ptr1);
1394 #else 1414 #else
1395 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1415 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1604#if !HAVE_AT 1624#if !HAVE_AT
1605 1625
1606/* a bit like realpath, but usually faster because it doesn'T have to return */ 1626/* a bit like realpath, but usually faster because it doesn'T have to return */
1607/* an absolute or canonical path */ 1627/* an absolute or canonical path */
1608static const char * 1628static const char *
1609wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1629wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1610{ 1630{
1611 if (!wd || *path == '/') 1631 if (!wd || *path == '/')
1612 return path; 1632 return path;
1613 1633
1614 if (path [0] == '.' && !path [1]) 1634 if (path [0] == '.' && !path [1])
… …
1616 1636
1617 { 1637 {
1618 int l1 = wd->len; 1638 int l1 = wd->len;
1619 int l2 = strlen (path); 1639 int l2 = strlen (path);
1620 1640
1621 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2); 1641 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1622 1642
1623 memcpy (res, wd->str, l1); 1643 memcpy (res, wd->str, l1);
1624 res [l1] = '/'; 1644 res [l1] = '/';
1625 memcpy (res + l1 + 1, path, l2 + 1); 1645 memcpy (res + l1 + 1, path, l2 + 1);
1626 1646
… …
1629} 1649}
1630 1650
1631#endif 1651#endif
1632 1652
1633static eio_wd 1653static eio_wd
1634eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1654eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1635{ 1655{
1636 int fd; 1656 int fd;
1637 eio_wd res; 1657 eio_wd res;
1638 int len = eio__realpath (tmpbuf, wd, path); 1658 int len = eio__realpath (tmpbuf, wd, path);
1639 1659
… …
1661} 1681}
1662 1682
1663eio_wd 1683eio_wd
1664eio_wd_open_sync (eio_wd wd, const char *path) 1684eio_wd_open_sync (eio_wd wd, const char *path)
1665{ 1685{
1666 struct tmpbuf tmpbuf = { 0 }; 1686 struct etp_tmpbuf tmpbuf = { };
1667 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1687 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1668 free (tmpbuf.ptr); 1688 free (tmpbuf.ptr);
1669 1689
1670 return wd; 1690 return wd;
1671} 1691}
… …
1674eio_wd_close_sync (eio_wd wd) 1694eio_wd_close_sync (eio_wd wd)
1675{ 1695{
1676 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1696 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1677 { 1697 {
1678 #if HAVE_AT 1698 #if HAVE_AT
1679 close (wd->fd); 1699 eio__close (wd->fd);
1680 #endif 1700 #endif
1681 free (wd); 1701 free (wd);
1682 } 1702 }
1683} 1703}
1684 1704
1685#if HAVE_AT 1705#if HAVE_AT
1686 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
1687/* they forgot these */ 1720/* they forgot these */
1688 1721
1689static int 1722static int
1690eio__truncateat (int dirfd, const char *path, off_t length) 1723eio__truncateat (int dirfd, const char *path, off_t length)
1691{ 1724{
… …
1694 1727
1695 if (fd < 0) 1728 if (fd < 0)
1696 return fd; 1729 return fd;
1697 1730
1698 res = ftruncate (fd, length); 1731 res = ftruncate (fd, length);
1699 close (fd); 1732 silent_close (fd);
1700 return res; 1733 return res;
1701} 1734}
1702 1735
1703static int 1736static int
1704eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1737eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1708 1741
1709 if (fd < 0) 1742 if (fd < 0)
1710 return fd; 1743 return fd;
1711 1744
1712 res = fstatvfs (fd, buf); 1745 res = fstatvfs (fd, buf);
1713 close (fd); 1746 silent_close (fd);
1714 return res; 1747 return res;
1715
1716} 1748}
1717 1749
1718#endif 1750#endif
1719 1751
1720/*****************************************************************************/ 1752/*****************************************************************************/
1721 1753
1722#define ALLOC(len) \ 1754#define ALLOC(len) \
1723 if (!req->ptr2) \ 1755 if (!req->ptr2) \
1724 { \ 1756 { \
1725 X_LOCK (wrklock); \ 1757 X_LOCK (EIO_POOL->wrklock); \
1726 req->flags |= EIO_FLAG_PTR2_FREE; \ 1758 req->flags |= EIO_FLAG_PTR2_FREE; \
1727 X_UNLOCK (wrklock); \ 1759 X_UNLOCK (EIO_POOL->wrklock); \
1728 req->ptr2 = malloc (len); \ 1760 req->ptr2 = malloc (len); \
1729 if (!req->ptr2) \ 1761 if (!req->ptr2) \
1730 { \ 1762 { \
1731 errno = ENOMEM; \ 1763 errno = ENOMEM; \
1732 req->result = -1; \ 1764 req->result = -1; \
1733 break; \ 1765 goto alloc_fail; \
1734 } \ 1766 } \
1735 } 1767 }
1736 1768
1737static void ecb_noinline ecb_cold 1769/*****************************************************************************/
1738etp_proc_init (void)
1739{
1740#if HAVE_PRCTL_SET_NAME
1741 /* provide a more sensible "thread name" */
1742 char name[16 + 1];
1743 const int namelen = sizeof (name) - 1;
1744 int len;
1745 1770
1746 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0); 1771static void
1747 name [namelen] = 0; 1772eio__slurp (int fd, eio_req *req)
1748 len = strlen (name);
1749 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
1750 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
1751#endif
1752}
1753
1754/* TODO: move somehow to etp.c */
1755X_THREAD_PROC (etp_proc)
1756{ 1773{
1757 ETP_REQ *req; 1774 req->result = fd;
1758 struct timespec ts;
1759 etp_worker *self = (etp_worker *)thr_arg;
1760 1775
1761 etp_proc_init (); 1776 if (fd < 0)
1777 return;
1762 1778
1763 /* try to distribute timeouts somewhat evenly */ 1779 if (req->offs < 0 || !req->size) /* do we need the size? */
1764 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1765
1766 for (;;)
1767 { 1780 {
1768 ts.tv_sec = 0; 1781 off_t size = lseek (fd, 0, SEEK_END);
1769 1782
1770 X_LOCK (reqlock); 1783 if (req->offs < 0)
1784 req->offs += size;
1771 1785
1772 for (;;) 1786 if (!req->size)
1773 { 1787 req->size = size - req->offs;
1774 req = reqq_shift (&req_queue);
1775
1776 if (req)
1777 break;
1778
1779 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1780 {
1781 X_UNLOCK (reqlock);
1782 X_LOCK (wrklock);
1783 --started;
1784 X_UNLOCK (wrklock);
1785 goto quit;
1786 }
1787
1788 ++idle;
1789
1790 if (idle <= max_idle)
1791 /* we are allowed to idle, so do so without any timeout */
1792 X_COND_WAIT (reqwait, reqlock);
1793 else
1794 {
1795 /* initialise timeout once */
1796 if (!ts.tv_sec)
1797 ts.tv_sec = time (0) + idle_timeout;
1798
1799 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1800 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1801 }
1802
1803 --idle;
1804 }
1805
1806 --nready;
1807
1808 X_UNLOCK (reqlock);
1809
1810 if (req->type == ETP_TYPE_QUIT)
1811 goto quit;
1812
1813 ETP_EXECUTE (self, req);
1814
1815 X_LOCK (reslock);
1816
1817 ++npending;
1818
1819 if (!reqq_push (&res_queue, req) && want_poll_cb)
1820 want_poll_cb ();
1821
1822 etp_worker_clear (self);
1823
1824 X_UNLOCK (reslock);
1825 } 1788 }
1826 1789
1827quit: 1790 ALLOC (req->size);
1828 free (req); 1791 req->result = pread (fd, req->ptr2, req->size, req->offs);
1829 1792
1830 X_LOCK (wrklock); 1793 silent_close (fd);
1831 etp_worker_free (self);
1832 X_UNLOCK (wrklock);
1833 1794
1834 return 0; 1795alloc_fail:
1796 ;
1835} 1797}
1836
1837/*****************************************************************************/
1838 1798
1839int ecb_cold 1799int ecb_cold
1840eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1800eio_init (void (*want_poll)(void), void (*done_poll)(void))
1841{ 1801{
1842 return etp_init (want_poll, done_poll); 1802 eio_want_poll_cb = want_poll;
1803 eio_done_poll_cb = done_poll;
1804
1805 return etp_init (EIO_POOL, 0, 0, 0);
1843} 1806}
1844 1807
1845ecb_inline void 1808ecb_inline void
1846eio_api_destroy (eio_req *req) 1809eio_api_destroy (eio_req *req)
1847{ 1810{
… …
1921 : read (req->int1, req->ptr2, req->size); break; 1884 : read (req->int1, req->ptr2, req->size); break;
1922 case EIO_WRITE: req->result = req->offs >= 0 1885 case EIO_WRITE: req->result = req->offs >= 0
1923 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1886 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1924 : write (req->int1, req->ptr2, req->size); break; 1887 : write (req->int1, req->ptr2, req->size); break;
1925 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
1926 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;
1927 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;
1928 1894
1929#if HAVE_AT 1895#if HAVE_AT
1930 1896
… …
1934 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1900 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1935 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1901 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1936 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1902 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1937 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1903 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1938 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); 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;
1939 1906
1940 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1907 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1941 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */ 1908 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1942 req->result = req->wd && SINGLEDOT (req->ptr1) 1909 req->result = req->wd && SINGLEDOT (req->ptr1)
1943 ? rmdir (req->wd->str) 1910 ? rmdir (req->wd->str)
1944 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1911 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1945 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); 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,
1946 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1915 /* complications arise because "." cannot be renamed, so we might have to expand */
1947 req->result = req->wd && SINGLEDOT (req->ptr1) 1916 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1948 ? rename (req->wd->str, req->ptr2) 1917 WD2FD ((eio_wd)req->int3),
1949 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1918 req->ptr2,
1919 req->int2
1920 );
1921 break;
1950 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1922 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1951 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1923 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1952 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1924 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1953 case EIO_READLINK: ALLOC (PATH_MAX);
1954 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1955 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1925 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1956 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 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;
1957 case EIO_UTIME: 1935 case EIO_UTIME:
1958 case EIO_FUTIME: 1936 case EIO_FUTIME:
1959 { 1937 {
1960 struct timespec ts[2]; 1938 struct timespec ts[2];
1961 struct timespec *times; 1939 struct timespec *times;
… …
1986 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1964 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1987 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1965 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1988 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break; 1966 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1989 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1967 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1990 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); 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;
1991 1970
1992 case EIO_UNLINK: req->result = unlink (path ); break; 1971 case EIO_UNLINK: req->result = unlink (path ); break;
1993 case EIO_RMDIR: req->result = rmdir (path ); break; 1972 case EIO_RMDIR: req->result = rmdir (path ); break;
1994 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1973 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1995 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1974 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
1996 case EIO_LINK: req->result = link (path , req->ptr2); break; 1975 case EIO_LINK: req->result = link (path , req->ptr2); break;
1997 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1976 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1998 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1977 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1999 case EIO_READLINK: ALLOC (PATH_MAX);
2000 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2001 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1978 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2002 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 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;
2003 1988
2004 case EIO_UTIME: 1989 case EIO_UTIME:
2005 case EIO_FUTIME: 1990 case EIO_FUTIME:
2006 { 1991 {
2007 struct timeval tv[2]; 1992 struct timeval tv[2];
… …
2042 2027
2043 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;
2044 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;
2045 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2030 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
2046 2031
2047 case EIO_CLOSE: req->result = close (req->int1); break; 2032 case EIO_CLOSE: req->result = eio__close (req->int1); break;
2048 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2033 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
2049 case EIO_SYNC: req->result = 0; sync (); break; 2034 case EIO_SYNC: req->result = 0; sync (); break;
2050 case EIO_FSYNC: req->result = fsync (req->int1); break; 2035 case EIO_FSYNC: req->result = fsync (req->int1); break;
2051 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2036 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
2052 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2037 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
2072 req->result = select (0, 0, 0, 0, &tv); 2057 req->result = select (0, 0, 0, 0, &tv);
2073 } 2058 }
2074#endif 2059#endif
2075 break; 2060 break;
2076 2061
2062#if 0
2077 case EIO_GROUP: 2063 case EIO_GROUP:
2078 abort (); /* handled in eio_request */ 2064 abort (); /* handled in eio_request */
2065#endif
2079 2066
2080 case EIO_NOP: 2067 case EIO_NOP:
2081 req->result = 0; 2068 req->result = 0;
2082 break; 2069 break;
2083 2070
… …
2088 default: 2075 default:
2089 req->result = EIO_ENOSYS (); 2076 req->result = EIO_ENOSYS ();
2090 break; 2077 break;
2091 } 2078 }
2092 2079
2080alloc_fail:
2093 req->errorno = errno; 2081 req->errorno = errno;
2094} 2082}
2095 2083
2096#ifndef EIO_NO_WRAPPERS 2084#ifndef EIO_NO_WRAPPERS
2097 2085
… …
2186} 2174}
2187 2175
2188eio_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)
2189{ 2177{
2190 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;
2191} 2189}
2192 2190
2193eio_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)
2194{ 2192{
2195 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2193 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2340eio_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)
2341{ 2339{
2342 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2340 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2343} 2341}
2344 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
2345eio_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)
2346{ 2349{
2347 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2350 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2348} 2351}
2349 2352
… …
2383void 2386void
2384eio_grp_add (eio_req *grp, eio_req *req) 2387eio_grp_add (eio_req *grp, eio_req *req)
2385{ 2388{
2386 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));
2387 2390
2388 grp->flags |= EIO_FLAG_GROUPADD; 2391 grp->flags |= ETP_FLAG_GROUPADD;
2389 2392
2390 ++grp->size; 2393 ++grp->size;
2391 req->grp = grp; 2394 req->grp = grp;
2392 2395
2393 req->grp_prev = 0; 2396 req->grp_prev = 0;

Diff Legend

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