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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.41 by root, Sun Jun 14 20:36:59 2009 UTC vs.
Revision 1.61 by root, Fri Feb 11 00:53:24 2011 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 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 *
… …
49#include <stdlib.h> 49#include <stdlib.h>
50#include <string.h> 50#include <string.h>
51#include <errno.h> 51#include <errno.h>
52#include <sys/types.h> 52#include <sys/types.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/statvfs.h>
54#include <limits.h> 55#include <limits.h>
55#include <fcntl.h> 56#include <fcntl.h>
56#include <assert.h> 57#include <assert.h>
57 58
58#ifndef EIO_FINISH 59#ifndef EIO_FINISH
… …
73#else 74#else
74 75
75# include "config.h" 76# include "config.h"
76# include <sys/time.h> 77# include <sys/time.h>
77# include <sys/select.h> 78# include <sys/select.h>
78# include <sys/mman.h>
79# include <unistd.h> 79# include <unistd.h>
80# include <utime.h> 80# include <utime.h>
81# include <signal.h> 81# include <signal.h>
82# include <dirent.h> 82# include <dirent.h>
83 83
84#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
85# include <sys/mman.h>
86#endif
87
84/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 88/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
85# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) 89# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
86# define _DIRENT_HAVE_D_TYPE /* sigh */ 90# define _DIRENT_HAVE_D_TYPE /* sigh */
87# define D_INO(de) (de)->d_fileno 91# define D_INO(de) (de)->d_fileno
88# define D_NAMLEN(de) (de)->d_namlen 92# define D_NAMLEN(de) (de)->d_namlen
89# elif defined(__linux) || defined(d_ino) || _XOPEN_SOURCE >= 600 93# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
90# define D_INO(de) (de)->d_ino 94# define D_INO(de) (de)->d_ino
91# endif 95# endif
92 96
93#ifdef _D_EXACT_NAMLEN 97#ifdef _D_EXACT_NAMLEN
94# undef D_NAMLEN 98# undef D_NAMLEN
… …
106#endif 110#endif
107 111
108#if HAVE_SENDFILE 112#if HAVE_SENDFILE
109# if __linux 113# if __linux
110# include <sys/sendfile.h> 114# include <sys/sendfile.h>
111# elif __freebsd 115# elif __FreeBSD__ || defined __APPLE__
112# include <sys/socket.h> 116# include <sys/socket.h>
113# include <sys/uio.h> 117# include <sys/uio.h>
114# elif __hpux 118# elif __hpux
115# include <sys/socket.h> 119# include <sys/socket.h>
116# elif __solaris /* not yet */ 120# elif __solaris
117# include <sys/sendfile.h> 121# include <sys/sendfile.h>
118# else 122# else
119# error sendfile support requested but not available 123# error sendfile support requested but not available
120# endif 124# endif
121#endif 125#endif
… …
134#define IDLE_TIMEOUT 10 138#define IDLE_TIMEOUT 10
135 139
136/* used for struct dirent, AIX doesn't provide it */ 140/* used for struct dirent, AIX doesn't provide it */
137#ifndef NAME_MAX 141#ifndef NAME_MAX
138# define NAME_MAX 4096 142# define NAME_MAX 4096
143#endif
144
145/* used for readlink etc. */
146#ifndef PATH_MAX
147# define PATH_MAX 4096
139#endif 148#endif
140 149
141/* buffer size for various temporary buffers */ 150/* buffer size for various temporary buffers */
142#define EIO_BUFSIZE 65536 151#define EIO_BUFSIZE 65536
143 152
… …
196 205
197/*****************************************************************************/ 206/*****************************************************************************/
198 207
199#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 208#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
200 209
201/* calculcate time difference in ~1/EIO_TICKS of a second */ 210/* calculate time difference in ~1/EIO_TICKS of a second */
202static int tvdiff (struct timeval *tv1, struct timeval *tv2) 211static int tvdiff (struct timeval *tv1, struct timeval *tv2)
203{ 212{
204 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 213 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
205 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 214 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
206} 215}
… …
216static volatile unsigned int nreqs; /* reqlock */ 225static volatile unsigned int nreqs; /* reqlock */
217static volatile unsigned int nready; /* reqlock */ 226static volatile unsigned int nready; /* reqlock */
218static volatile unsigned int npending; /* reqlock */ 227static volatile unsigned int npending; /* reqlock */
219static volatile unsigned int max_idle = 4; 228static volatile unsigned int max_idle = 4;
220 229
221static mutex_t wrklock = X_MUTEX_INIT; 230static xmutex_t wrklock = X_MUTEX_INIT;
222static mutex_t reslock = X_MUTEX_INIT; 231static xmutex_t reslock = X_MUTEX_INIT;
223static mutex_t reqlock = X_MUTEX_INIT; 232static xmutex_t reqlock = X_MUTEX_INIT;
224static cond_t reqwait = X_COND_INIT; 233static xcond_t reqwait = X_COND_INIT;
225 234
226#if !HAVE_PREADWRITE 235#if !HAVE_PREADWRITE
227/* 236/*
228 * make our pread/pwrite emulation safe against themselves, but not against 237 * make our pread/pwrite emulation safe against themselves, but not against
229 * normal read/write by using a mutex. slows down execution a lot, 238 * normal read/write by using a mutex. slows down execution a lot,
230 * but that's your problem, not mine. 239 * but that's your problem, not mine.
231 */ 240 */
232static mutex_t preadwritelock = X_MUTEX_INIT; 241static xmutex_t preadwritelock = X_MUTEX_INIT;
233#endif 242#endif
234 243
235typedef struct etp_worker 244typedef struct etp_worker
236{ 245{
237 /* locked by wrklock */ 246 /* locked by wrklock */
238 struct etp_worker *prev, *next; 247 struct etp_worker *prev, *next;
239 248
240 thread_t tid; 249 xthread_t tid;
241 250
242 /* locked by reslock, reqlock or wrklock */ 251 /* locked by reslock, reqlock or wrklock */
243 ETP_REQ *req; /* currently processed request */ 252 ETP_REQ *req; /* currently processed request */
244 253
245 ETP_WORKER_COMMON 254 ETP_WORKER_COMMON
… …
598} 607}
599 608
600static void etp_set_max_poll_time (double nseconds) 609static void etp_set_max_poll_time (double nseconds)
601{ 610{
602 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 611 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
603 max_poll_time = nseconds; 612 max_poll_time = nseconds * EIO_TICKS;
604 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 613 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
605} 614}
606 615
607static void etp_set_max_poll_reqs (unsigned int maxreqs) 616static void etp_set_max_poll_reqs (unsigned int maxreqs)
608{ 617{
… …
807 816
808 return res; 817 return res;
809} 818}
810#endif 819#endif
811 820
812#ifndef HAVE_FUTIMES 821#ifndef HAVE_UTIMES
813 822
814# undef utimes 823# undef utimes
815# undef futimes
816# define utimes(path,times) eio__utimes (path, times) 824# define utimes(path,times) eio__utimes (path, times)
817# define futimes(fd,times) eio__futimes (fd, times)
818 825
819static int 826static int
820eio__utimes (const char *filename, const struct timeval times[2]) 827eio__utimes (const char *filename, const struct timeval times[2])
821{ 828{
822 if (times) 829 if (times)
… …
829 return utime (filename, &buf); 836 return utime (filename, &buf);
830 } 837 }
831 else 838 else
832 return utime (filename, 0); 839 return utime (filename, 0);
833} 840}
841
842#endif
843
844#ifndef HAVE_FUTIMES
845
846# undef futimes
847# define futimes(fd,times) eio__futimes (fd, times)
834 848
835static int eio__futimes (int fd, const struct timeval tv[2]) 849static int eio__futimes (int fd, const struct timeval tv[2])
836{ 850{
837 errno = ENOSYS; 851 errno = ENOSYS;
838 return -1; 852 return -1;
… …
867 if (!res || errno != ENOSYS) 881 if (!res || errno != ENOSYS)
868 return res; 882 return res;
869#endif 883#endif
870 884
871 /* even though we could play tricks with the flags, it's better to always 885 /* even though we could play tricks with the flags, it's better to always
872 * call fdatasync, as thta matches the expectation of it's users best */ 886 * call fdatasync, as that matches the expectation of its users best */
873 return fdatasync (fd); 887 return fdatasync (fd);
874} 888}
875 889
876#if !HAVE_READAHEAD 890#if !HAVE_READAHEAD
877# undef readahead 891# undef readahead
… …
909 923
910#if HAVE_SENDFILE 924#if HAVE_SENDFILE
911# if __linux 925# if __linux
912 res = sendfile (ofd, ifd, &offset, count); 926 res = sendfile (ofd, ifd, &offset, count);
913 927
914# elif __freebsd 928# elif __FreeBSD__
915 /* 929 /*
916 * Of course, the freebsd sendfile is a dire hack with no thoughts 930 * Of course, the freebsd sendfile is a dire hack with no thoughts
917 * wasted on making it similar to other I/O functions. 931 * wasted on making it similar to other I/O functions.
918 */ 932 */
919 { 933 {
920 off_t sbytes; 934 off_t sbytes;
921 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 935 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
922 936
923 if (res < 0 && sbytes) 937 #if 0 /* according to the manpage, this is correct, but broken behaviour */
924 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */ 938 /* freebsd' sendfile will return 0 on success */
939 /* freebsd 8 documents it as only setting *sbytes on EINTR and EAGAIN, but */
940 /* not on e.g. EIO or EPIPE - sounds broken */
941 if ((res < 0 && (errno == EAGAIN || errno == EINTR) && sbytes) || res == 0)
942 res = sbytes;
943 #endif
944
945 /* according to source inspection, this is correct, and useful behaviour */
946 if (sbytes)
947 res = sbytes;
948 }
949
950# elif defined (__APPLE__)
951
952 {
953 off_t sbytes = count;
954 res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
955
956 /* according to the manpage, sbytes is always valid */
957 if (sbytes)
925 res = sbytes; 958 res = sbytes;
926 } 959 }
927 960
928# elif __hpux 961# elif __hpux
929 res = sendfile (ofd, ifd, offset, count, 0, 0); 962 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
943 if (res < 0 && sbytes) 976 if (res < 0 && sbytes)
944 res = sbytes; 977 res = sbytes;
945 } 978 }
946 979
947# endif 980# endif
981
982#elif defined (_WIN32)
983
984 /* does not work, just for documentation of what would need to be done */
985 {
986 HANDLE h = TO_SOCKET (ifd);
987 SetFilePointer (h, offset, 0, FILE_BEGIN);
988 res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
989 }
990
948#else 991#else
949 res = -1; 992 res = -1;
950 errno = ENOSYS; 993 errno = ENOSYS;
951#endif 994#endif
952 995
953 if (res < 0 996 if (res < 0
954 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 997 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
998 /* BSDs */
999#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1000 || errno == ENOTSUP
1001#endif
1002 || errno == EOPNOTSUPP /* BSDs */
955#if __solaris 1003#if __solaris
956 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1004 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
957#endif 1005#endif
958 ) 1006 )
959 ) 1007 )
… …
993} 1041}
994 1042
995static signed char 1043static signed char
996eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1044eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
997{ 1045{
998 return b->score - a->score ? b->score - a->score /* works because our signed char is always 0..100 */ 1046 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
999 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; 1047 : a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
1000} 1048}
1001 1049
1002#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0 1050#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
1003#define EIO_DENT_NUM_SCORES 9
1004 1051
1005#define EIO_QSORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1052#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1006#define EIO_QSORT_SKIP 60 /* when to skip qsort completely */ 1053#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1007 1054
1008static void 1055static void
1009eio_dent_sort (eio_dirent *dents, int size) 1056eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1010{ 1057{
1011 if (size <= 1) 1058 unsigned char bits [9 + sizeof (ino_t) * 8];
1012 return; /* our insertion sort relies on size > 0 */ 1059 unsigned char *bit = bits;
1013 1060
1014 if (size > EIO_QSORT_SKIP) /* skip quicksort for small directories */ 1061 assert (CHAR_BIT == 8);
1062 assert (sizeof (eio_dirent) * 8 < 256);
1063 assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
1064 assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
1065
1066 if (size <= EIO_SORT_FAST)
1067 return;
1068
1069 /* first prepare an array of bits to test in our radix sort */
1070 /* try to take endianness into account, as well as differences in ino_t sizes */
1071 /* inode_bits must contain all inodes ORed together */
1072 /* which is used to skip bits that are 0 everywhere, which is very common */
1015 { 1073 {
1016 /* first, use quicksort */ 1074 ino_t endianness;
1017 /* should be good for 2**31 entries */
1018 int i; 1075 int i, j;
1019 struct rng { eio_dirent *l, *r; } rng [32];
1020 1076
1021 i = 0; 1077 /* we store the byte offset of byte n into byte n of "endianness" */
1022 rng[0].l = dents; 1078 for (i = 0; i < sizeof (ino_t); ++i)
1023 rng[0].r = dents + size; 1079 ((unsigned char *)&endianness)[i] = i;
1024 1080
1025 while (expect_true (i >= 0)) 1081 *bit++ = 0;
1082
1083 for (i = 0; i < sizeof (ino_t); ++i)
1026 { 1084 {
1027 eio_dirent *L = rng [i].l; 1085 /* shifting off the byte offsets out of "endianness" */
1028 eio_dirent *R = rng [i].r - 1; 1086 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1087 endianness >>= 8;
1029 1088
1030 if (expect_false (L + EIO_QSORT_CUTOFF < R)) 1089 for (j = 0; j < 8; ++j)
1090 if (inode_bits & (((ino_t)1) << (i * 8 + j)))
1091 *bit++ = offs + j;
1092 }
1093
1094 for (j = 0; j < 8; ++j)
1095 if (score_bits & (1 << j))
1096 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1097 }
1098
1099 /* now actually do the sorting (a variant of MSD radix sort) */
1100 {
1101 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base;
1102 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end;
1103 unsigned char *bit_stk [9 + sizeof (ino_t) * 8];
1104 int stk_idx = 0;
1105
1106 base_stk [stk_idx] = dents;
1107 end_stk [stk_idx] = dents + size;
1108 bit_stk [stk_idx] = bit - 1;
1109
1110 do
1111 {
1112 base = base_stk [stk_idx];
1113 end = end_stk [stk_idx];
1114 bit = bit_stk [stk_idx];
1115
1116 for (;;)
1031 { 1117 {
1032 eio_dirent *mid = &dents [((L - dents) + (R - dents)) >> 1]; 1118 unsigned char O = *bit >> 3;
1033 eio_dirent piv = *mid; *mid = *L; *L = piv; 1119 unsigned char M = 1 << (*bit & 7);
1034 1120
1035 while (L < R) 1121 eio_dirent *a = base;
1122 eio_dirent *b = end;
1123
1124 if (b - a < EIO_SORT_CUTOFF)
1125 break;
1126
1127 /* now bit-partition the array on the bit */
1128 /* this ugly asymmetric loop seems to perform much better than typical */
1129 /* partition algos found in the literature */
1130 do
1131 if (!(((unsigned char *)a)[O] & M))
1132 ++a;
1133 else if (!(((unsigned char *)--b)[O] & M))
1036 { 1134 {
1037 while (EIO_DENT_CMP (*R, >=, piv) && L < R) 1135 eio_dirent tmp = *a; *a = *b; *b = tmp;
1038 --R;
1039
1040 if (L < R)
1041 *L++ = *R;
1042
1043 while (EIO_DENT_CMP (*L, <=, piv) && L < R)
1044 ++L; 1136 ++a;
1045
1046 if (L < R)
1047 *R-- = *L;
1048 } 1137 }
1138 while (b > a);
1049 1139
1050 *L = piv; 1140 /* next bit, or stop, if no bits left in this path */
1141 if (!*--bit)
1142 break;
1051 1143
1144 base_stk [stk_idx] = a;
1145 end_stk [stk_idx] = end;
1146 bit_stk [stk_idx] = bit;
1052 ++i; 1147 ++stk_idx;
1053 rng [i].l = L + 1;
1054 rng [i].r = rng [i - 1].r;
1055 rng [i - 1].r = L;
1056 1148
1057 if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l) 1149 end = a;
1058 {
1059 struct rng t;
1060
1061 t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
1062 }
1063 } 1150 }
1064 else
1065 --i;
1066 } 1151 }
1152 while (stk_idx--);
1067 } 1153 }
1154}
1068 1155
1069 /* use an insertion sort after qsort, or for small arrays */ 1156static void
1157eio_dent_insertion_sort (eio_dirent *dents, int size)
1158{
1070 /* first move the smallest element to the front, to act as a sentinel */ 1159 /* first move the smallest element to the front, to act as a sentinel */
1071 { 1160 {
1072 int i; 1161 int i;
1073 eio_dirent *min = dents; 1162 eio_dirent *min = dents;
1074 1163
1164 /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
1075 for (i = size > EIO_QSORT_SKIP ? EIO_QSORT_CUTOFF + 1 : size; --i; ) 1165 for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
1076 if (EIO_DENT_CMP (dents [i], <, *min)) 1166 if (EIO_DENT_CMP (dents [i], <, *min))
1077 min = &dents [i]; 1167 min = &dents [i];
1078 1168
1079 /* swap elements 0 and j (minimum) */ 1169 /* swap elements 0 and j (minimum) */
1080 { 1170 {
1081 eio_dirent tmp = *dents; *dents = *min; *min = tmp; 1171 eio_dirent tmp = *dents; *dents = *min; *min = tmp;
1082 } 1172 }
1083 } 1173 }
1084 1174
1175 /* then do standard insertion sort, assuming that all elements are >= dents [0] */
1085 { 1176 {
1086 /* then do standard insertion sort */
1087 eio_dirent *i, *j; 1177 eio_dirent *i, *j;
1088 1178
1089 for (i = dents + 1; i < dents + size; ++i) 1179 for (i = dents + 1; i < dents + size; ++i)
1090 { 1180 {
1091 eio_dirent value = *i; 1181 eio_dirent value = *i;
… …
1094 j [1] = j [0]; 1184 j [1] = j [0];
1095 1185
1096 j [1] = value; 1186 j [1] = value;
1097 } 1187 }
1098 } 1188 }
1189}
1190
1191static void
1192eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
1193{
1194 if (size <= 1)
1195 return; /* our insertion sort relies on size > 0 */
1196
1197 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
1198 /* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
1199 eio_dent_radix_sort (dents, size, score_bits, inode_bits);
1200
1201 /* use an insertion sort at the end, or for small arrays, */
1202 /* as insertion sort is more efficient for small partitions */
1203 eio_dent_insertion_sort (dents, size);
1099} 1204}
1100 1205
1101/* read a full directory */ 1206/* read a full directory */
1102static void 1207static void
1103eio__scandir (eio_req *req, etp_worker *self) 1208eio__scandir (eio_req *req, etp_worker *self)
… …
1109 int namesoffs = 0; 1214 int namesoffs = 0;
1110 int flags = req->int1; 1215 int flags = req->int1;
1111 eio_dirent *dents = 0; 1216 eio_dirent *dents = 0;
1112 int dentalloc = 128; 1217 int dentalloc = 128;
1113 int dentoffs = 0; 1218 int dentoffs = 0;
1219 ino_t inode_bits = 0;
1114 1220
1115 req->result = -1; 1221 req->result = -1;
1116 1222
1117 if (!(flags & EIO_READDIR_DENTS)) 1223 if (!(flags & EIO_READDIR_DENTS))
1118 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1224 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1119 1225
1120 X_LOCK (wrklock); 1226 X_LOCK (wrklock);
1121 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1227 /* the corresponding closedir is in ETP_WORKER_CLEAR */
1122 self->dirp = dirp = opendir (req->ptr1); 1228 self->dirp = dirp = opendir (req->ptr1);
1123 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1229 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1124 req->ptr1 = names = malloc (namesalloc);
1125 req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1230 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1231 req->ptr2 = names = malloc (namesalloc);
1126 X_UNLOCK (wrklock); 1232 X_UNLOCK (wrklock);
1127 1233
1128 if (dirp && names && (!flags || dents)) 1234 if (dirp && names && (!flags || dents))
1129 for (;;) 1235 for (;;)
1130 { 1236 {
… …
1138 1244
1139 /* sort etc. */ 1245 /* sort etc. */
1140 req->int1 = flags; 1246 req->int1 = flags;
1141 req->result = dentoffs; 1247 req->result = dentoffs;
1142 1248
1143 if (dents)
1144 {
1145 eio_dirent *ent = dents + dentoffs;
1146
1147 while (ent > dents)
1148 (--ent)->name = names + (size_t)ent->name;
1149 }
1150
1151 if (flags & EIO_READDIR_STAT_ORDER 1249 if (flags & EIO_READDIR_STAT_ORDER)
1152 || !(~flags & (EIO_READDIR_DIRS_FIRST | EIO_READDIR_FOUND_UNKNOWN))) 1250 eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
1153 eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
1154 else if (flags & EIO_READDIR_DIRS_FIRST) 1251 else if (flags & EIO_READDIR_DIRS_FIRST)
1252 if (flags & EIO_READDIR_FOUND_UNKNOWN)
1253 eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
1254 else
1155 { 1255 {
1156 /* in this case, all is known, and we just put dirs first and sort them */ 1256 /* in this case, all is known, and we just put dirs first and sort them */
1157 eio_dirent *ent = dents + dentoffs; 1257 eio_dirent *oth = dents + dentoffs;
1158 eio_dirent *dir = dents; 1258 eio_dirent *dir = dents;
1159 1259
1160 /* now move dirs to the front, and non-dirs to the back */ 1260 /* now partition dirs to the front, and non-dirs to the back */
1161 /* by walking from both sides and swapping if necessary */ 1261 /* by walking from both sides and swapping if necessary */
1262 /* also clear score, so it doesn't influence sorting */
1162 while (ent > dir) 1263 while (oth > dir)
1163 {
1164 if (dir->type == DT_DIR)
1165 { 1264 {
1166 dir->score = 0; 1265 if (dir->type == EIO_DT_DIR)
1167 ++dir; 1266 ++dir;
1168 }
1169 else
1170 {
1171 --ent;
1172
1173 if (ent->type == DT_DIR) 1267 else if ((--oth)->type == EIO_DT_DIR)
1174 { 1268 {
1175 eio_dirent tmp = *dir; 1269 eio_dirent tmp = *dir; *dir = *oth; *oth = tmp;
1176 *dir = *ent;
1177 *ent = tmp;
1178 1270
1179 dir->score = 0;
1180 ++dir; 1271 ++dir;
1181 } 1272 }
1182 } 1273 }
1183 }
1184 1274
1185 /* now sort the dirs only */ 1275 /* now sort the dirs only */
1186 eio_dent_sort (dents, dir - dents); 1276 eio_dent_sort (dents, dir - dents, 0, inode_bits);
1187 } 1277 }
1188
1189 /* only provide the names array unless DENTS is specified */
1190 if (!(flags & EIO_READDIR_DENTS))
1191 {
1192 X_LOCK (wrklock);
1193 assert (!dents);
1194 req->ptr1 = 0;
1195 req->ptr2 = names;
1196 X_UNLOCK (wrklock);
1197 }
1198 1278
1199 break; 1279 break;
1200 } 1280 }
1201 1281
1202 /* now add the entry to our list(s) */ 1282 /* now add the entry to our list(s) */
… …
1209 1289
1210 while (expect_false (namesoffs + len > namesalloc)) 1290 while (expect_false (namesoffs + len > namesalloc))
1211 { 1291 {
1212 namesalloc *= 2; 1292 namesalloc *= 2;
1213 X_LOCK (wrklock); 1293 X_LOCK (wrklock);
1214 req->ptr1 = names = realloc (names, namesalloc); 1294 req->ptr2 = names = realloc (names, namesalloc);
1215 X_UNLOCK (wrklock); 1295 X_UNLOCK (wrklock);
1216 1296
1217 if (!names) 1297 if (!names)
1218 break; 1298 break;
1219 } 1299 }
… …
1226 1306
1227 if (expect_false (dentoffs == dentalloc)) 1307 if (expect_false (dentoffs == dentalloc))
1228 { 1308 {
1229 dentalloc *= 2; 1309 dentalloc *= 2;
1230 X_LOCK (wrklock); 1310 X_LOCK (wrklock);
1231 req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1311 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1232 X_UNLOCK (wrklock); 1312 X_UNLOCK (wrklock);
1233 1313
1234 if (!dents) 1314 if (!dents)
1235 break; 1315 break;
1236 } 1316 }
1237 1317
1238 ent = dents + dentoffs; 1318 ent = dents + dentoffs;
1239 1319
1240 ent->name = (char *)(size_t)namesoffs; /* rather dirtily we store the offset in the pointer */ 1320 ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
1241 ent->namelen = len - 1; 1321 ent->namelen = len - 1;
1242 ent->inode = D_INO (entp) ? D_INO (entp) : dentoffs; 1322 ent->inode = D_INO (entp);
1323
1324 inode_bits |= ent->inode;
1243 1325
1244 switch (D_TYPE (entp)) 1326 switch (D_TYPE (entp))
1245 { 1327 {
1246 default: 1328 default:
1247 ent->type = EIO_DT_UNKNOWN; 1329 ent->type = EIO_DT_UNKNOWN;
… …
1290 #ifdef DT_WHT 1372 #ifdef DT_WHT
1291 case DT_WHT: ent->type = EIO_DT_WHT; break; 1373 case DT_WHT: ent->type = EIO_DT_WHT; break;
1292 #endif 1374 #endif
1293 } 1375 }
1294 1376
1295 ent->score = 0; 1377 ent->score = 7;
1296 1378
1297 if (flags & EIO_READDIR_DIRS_FIRST) 1379 if (flags & EIO_READDIR_DIRS_FIRST)
1298 { 1380 {
1299 if (ent->type == EIO_DT_UNKNOWN) 1381 if (ent->type == EIO_DT_UNKNOWN)
1300 { 1382 {
1301 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */ 1383 if (*name == '.') /* leading dots are likely directories, and, in any case, rare */
1302 ent->score = 7; 1384 ent->score = 1;
1303 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */ 1385 else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
1304 ent->score = len <= 2 ? len + 4 : len <= 4 ? 3 : len <= 7 ? 2 : 1; /* shorter == more likely dir, but avoid too many classes */ 1386 ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
1305 } 1387 }
1306 else if (ent->type == EIO_DT_DIR) 1388 else if (ent->type == EIO_DT_DIR)
1307 ent->score = 8; 1389 ent->score = 0;
1308 } 1390 }
1309 } 1391 }
1310 1392
1311 namesoffs += len; 1393 namesoffs += len;
1312 ++dentoffs; 1394 ++dentoffs;
… …
1318 break; 1400 break;
1319 } 1401 }
1320 } 1402 }
1321} 1403}
1322 1404
1405#ifdef PAGESIZE
1406# define eio_pagesize() PAGESIZE
1407#else
1408static intptr_t
1409eio_pagesize (void)
1410{
1411 static intptr_t page;
1412
1413 if (!page)
1414 page = sysconf (_SC_PAGESIZE);
1415
1416 return page;
1417}
1418#endif
1419
1420static void
1421eio_page_align (void **addr, size_t *length)
1422{
1423 intptr_t mask = eio_pagesize () - 1;
1424
1425 /* round down addr */
1426 intptr_t adj = mask & (intptr_t)*addr;
1427
1428 *addr = (void *)((intptr_t)*addr - adj);
1429 *length += adj;
1430
1431 /* round up length */
1432 *length = (*length + mask) & ~mask;
1433}
1434
1435#if !_POSIX_MEMLOCK
1436# define eio__mlockall(a) ((errno = ENOSYS), -1)
1437#else
1438
1439static int
1440eio__mlockall (int flags)
1441{
1442 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1443 extern int mallopt (int, int);
1444 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1445 #endif
1446
1447 if (EIO_MCL_CURRENT != MCL_CURRENT
1448 || EIO_MCL_FUTURE != MCL_FUTURE)
1449 {
1450 flags = 0
1451 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1452 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1453 }
1454
1455 return mlockall (flags);
1456}
1457#endif
1458
1459#if !_POSIX_MEMLOCK_RANGE
1460# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1461#else
1462
1463static int
1464eio__mlock (void *addr, size_t length)
1465{
1466 eio_page_align (&addr, &length);
1467
1468 return mlock (addr, length);
1469}
1470
1471#endif
1472
1323#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO) 1473#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1324# undef msync
1325# define msync(a,b,c) ((errno = ENOSYS), -1) 1474# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1475#else
1476
1477int
1478eio__msync (void *mem, size_t len, int flags)
1479{
1480 eio_page_align (&mem, &len);
1481
1482 if (EIO_MS_ASYNC != MS_SYNC
1483 || EIO_MS_INVALIDATE != MS_INVALIDATE
1484 || EIO_MS_SYNC != MS_SYNC)
1485 {
1486 flags = 0
1487 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1488 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1489 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1490 }
1491
1492 return msync (mem, len, flags);
1493}
1494
1326#endif 1495#endif
1327 1496
1328int 1497int
1329eio__mtouch (void *mem, size_t len, int flags) 1498eio__mtouch (void *mem, size_t len, int flags)
1330{ 1499{
1500 eio_page_align (&mem, &len);
1501
1502 {
1331 intptr_t addr = (intptr_t)mem; 1503 intptr_t addr = (intptr_t)mem;
1332 intptr_t end = addr + len; 1504 intptr_t end = addr + len;
1333#ifdef PAGESIZE 1505 intptr_t page = eio_pagesize ();
1334 const intptr_t page = PAGESIZE;
1335#else
1336 static intptr_t page;
1337 1506
1338 if (!page)
1339 page = sysconf (_SC_PAGESIZE);
1340#endif
1341
1342 addr &= ~(page - 1); /* assume page size is always a power of two */
1343
1344 if (addr < end) 1507 if (addr < end)
1345 if (flags) /* modify */ 1508 if (flags & EIO_MT_MODIFY) /* modify */
1346 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len); 1509 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1347 else 1510 else
1348 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len); 1511 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1512 }
1349 1513
1350 return 0; 1514 return 0;
1351} 1515}
1352 1516
1353/*****************************************************************************/ 1517/*****************************************************************************/
… …
1476 return 0; \ 1640 return 0; \
1477 } 1641 }
1478 1642
1479static void eio_execute (etp_worker *self, eio_req *req) 1643static void eio_execute (etp_worker *self, eio_req *req)
1480{ 1644{
1481 errno = 0;
1482
1483 switch (req->type) 1645 switch (req->type)
1484 { 1646 {
1485 case EIO_READ: ALLOC (req->size); 1647 case EIO_READ: ALLOC (req->size);
1486 req->result = req->offs >= 0 1648 req->result = req->offs >= 0
1487 ? pread (req->int1, req->ptr2, req->size, req->offs) 1649 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1498 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1660 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1499 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break; 1661 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1500 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT)); 1662 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1501 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break; 1663 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1502 1664
1665 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1666 req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1667 case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1668 req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1669
1503 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; 1670 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1504 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 1671 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1505 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break; 1672 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1506 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 1673 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1507 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1674 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
… …
1514 case EIO_RMDIR: req->result = rmdir (req->ptr1); break; 1681 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1515 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break; 1682 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1516 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 1683 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1517 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 1684 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1518 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 1685 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1519 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break; 1686 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1520 1687
1521 case EIO_READLINK: ALLOC (NAME_MAX); 1688 case EIO_READLINK: ALLOC (PATH_MAX);
1522 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1689 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1523 1690
1524 case EIO_SYNC: req->result = 0; sync (); break; 1691 case EIO_SYNC: req->result = 0; sync (); break;
1525 case EIO_FSYNC: req->result = fsync (req->int1); break; 1692 case EIO_FSYNC: req->result = fsync (req->int1); break;
1526 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1693 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1527 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break; 1694 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1528 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break; 1695 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1696 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1697 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1529 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 1698 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1530 1699
1531 case EIO_READDIR: eio__scandir (req, self); break; 1700 case EIO_READDIR: eio__scandir (req, self); break;
1532 1701
1533 case EIO_BUSY: 1702 case EIO_BUSY:
1534#ifdef _WIN32 1703#ifdef _WIN32
1535 Sleep (req->nv1 * 1000.); 1704 Sleep (req->nv1 * 1e3);
1536#else 1705#else
1537 { 1706 {
1538 struct timeval tv; 1707 struct timeval tv;
1539 1708
1540 tv.tv_sec = req->nv1; 1709 tv.tv_sec = req->nv1;
1541 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.; 1710 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1542 1711
1543 req->result = select (0, 0, 0, 0, &tv); 1712 req->result = select (0, 0, 0, 0, &tv);
1544 } 1713 }
1545#endif 1714#endif
1546 break; 1715 break;
… …
1561 times = tv; 1730 times = tv;
1562 } 1731 }
1563 else 1732 else
1564 times = 0; 1733 times = 0;
1565 1734
1566
1567 req->result = req->type == EIO_FUTIME 1735 req->result = req->type == EIO_FUTIME
1568 ? futimes (req->int1, times) 1736 ? futimes (req->int1, times)
1569 : utimes (req->ptr1, times); 1737 : utimes (req->ptr1, times);
1570 } 1738 }
1571 break; 1739 break;
… …
1580 case EIO_CUSTOM: 1748 case EIO_CUSTOM:
1581 ((void (*)(eio_req *))req->feed) (req); 1749 ((void (*)(eio_req *))req->feed) (req);
1582 break; 1750 break;
1583 1751
1584 default: 1752 default:
1753 errno = ENOSYS;
1585 req->result = -1; 1754 req->result = -1;
1586 break; 1755 break;
1587 } 1756 }
1588 1757
1589 req->errorno = errno; 1758 req->errorno = errno;
… …
1619eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) 1788eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1620{ 1789{
1621 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND; 1790 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1622} 1791}
1623 1792
1793eio_req *eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data)
1794{
1795 REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
1796}
1797
1798eio_req *eio_mlockall (int flags, int pri, eio_cb cb, void *data)
1799{
1800 REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
1801}
1802
1624eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 1803eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1625{ 1804{
1626 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 1805 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1627} 1806}
1628 1807
… …
1652} 1831}
1653 1832
1654eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 1833eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
1655{ 1834{
1656 REQ (EIO_FSTAT); req->int1 = fd; SEND; 1835 REQ (EIO_FSTAT); req->int1 = fd; SEND;
1836}
1837
1838eio_req *eio_fstatvfs (int fd, int pri, eio_cb cb, void *data)
1839{
1840 REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1657} 1841}
1658 1842
1659eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data) 1843eio_req *eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void *data)
1660{ 1844{
1661 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND; 1845 REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
… …
1735eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data) 1919eio_req *eio_lstat (const char *path, int pri, eio_cb cb, void *data)
1736{ 1920{
1737 return eio__1path (EIO_LSTAT, path, pri, cb, data); 1921 return eio__1path (EIO_LSTAT, path, pri, cb, data);
1738} 1922}
1739 1923
1924eio_req *eio_statvfs (const char *path, int pri, eio_cb cb, void *data)
1925{
1926 return eio__1path (EIO_STATVFS, path, pri, cb, data);
1927}
1928
1740eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data) 1929eio_req *eio_unlink (const char *path, int pri, eio_cb cb, void *data)
1741{ 1930{
1742 return eio__1path (EIO_UNLINK, path, pri, cb, data); 1931 return eio__1path (EIO_UNLINK, path, pri, cb, data);
1743} 1932}
1744 1933
… …
1752 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND; 1941 REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1753} 1942}
1754 1943
1755eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1944eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1756{ 1945{
1757 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND; 1946 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1758} 1947}
1759 1948
1760static eio_req * 1949static eio_req *
1761eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1950eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1762{ 1951{

Diff Legend

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