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

Comparing libeio/eio.c (file contents):
Revision 1.14 by root, Sat May 17 12:17:25 2008 UTC vs.
Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC

… …
123/*****************************************************************************/ 123/*****************************************************************************/
124 124
125#define ETP_PRI_MIN EIO_PRI_MIN 125#define ETP_PRI_MIN EIO_PRI_MIN
126#define ETP_PRI_MAX EIO_PRI_MAX 126#define ETP_PRI_MAX EIO_PRI_MAX
127 127
128struct etp_worker;
129
128#define ETP_REQ eio_req 130#define ETP_REQ eio_req
129#define ETP_DESTROY(req) eio_destroy (req) 131#define ETP_DESTROY(req) eio_destroy (req)
130static int eio_finish (eio_req *req); 132static int eio_finish (eio_req *req);
131#define ETP_FINISH(req) eio_finish (req) 133#define ETP_FINISH(req) eio_finish (req)
134static void eio_execute (struct etp_worker *self, eio_req *req);
135#define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
132 136
133#define ETP_WORKER_CLEAR(req) \ 137#define ETP_WORKER_CLEAR(req) \
134 if (wrk->dbuf) \ 138 if (wrk->dbuf) \
135 { \ 139 { \
136 free (wrk->dbuf); \ 140 free (wrk->dbuf); \
… …
310 X_LOCK (reqlock); 314 X_LOCK (reqlock);
311 X_LOCK (reslock); 315 X_LOCK (reslock);
312#if !HAVE_PREADWRITE 316#if !HAVE_PREADWRITE
313 X_LOCK (preadwritelock); 317 X_LOCK (preadwritelock);
314#endif 318#endif
315#if !HAVE_READDIR_R
316 X_LOCK (readdirlock);
317#endif
318} 319}
319 320
320static void etp_atfork_parent (void) 321static void etp_atfork_parent (void)
321{ 322{
322#if !HAVE_READDIR_R
323 X_UNLOCK (readdirlock);
324#endif
325#if !HAVE_PREADWRITE 323#if !HAVE_PREADWRITE
326 X_UNLOCK (preadwritelock); 324 X_UNLOCK (preadwritelock);
327#endif 325#endif
328 X_UNLOCK (reslock); 326 X_UNLOCK (reslock);
329 X_UNLOCK (reqlock); 327 X_UNLOCK (reqlock);
… …
797 return count; 795 return count;
798} 796}
799 797
800#endif 798#endif
801 799
802#if !HAVE_READDIR_R
803# define readdir_r eio__readdir_r
804
805static mutex_t readdirlock = X_MUTEX_INIT;
806
807static int
808eio__readdir_r (DIR *dirp, EIO_STRUCT_DIRENT *ent, EIO_STRUCT_DIRENT **res)
809{
810 EIO_STRUCT_DIRENT *e;
811 int errorno;
812
813 X_LOCK (readdirlock);
814
815 e = readdir (dirp);
816 errorno = errno;
817
818 if (e)
819 {
820 *res = ent;
821 strcpy (ent->d_name, e->d_name);
822 }
823 else
824 *res = 0;
825
826 X_UNLOCK (readdirlock);
827
828 errno = errorno;
829 return e ? 0 : -1;
830}
831#endif
832
833/* sendfile always needs emulation */ 800/* sendfile always needs emulation */
834static ssize_t 801static ssize_t
835eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 802eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
836{ 803{
837 ssize_t res; 804 ssize_t res;
… …
927/* read a full directory */ 894/* read a full directory */
928static void 895static void
929eio__scandir (eio_req *req, etp_worker *self) 896eio__scandir (eio_req *req, etp_worker *self)
930{ 897{
931 DIR *dirp; 898 DIR *dirp;
932 union
933 {
934 EIO_STRUCT_DIRENT d;
935 char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
936 } *u;
937 EIO_STRUCT_DIRENT *entp; 899 EIO_STRUCT_DIRENT *entp;
938 char *name, *names; 900 char *name, *names;
939 int memlen = 4096; 901 int memlen = 4096;
940 int memofs = 0; 902 int memofs = 0;
941 int res = 0; 903 int res = 0;
942 904
943 X_LOCK (wrklock); 905 X_LOCK (wrklock);
944 self->dirp = dirp = opendir (req->ptr1); 906 self->dirp = dirp = opendir (req->ptr1);
945 self->dbuf = u = malloc (sizeof (*u));
946 req->flags |= EIO_FLAG_PTR2_FREE; 907 req->flags |= EIO_FLAG_PTR2_FREE;
947 req->ptr2 = names = malloc (memlen); 908 req->ptr2 = names = malloc (memlen);
948 X_UNLOCK (wrklock); 909 X_UNLOCK (wrklock);
949 910
950 if (dirp && u && names) 911 if (dirp && names)
951 for (;;) 912 for (;;)
952 { 913 {
953 errno = 0; 914 errno = 0;
954 readdir_r (dirp, &u->d, &entp); 915 entp = readdir (dirp);
955 916
956 if (!entp) 917 if (!entp)
957 break; 918 break;
958 919
959 name = entp->d_name; 920 name = entp->d_name;
… …
1047 1008
1048 --nready; 1009 --nready;
1049 1010
1050 X_UNLOCK (reqlock); 1011 X_UNLOCK (reqlock);
1051 1012
1052 errno = 0; /* strictly unnecessary */ 1013 if (req->type < 0)
1014 goto quit;
1053 1015
1054 if (!EIO_CANCELLED (req)) 1016 if (!EIO_CANCELLED (req))
1055 switch (req->type) 1017 ETP_EXECUTE (self, req);
1056 {
1057 case EIO_READ: ALLOC (req->size);
1058 req->result = req->offs >= 0
1059 ? pread (req->int1, req->ptr2, req->size, req->offs)
1060 : read (req->int1, req->ptr2, req->size); break;
1061 case EIO_WRITE: req->result = req->offs >= 0
1062 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1063 : write (req->int1, req->ptr2, req->size); break;
1064
1065 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1066 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1067
1068 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1069 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1070 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1071 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1072 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1073 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1074
1075 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1076 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1077 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1078 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1079 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1080 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1081
1082 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1083 case EIO_CLOSE: req->result = close (req->int1); break;
1084 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1085 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1086 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1087 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1088 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1089 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1090 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1091 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1092
1093 case EIO_READLINK: ALLOC (NAME_MAX);
1094 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1095
1096 case EIO_SYNC: req->result = 0; sync (); break;
1097 case EIO_FSYNC: req->result = fsync (req->int1); break;
1098 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1099
1100 case EIO_READDIR: eio__scandir (req, self); break;
1101
1102 case EIO_BUSY:
1103#ifdef _WIN32
1104 Sleep (req->nv1 * 1000.);
1105#else
1106 {
1107 struct timeval tv;
1108
1109 tv.tv_sec = req->nv1;
1110 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1111
1112 req->result = select (0, 0, 0, 0, &tv);
1113 }
1114#endif
1115 break;
1116
1117 case EIO_UTIME:
1118 case EIO_FUTIME:
1119 {
1120 struct timeval tv[2];
1121 struct timeval *times;
1122
1123 if (req->nv1 != -1. || req->nv2 != -1.)
1124 {
1125 tv[0].tv_sec = req->nv1;
1126 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1127 tv[1].tv_sec = req->nv2;
1128 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1129
1130 times = tv;
1131 }
1132 else
1133 times = 0;
1134
1135
1136 req->result = req->type == EIO_FUTIME
1137 ? futimes (req->int1, times)
1138 : utimes (req->ptr1, times);
1139 }
1140
1141 case EIO_GROUP:
1142 case EIO_NOP:
1143 req->result = 0;
1144 break;
1145
1146 case -1:
1147 goto quit;
1148
1149 default:
1150 req->result = -1;
1151 break;
1152 }
1153
1154 req->errorno = errno;
1155 1018
1156 X_LOCK (reslock); 1019 X_LOCK (reslock);
1157 1020
1158 ++npending; 1021 ++npending;
1159 1022
… …
1208 { \ 1071 { \
1209 eio_api_destroy (req); \ 1072 eio_api_destroy (req); \
1210 return 0; \ 1073 return 0; \
1211 } 1074 }
1212 1075
1076static void eio_execute (etp_worker *self, eio_req *req)
1077{
1078 errno = 0;
1079
1080 switch (req->type)
1081 {
1082 case EIO_READ: ALLOC (req->size);
1083 req->result = req->offs >= 0
1084 ? pread (req->int1, req->ptr2, req->size, req->offs)
1085 : read (req->int1, req->ptr2, req->size); break;
1086 case EIO_WRITE: req->result = req->offs >= 0
1087 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1088 : write (req->int1, req->ptr2, req->size); break;
1089
1090 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1091 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1092
1093 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1094 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1095 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1096 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1097 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1098 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1099
1100 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1101 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1102 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1103 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1104 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1105 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1106
1107 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1108 case EIO_CLOSE: req->result = close (req->int1); break;
1109 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1110 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1111 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1112 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1113 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1114 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1115 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1116 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1117
1118 case EIO_READLINK: ALLOC (NAME_MAX);
1119 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1120
1121 case EIO_SYNC: req->result = 0; sync (); break;
1122 case EIO_FSYNC: req->result = fsync (req->int1); break;
1123 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1124
1125 case EIO_READDIR: eio__scandir (req, self); break;
1126
1127 case EIO_BUSY:
1128#ifdef _WIN32
1129 Sleep (req->nv1 * 1000.);
1130#else
1131 {
1132 struct timeval tv;
1133
1134 tv.tv_sec = req->nv1;
1135 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1136
1137 req->result = select (0, 0, 0, 0, &tv);
1138 }
1139#endif
1140 break;
1141
1142 case EIO_UTIME:
1143 case EIO_FUTIME:
1144 {
1145 struct timeval tv[2];
1146 struct timeval *times;
1147
1148 if (req->nv1 != -1. || req->nv2 != -1.)
1149 {
1150 tv[0].tv_sec = req->nv1;
1151 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1152 tv[1].tv_sec = req->nv2;
1153 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1154
1155 times = tv;
1156 }
1157 else
1158 times = 0;
1159
1160
1161 req->result = req->type == EIO_FUTIME
1162 ? futimes (req->int1, times)
1163 : utimes (req->ptr1, times);
1164 }
1165
1166 case EIO_GROUP:
1167 case EIO_NOP:
1168 req->result = 0;
1169 break;
1170
1171 case EIO_CUSTOM:
1172 req->feed (req);
1173 break;
1174
1175 default:
1176 req->result = -1;
1177 break;
1178 }
1179
1180 req->errorno = errno;
1181}
1182
1213#ifndef EIO_NO_WRAPPERS 1183#ifndef EIO_NO_WRAPPERS
1214 1184
1215eio_req *eio_nop (int pri, eio_cb cb, void *data) 1185eio_req *eio_nop (int pri, eio_cb cb, void *data)
1216{ 1186{
1217 REQ (EIO_NOP); SEND; 1187 REQ (EIO_NOP); SEND;
… …
1392eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1362eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1393{ 1363{
1394 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1364 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1395} 1365}
1396 1366
1367eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1368{
1369 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1370}
1371
1397#endif 1372#endif
1398 1373
1399eio_req *eio_grp (eio_cb cb, void *data) 1374eio_req *eio_grp (eio_cb cb, void *data)
1400{ 1375{
1401 const int pri = EIO_PRI_MAX; 1376 const int pri = EIO_PRI_MAX;

Diff Legend

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