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.14 by root, Sat May 17 12:17:25 2008 UTC vs.
Revision 1.22 by root, Fri Jul 11 10:54:50 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); \
… …
173static mutex_t wrklock = X_MUTEX_INIT; 177static mutex_t wrklock = X_MUTEX_INIT;
174static mutex_t reslock = X_MUTEX_INIT; 178static mutex_t reslock = X_MUTEX_INIT;
175static mutex_t reqlock = X_MUTEX_INIT; 179static mutex_t reqlock = X_MUTEX_INIT;
176static cond_t reqwait = X_COND_INIT; 180static cond_t reqwait = X_COND_INIT;
177 181
182#if !HAVE_PREADWRITE
183/*
184 * make our pread/pwrite emulation safe against themselves, but not against
185 * normal read/write by using a mutex. slows down execution a lot,
186 * but that's your problem, not mine.
187 */
188static mutex_t preadwritelock = X_MUTEX_INIT;
189#endif
190
178typedef struct etp_worker 191typedef struct etp_worker
179{ 192{
180 /* locked by wrklock */ 193 /* locked by wrklock */
181 struct etp_worker *prev, *next; 194 struct etp_worker *prev, *next;
182 195
… …
310 X_LOCK (reqlock); 323 X_LOCK (reqlock);
311 X_LOCK (reslock); 324 X_LOCK (reslock);
312#if !HAVE_PREADWRITE 325#if !HAVE_PREADWRITE
313 X_LOCK (preadwritelock); 326 X_LOCK (preadwritelock);
314#endif 327#endif
315#if !HAVE_READDIR_R
316 X_LOCK (readdirlock);
317#endif
318} 328}
319 329
320static void etp_atfork_parent (void) 330static void etp_atfork_parent (void)
321{ 331{
322#if !HAVE_READDIR_R
323 X_UNLOCK (readdirlock);
324#endif
325#if !HAVE_PREADWRITE 332#if !HAVE_PREADWRITE
326 X_UNLOCK (preadwritelock); 333 X_UNLOCK (preadwritelock);
327#endif 334#endif
328 X_UNLOCK (reslock); 335 X_UNLOCK (reslock);
329 X_UNLOCK (reqlock); 336 X_UNLOCK (reqlock);
… …
332 339
333static void etp_atfork_child (void) 340static void etp_atfork_child (void)
334{ 341{
335 ETP_REQ *prv; 342 ETP_REQ *prv;
336 343
337 while (prv = reqq_shift (&req_queue)) 344 while ((prv = reqq_shift (&req_queue)))
338 ETP_DESTROY (prv); 345 ETP_DESTROY (prv);
339 346
340 while (prv = reqq_shift (&res_queue)) 347 while ((prv = reqq_shift (&res_queue)))
341 ETP_DESTROY (prv); 348 ETP_DESTROY (prv);
342 349
343 while (wrk_first.next != &wrk_first) 350 while (wrk_first.next != &wrk_first)
344 { 351 {
345 etp_worker *wrk = wrk_first.next; 352 etp_worker *wrk = wrk_first.next;
… …
373 380
374 pthread_once (&doinit, etp_once_init); 381 pthread_once (&doinit, etp_once_init);
375 382
376 want_poll_cb = want_poll; 383 want_poll_cb = want_poll;
377 done_poll_cb = done_poll; 384 done_poll_cb = done_poll;
385
386 return 0;
378} 387}
379 388
380X_THREAD_PROC (etp_proc); 389X_THREAD_PROC (etp_proc);
381 390
382static void etp_start_thread (void) 391static void etp_start_thread (void)
… …
700 709
701#if !HAVE_PREADWRITE 710#if !HAVE_PREADWRITE
702# define pread eio__pread 711# define pread eio__pread
703# define pwrite eio__pwrite 712# define pwrite eio__pwrite
704 713
705/*
706 * make our pread/pwrite safe against themselves, but not against
707 * normal read/write by using a mutex. slows down execution a lot,
708 * but that's your problem, not mine.
709 */
710static mutex_t preadwritelock = X_MUTEX_INIT;
711
712static ssize_t 714static ssize_t
713eio__pread (int fd, void *buf, size_t count, off_t offset) 715eio__pread (int fd, void *buf, size_t count, off_t offset)
714{ 716{
715 ssize_t res; 717 ssize_t res;
716 off_t ooffset; 718 off_t ooffset;
… …
777 779
778#if !HAVE_READAHEAD 780#if !HAVE_READAHEAD
779# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 781# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
780 782
781static ssize_t 783static ssize_t
782eio__readahead (int fd, off_t offset, size_t count, worker *self) 784eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
783{ 785{
784 size_t todo = count; 786 size_t todo = count;
785 dBUF; 787 dBUF;
786 788
787 while (todo > 0) 789 while (todo > 0)
… …
795 797
796 errno = 0; 798 errno = 0;
797 return count; 799 return count;
798} 800}
799 801
800#endif
801
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 802#endif
832 803
833/* sendfile always needs emulation */ 804/* sendfile always needs emulation */
834static ssize_t 805static ssize_t
835eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 806eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
… …
927/* read a full directory */ 898/* read a full directory */
928static void 899static void
929eio__scandir (eio_req *req, etp_worker *self) 900eio__scandir (eio_req *req, etp_worker *self)
930{ 901{
931 DIR *dirp; 902 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; 903 EIO_STRUCT_DIRENT *entp;
938 char *name, *names; 904 char *name, *names;
939 int memlen = 4096; 905 int memlen = 4096;
940 int memofs = 0; 906 int memofs = 0;
941 int res = 0; 907 int res = 0;
942 908
943 X_LOCK (wrklock); 909 X_LOCK (wrklock);
910 /* the corresponding closedir is in ETP_WORKER_CLEAR */
944 self->dirp = dirp = opendir (req->ptr1); 911 self->dirp = dirp = opendir (req->ptr1);
945 self->dbuf = u = malloc (sizeof (*u));
946 req->flags |= EIO_FLAG_PTR2_FREE; 912 req->flags |= EIO_FLAG_PTR2_FREE;
947 req->ptr2 = names = malloc (memlen); 913 req->ptr2 = names = malloc (memlen);
948 X_UNLOCK (wrklock); 914 X_UNLOCK (wrklock);
949 915
950 if (dirp && u && names) 916 if (dirp && names)
951 for (;;) 917 for (;;)
952 { 918 {
953 errno = 0; 919 errno = 0;
954 readdir_r (dirp, &u->d, &entp); 920 entp = readdir (dirp);
955 921
956 if (!entp) 922 if (!entp)
957 break; 923 break;
958 924
959 name = entp->d_name; 925 name = entp->d_name;
… …
1047 1013
1048 --nready; 1014 --nready;
1049 1015
1050 X_UNLOCK (reqlock); 1016 X_UNLOCK (reqlock);
1051 1017
1052 errno = 0; /* strictly unnecessary */ 1018 if (req->type < 0)
1019 goto quit;
1053 1020
1054 if (!EIO_CANCELLED (req)) 1021 if (!EIO_CANCELLED (req))
1055 switch (req->type) 1022 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 1023
1156 X_LOCK (reslock); 1024 X_LOCK (reslock);
1157 1025
1158 ++npending; 1026 ++npending;
1159 1027
… …
1176 1044
1177/*****************************************************************************/ 1045/*****************************************************************************/
1178 1046
1179int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1047int eio_init (void (*want_poll)(void), void (*done_poll)(void))
1180{ 1048{
1181 etp_init (want_poll, done_poll); 1049 return etp_init (want_poll, done_poll);
1182} 1050}
1183 1051
1184static void eio_api_destroy (eio_req *req) 1052static void eio_api_destroy (eio_req *req)
1185{ 1053{
1186 free (req); 1054 free (req);
… …
1208 { \ 1076 { \
1209 eio_api_destroy (req); \ 1077 eio_api_destroy (req); \
1210 return 0; \ 1078 return 0; \
1211 } 1079 }
1212 1080
1081static void eio_execute (etp_worker *self, eio_req *req)
1082{
1083 errno = 0;
1084
1085 switch (req->type)
1086 {
1087 case EIO_READ: ALLOC (req->size);
1088 req->result = req->offs >= 0
1089 ? pread (req->int1, req->ptr2, req->size, req->offs)
1090 : read (req->int1, req->ptr2, req->size); break;
1091 case EIO_WRITE: req->result = req->offs >= 0
1092 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1093 : write (req->int1, req->ptr2, req->size); break;
1094
1095 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1096 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
1097
1098 case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1099 req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1100 case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1101 req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1102 case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1103 req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
1104
1105 case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1106 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1107 case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1108 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1109 case EIO_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1110 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1111
1112 case EIO_OPEN: req->result = open (req->ptr1, req->int1, (mode_t)req->int2); break;
1113 case EIO_CLOSE: req->result = close (req->int1); break;
1114 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1115 case EIO_UNLINK: req->result = unlink (req->ptr1); break;
1116 case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1117 case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1118 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1119 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1120 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1121 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1122
1123 case EIO_READLINK: ALLOC (NAME_MAX);
1124 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1125
1126 case EIO_SYNC: req->result = 0; sync (); break;
1127 case EIO_FSYNC: req->result = fsync (req->int1); break;
1128 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1129
1130 case EIO_READDIR: eio__scandir (req, self); break;
1131
1132 case EIO_BUSY:
1133#ifdef _WIN32
1134 Sleep (req->nv1 * 1000.);
1135#else
1136 {
1137 struct timeval tv;
1138
1139 tv.tv_sec = req->nv1;
1140 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1141
1142 req->result = select (0, 0, 0, 0, &tv);
1143 }
1144#endif
1145 break;
1146
1147 case EIO_UTIME:
1148 case EIO_FUTIME:
1149 {
1150 struct timeval tv[2];
1151 struct timeval *times;
1152
1153 if (req->nv1 != -1. || req->nv2 != -1.)
1154 {
1155 tv[0].tv_sec = req->nv1;
1156 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1157 tv[1].tv_sec = req->nv2;
1158 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1159
1160 times = tv;
1161 }
1162 else
1163 times = 0;
1164
1165
1166 req->result = req->type == EIO_FUTIME
1167 ? futimes (req->int1, times)
1168 : utimes (req->ptr1, times);
1169 }
1170
1171 case EIO_GROUP:
1172 case EIO_NOP:
1173 req->result = 0;
1174 break;
1175
1176 case EIO_CUSTOM:
1177 req->feed (req);
1178 break;
1179
1180 default:
1181 req->result = -1;
1182 break;
1183 }
1184
1185 req->errorno = errno;
1186}
1187
1213#ifndef EIO_NO_WRAPPERS 1188#ifndef EIO_NO_WRAPPERS
1214 1189
1215eio_req *eio_nop (int pri, eio_cb cb, void *data) 1190eio_req *eio_nop (int pri, eio_cb cb, void *data)
1216{ 1191{
1217 REQ (EIO_NOP); SEND; 1192 REQ (EIO_NOP); SEND;
… …
1358 return eio__1path (EIO_READDIR, path, pri, cb, data); 1333 return eio__1path (EIO_READDIR, path, pri, cb, data);
1359} 1334}
1360 1335
1361eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) 1336eio_req *eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1362{ 1337{
1363 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND; 1338 REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1364} 1339}
1365 1340
1366static eio_req * 1341static eio_req *
1367eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1342eio__2path (int type, const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1368{ 1343{
… …
1392eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 1367eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
1393{ 1368{
1394 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1369 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1395} 1370}
1396 1371
1372eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1373{
1374 REQ (EIO_CUSTOM); req->feed = execute; SEND;
1375}
1376
1397#endif 1377#endif
1398 1378
1399eio_req *eio_grp (eio_cb cb, void *data) 1379eio_req *eio_grp (eio_cb cb, void *data)
1400{ 1380{
1401 const int pri = EIO_PRI_MAX; 1381 const int pri = EIO_PRI_MAX;

Diff Legend

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