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

Comparing libeio/eio.c (file contents):
Revision 1.19 by root, Tue Jun 17 23:34:20 2008 UTC vs.
Revision 1.27 by root, Wed Oct 22 18:15:36 2008 UTC

… …
120 120
121#define EIO_TICKS ((1000000 + 1023) >> 10) 121#define EIO_TICKS ((1000000 + 1023) >> 10)
122 122
123/*****************************************************************************/ 123/*****************************************************************************/
124 124
125#if __GNUC__ >= 3
126# define expect(expr,value) __builtin_expect ((expr),(value))
127#else
128# define expect(expr,value) (expr)
129#endif
130
131#define expect_false(expr) expect ((expr) != 0, 0)
132#define expect_true(expr) expect ((expr) != 0, 1)
133
134/*****************************************************************************/
135
125#define ETP_PRI_MIN EIO_PRI_MIN 136#define ETP_PRI_MIN EIO_PRI_MIN
126#define ETP_PRI_MAX EIO_PRI_MAX 137#define ETP_PRI_MAX EIO_PRI_MAX
127 138
128struct etp_worker; 139struct etp_worker;
129 140
… …
177static mutex_t wrklock = X_MUTEX_INIT; 188static mutex_t wrklock = X_MUTEX_INIT;
178static mutex_t reslock = X_MUTEX_INIT; 189static mutex_t reslock = X_MUTEX_INIT;
179static mutex_t reqlock = X_MUTEX_INIT; 190static mutex_t reqlock = X_MUTEX_INIT;
180static cond_t reqwait = X_COND_INIT; 191static cond_t reqwait = X_COND_INIT;
181 192
193#if !HAVE_PREADWRITE
194/*
195 * make our pread/pwrite emulation safe against themselves, but not against
196 * normal read/write by using a mutex. slows down execution a lot,
197 * but that's your problem, not mine.
198 */
199static mutex_t preadwritelock = X_MUTEX_INIT;
200#endif
201
182typedef struct etp_worker 202typedef struct etp_worker
183{ 203{
184 /* locked by wrklock */ 204 /* locked by wrklock */
185 struct etp_worker *prev, *next; 205 struct etp_worker *prev, *next;
186 206
… …
330 350
331static void etp_atfork_child (void) 351static void etp_atfork_child (void)
332{ 352{
333 ETP_REQ *prv; 353 ETP_REQ *prv;
334 354
335 while (prv = reqq_shift (&req_queue)) 355 while ((prv = reqq_shift (&req_queue)))
336 ETP_DESTROY (prv); 356 ETP_DESTROY (prv);
337 357
338 while (prv = reqq_shift (&res_queue)) 358 while ((prv = reqq_shift (&res_queue)))
339 ETP_DESTROY (prv); 359 ETP_DESTROY (prv);
340 360
341 while (wrk_first.next != &wrk_first) 361 while (wrk_first.next != &wrk_first)
342 { 362 {
343 etp_worker *wrk = wrk_first.next; 363 etp_worker *wrk = wrk_first.next;
… …
402 X_UNLOCK (wrklock); 422 X_UNLOCK (wrklock);
403} 423}
404 424
405static void etp_maybe_start_thread (void) 425static void etp_maybe_start_thread (void)
406{ 426{
407 if (etp_nthreads () >= wanted) 427 if (expect_true (etp_nthreads () >= wanted))
408 return; 428 return;
409 429
410 /* todo: maybe use idle here, but might be less exact */ 430 /* todo: maybe use idle here, but might be less exact */
411 if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()) 431 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
412 return; 432 return;
413 433
414 etp_start_thread (); 434 etp_start_thread ();
415} 435}
416 436
… …
469 489
470 X_LOCK (reqlock); 490 X_LOCK (reqlock);
471 --nreqs; 491 --nreqs;
472 X_UNLOCK (reqlock); 492 X_UNLOCK (reqlock);
473 493
474 if (req->type == EIO_GROUP && req->size) 494 if (expect_false (req->type == EIO_GROUP && req->size))
475 { 495 {
476 req->int1 = 1; /* mark request as delayed */ 496 req->int1 = 1; /* mark request as delayed */
477 continue; 497 continue;
478 } 498 }
479 else 499 else
480 { 500 {
481 int res = ETP_FINISH (req); 501 int res = ETP_FINISH (req);
482 if (res) 502 if (expect_false (res))
483 return res; 503 return res;
484 } 504 }
485 505
486 if (maxreqs && !--maxreqs) 506 if (expect_false (maxreqs && !--maxreqs))
487 break; 507 break;
488 508
489 if (maxtime) 509 if (maxtime)
490 { 510 {
491 gettimeofday (&tv_now, 0); 511 gettimeofday (&tv_now, 0);
… …
510 530
511static void etp_submit (ETP_REQ *req) 531static void etp_submit (ETP_REQ *req)
512{ 532{
513 req->pri -= ETP_PRI_MIN; 533 req->pri -= ETP_PRI_MIN;
514 534
515 if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 535 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
516 if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 536 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
517 537
538 if (expect_false (req->type == EIO_GROUP))
539 {
540 /* I hope this is worth it :/ */
518 X_LOCK (reqlock); 541 X_LOCK (reqlock);
519 ++nreqs; 542 ++nreqs;
543 X_UNLOCK (reqlock);
544
545 X_LOCK (reslock);
546
547 ++npending;
548
549 if (!reqq_push (&res_queue, req) && want_poll_cb)
550 want_poll_cb ();
551
552 X_UNLOCK (reslock);
553 }
554 else
555 {
556 X_LOCK (reqlock);
557 ++nreqs;
520 ++nready; 558 ++nready;
521 reqq_push (&req_queue, req); 559 reqq_push (&req_queue, req);
522 X_COND_SIGNAL (reqwait); 560 X_COND_SIGNAL (reqwait);
523 X_UNLOCK (reqlock); 561 X_UNLOCK (reqlock);
524 562
525 etp_maybe_start_thread (); 563 etp_maybe_start_thread ();
564 }
526} 565}
527 566
528static void etp_set_max_poll_time (double nseconds) 567static void etp_set_max_poll_time (double nseconds)
529{ 568{
530 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 569 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
… …
565 604
566static void grp_try_feed (eio_req *grp) 605static void grp_try_feed (eio_req *grp)
567{ 606{
568 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 607 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
569 { 608 {
570 int old_len = grp->size; 609 grp->flags &= ~EIO_FLAG_GROUPADD;
571 610
572 EIO_FEED (grp); 611 EIO_FEED (grp);
573 612
574 /* stop if no progress has been made */ 613 /* stop if no progress has been made */
575 if (old_len == grp->size) 614 if (!(grp->flags & EIO_FLAG_GROUPADD))
576 { 615 {
577 grp->feed = 0; 616 grp->feed = 0;
578 break; 617 break;
579 } 618 }
580 } 619 }
… …
697 736
698/*****************************************************************************/ 737/*****************************************************************************/
699/* work around various missing functions */ 738/* work around various missing functions */
700 739
701#if !HAVE_PREADWRITE 740#if !HAVE_PREADWRITE
741# undef pread
742# undef pwrite
702# define pread eio__pread 743# define pread eio__pread
703# define pwrite eio__pwrite 744# define pwrite eio__pwrite
704
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 745
712static ssize_t 746static ssize_t
713eio__pread (int fd, void *buf, size_t count, off_t offset) 747eio__pread (int fd, void *buf, size_t count, off_t offset)
714{ 748{
715 ssize_t res; 749 ssize_t res;
… …
742} 776}
743#endif 777#endif
744 778
745#ifndef HAVE_FUTIMES 779#ifndef HAVE_FUTIMES
746 780
781# undef utimes
782# undef futimes
747# define utimes(path,times) eio__utimes (path, times) 783# define utimes(path,times) eio__utimes (path, times)
748# define futimes(fd,times) eio__futimes (fd, times) 784# define futimes(fd,times) eio__futimes (fd, times)
749 785
750static int 786static int
751eio__utimes (const char *filename, const struct timeval times[2]) 787eio__utimes (const char *filename, const struct timeval times[2])
… …
770} 806}
771 807
772#endif 808#endif
773 809
774#if !HAVE_FDATASYNC 810#if !HAVE_FDATASYNC
811# undef fdatasync
775# define fdatasync fsync 812# define fdatasync(fd) fsync (fd)
776#endif 813#endif
814
815/* sync_file_range always needs emulation */
816int
817eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
818{
819#if HAVE_SYNC_FILE_RANGE
820 int res;
821
822 if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
823 || EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
824 || EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
825 {
826 flags = 0
827 | (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
828 | (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
829 | (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
830 }
831
832 res = sync_file_range (fd, offset, nbytes, flags);
833
834 if (res != ENOSYS)
835 return res;
836#endif
837
838 /* even though we could play tricks with the flags, it's better to always
839 * call fdatasync, as thta matches the expectation of it's users best */
840 return fdatasync (fd);
841}
777 842
778#if !HAVE_READAHEAD 843#if !HAVE_READAHEAD
844# undef readahead
779# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 845# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
780 846
781static ssize_t 847static ssize_t
782eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 848eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
783{ 849{
… …
903 int memlen = 4096; 969 int memlen = 4096;
904 int memofs = 0; 970 int memofs = 0;
905 int res = 0; 971 int res = 0;
906 972
907 X_LOCK (wrklock); 973 X_LOCK (wrklock);
974 /* the corresponding closedir is in ETP_WORKER_CLEAR */
908 self->dirp = dirp = opendir (req->ptr1); 975 self->dirp = dirp = opendir (req->ptr1);
909 req->flags |= EIO_FLAG_PTR2_FREE; 976 req->flags |= EIO_FLAG_PTR2_FREE;
910 req->ptr2 = names = malloc (memlen); 977 req->ptr2 = names = malloc (memlen);
911 X_UNLOCK (wrklock); 978 X_UNLOCK (wrklock);
912 979
… …
945 1012
946 if (errno) 1013 if (errno)
947 res = -1; 1014 res = -1;
948 1015
949 req->result = res; 1016 req->result = res;
1017}
1018
1019#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1020# undef msync
1021# define msync(a,b,c) ENOSYS
1022#endif
1023
1024int
1025eio__mtouch (void *mem, size_t len, int flags)
1026{
1027 intptr_t addr = (intptr_t)mem;
1028 intptr_t end = addr + len;
1029#ifdef PAGESIZE
1030 const intptr_t page = PAGESIZE;
1031#else
1032 static intptr_t page;
1033
1034 if (!page)
1035 page = sysconf (_SC_PAGESIZE);
1036#endif
1037
1038 addr &= ~(page - 1); /* assume page size is always a power of two */
1039
1040 if (addr < end)
1041 if (flags) /* modify */
1042 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len);
1043 else
1044 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len);
1045
1046 return 0;
950} 1047}
951 1048
952/*****************************************************************************/ 1049/*****************************************************************************/
953 1050
954#define ALLOC(len) \ 1051#define ALLOC(len) \
… …
1121 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break; 1218 req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1122 1219
1123 case EIO_SYNC: req->result = 0; sync (); break; 1220 case EIO_SYNC: req->result = 0; sync (); break;
1124 case EIO_FSYNC: req->result = fsync (req->int1); break; 1221 case EIO_FSYNC: req->result = fsync (req->int1); break;
1125 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 1222 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1223 case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1224 case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
1225 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1126 1226
1127 case EIO_READDIR: eio__scandir (req, self); break; 1227 case EIO_READDIR: eio__scandir (req, self); break;
1128 1228
1129 case EIO_BUSY: 1229 case EIO_BUSY:
1130#ifdef _WIN32 1230#ifdef _WIN32
… …
1162 1262
1163 req->result = req->type == EIO_FUTIME 1263 req->result = req->type == EIO_FUTIME
1164 ? futimes (req->int1, times) 1264 ? futimes (req->int1, times)
1165 : utimes (req->ptr1, times); 1265 : utimes (req->ptr1, times);
1166 } 1266 }
1267 break;
1167 1268
1168 case EIO_GROUP: 1269 case EIO_GROUP:
1270 abort (); /* handled in eio_request */
1271
1169 case EIO_NOP: 1272 case EIO_NOP:
1170 req->result = 0; 1273 req->result = 0;
1171 break; 1274 break;
1172 1275
1173 case EIO_CUSTOM: 1276 case EIO_CUSTOM:
1174 req->feed (req); 1277 ((void (*)(eio_req *))req->feed) (req);
1175 break; 1278 break;
1176 1279
1177 default: 1280 default:
1178 req->result = -1; 1281 req->result = -1;
1179 break; 1282 break;
… …
1200} 1303}
1201 1304
1202eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data) 1305eio_req *eio_fsync (int fd, int pri, eio_cb cb, void *data)
1203{ 1306{
1204 REQ (EIO_FSYNC); req->int1 = fd; SEND; 1307 REQ (EIO_FSYNC); req->int1 = fd; SEND;
1308}
1309
1310eio_req *eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1311{
1312 REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1313}
1314
1315eio_req *eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1316{
1317 REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1318}
1319
1320eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1321{
1322 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1205} 1323}
1206 1324
1207eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 1325eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1208{ 1326{
1209 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 1327 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
… …
1366 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 1484 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1367} 1485}
1368 1486
1369eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data) 1487eio_req *eio_custom (eio_cb execute, int pri, eio_cb cb, void *data)
1370{ 1488{
1371 REQ (EIO_CUSTOM); req->feed = execute; SEND; 1489 REQ (EIO_CUSTOM); req->feed = (void (*)(eio_req *))execute; SEND;
1372} 1490}
1373 1491
1374#endif 1492#endif
1375 1493
1376eio_req *eio_grp (eio_cb cb, void *data) 1494eio_req *eio_grp (eio_cb cb, void *data)
… …
1404 1522
1405void eio_grp_add (eio_req *grp, eio_req *req) 1523void eio_grp_add (eio_req *grp, eio_req *req)
1406{ 1524{
1407 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 1525 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1408 1526
1527 grp->flags |= EIO_FLAG_GROUPADD;
1528
1409 ++grp->size; 1529 ++grp->size;
1410 req->grp = grp; 1530 req->grp = grp;
1411 1531
1412 req->grp_prev = 0; 1532 req->grp_prev = 0;
1413 req->grp_next = grp->grp_first; 1533 req->grp_next = grp->grp_first;

Diff Legend

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