wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

compile time options to use readv/writev or not

This commit is contained in:
Arvid Norberg 2009-04-04 08:23:53 +00:00
parent db8487be46
commit 3cd26dec64
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libtorrent/config.hpp
View File

@ -85,8 +85,9 @@ POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#define TORRENT_USE_IPV6 1 #define TORRENT_USE_IPV6 1
#define TORRENT_USE_MLOCK 1 #define TORRENT_USE_MLOCK 1
#define TORRENT_USE_READV 1
#define TORRENT_USE_WRITEV 1
// should wpath or path be used? // should wpath or path be used?
#if defined UNICODE && !defined BOOST_FILESYSTEM_NARROW_ONLY \ #if defined UNICODE && !defined BOOST_FILESYSTEM_NARROW_ONLY \

57
src/file.cpp
View File

@ -492,13 +492,17 @@ namespace libtorrent
} }
CloseHandle(ol.hEvent); CloseHandle(ol.hEvent);
return ret; return ret;
#else
#else // TORRENT_WINDOWS
size_type ret = lseek(m_fd, file_offset, SEEK_SET); size_type ret = lseek(m_fd, file_offset, SEEK_SET);
if (ret < 0) if (ret < 0)
{ {
ec = error_code(errno, get_posix_category()); ec = error_code(errno, get_posix_category());
return -1; return -1;
} }
#if TORRENT_USE_READV
#ifdef TORRENT_LINUX #ifdef TORRENT_LINUX
bool aligned = false; bool aligned = false;
int size = 0; int size = 0;
@ -510,7 +514,7 @@ namespace libtorrent
if (size & (size_alignment()-1) == 0) aligned = true; if (size & (size_alignment()-1) == 0) aligned = true;
} }
if (aligned) if (aligned)
#endif #endif // TORRENT_LINUX
{ {
ret = ::readv(m_fd, bufs, num_bufs); ret = ::readv(m_fd, bufs, num_bufs);
if (ret < 0) if (ret < 0)
@ -532,8 +536,27 @@ namespace libtorrent
return -1; return -1;
} }
return (std::min)(ret, size_type(size)); return (std::min)(ret, size_type(size));
#endif #endif // TORRENT_LINUX
#endif
#else // TORRENT_USE_READV
ret = 0;
for (file::iovec_t const* i = bufs, *end(bufs + num_bufs); i < end; ++i)
{
int tmp = read(m_fd, i->iov_base, i->iov_len);
if (tmp < 0)
{
ec = error_code(errno, get_posix_category());
return -1;
}
ret += tmp;
if (tmp < i->iov_len) break;
}
return ret;
#endif // TORRENT_USE_READV
#endif // TORRENT_WINDOWS
} }
size_type file::writev(size_type file_offset, iovec_t const* bufs, int num_bufs, error_code& ec) size_type file::writev(size_type file_offset, iovec_t const* bufs, int num_bufs, error_code& ec)
@ -705,6 +728,9 @@ namespace libtorrent
ec = error_code(errno, get_posix_category()); ec = error_code(errno, get_posix_category());
return -1; return -1;
} }
#if TORRENT_USE_WRITEV
#ifdef TORRENT_LINUX #ifdef TORRENT_LINUX
bool aligned = false; bool aligned = false;
int size = 0; int size = 0;
@ -743,8 +769,27 @@ namespace libtorrent
return -1; return -1;
} }
return (std::min)(ret, size_type(size)); return (std::min)(ret, size_type(size));
#endif #endif // TORRENT_LINUX
#endif
#else // TORRENT_USE_WRITEV
ret = 0;
for (file::iovec_t const* i = bufs, *end(bufs + num_bufs); i < end; ++i)
{
int tmp = write(m_fd, i->iov_base, i->iov_len);
if (tmp < 0)
{
ec = error_code(errno, get_posix_category());
return -1;
}
ret += tmp;
if (tmp < i->iov_len) break;
}
return ret;
#endif // TORRENT_USE_WRITEV
#endif // TORRENT_WINDOWS
} }
bool file::set_size(size_type s, error_code& ec) bool file::set_size(size_type s, error_code& ec)