premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

make coalesce-buffers work on windows and systemps with pwritev()/preadv()

This commit is contained in:
arvidn 2018-01-28 01:38:24 +01:00 committed by Arvid Norberg
parent eeca133dd7
commit b729021625
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
* made coalesce_reads/coalesce_writes settings take effect on linux and windows
* restore support for incoming connections over SOCKS5 (disabled by default) * restore support for incoming connections over SOCKS5 (disabled by default)
* use unique peer_ids per connection * use unique peer_ids per connection
* fix iOS build on recent SDK * fix iOS build on recent SDK

24
src/file.cpp
View File

@ -1663,7 +1663,6 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
namespace { namespace {
#if !TORRENT_USE_PREADV
void gather_copy(file::iovec_t const* bufs, int num_bufs, char* dst) void gather_copy(file::iovec_t const* bufs, int num_bufs, char* dst)
{ {
std::size_t offset = 0; std::size_t offset = 0;
@ -1717,7 +1716,6 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
num_bufs = 1; num_bufs = 1;
return true; return true;
} }
#endif // TORRENT_USE_PREADV
template <class Fun> template <class Fun>
boost::int64_t iov(Fun f, handle_type fd, boost::int64_t file_offset, file::iovec_t const* bufs_in boost::int64_t iov(Fun f, handle_type fd, boost::int64_t file_offset, file::iovec_t const* bufs_in
@ -1841,12 +1839,6 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
TORRENT_ASSERT(num_bufs > 0); TORRENT_ASSERT(num_bufs > 0);
TORRENT_ASSERT(is_open()); TORRENT_ASSERT(is_open());
#if TORRENT_USE_PREADV
TORRENT_UNUSED(flags);
int ret = iov(&::preadv, native_handle(), file_offset, bufs, num_bufs, ec);
#else
// there's no point in coalescing single buffer writes // there's no point in coalescing single buffer writes
if (num_bufs == 1) if (num_bufs == 1)
{ {
@ -1863,7 +1855,9 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
flags &= ~file::coalesce_buffers; flags &= ~file::coalesce_buffers;
} }
#if TORRENT_USE_PREAD #if TORRENT_USE_PREADV
int ret = iov(&::preadv, native_handle(), file_offset, bufs, num_bufs, ec);
#elif TORRENT_USE_PREAD
int ret = iov(&::pread, native_handle(), file_offset, bufs, num_bufs, ec); int ret = iov(&::pread, native_handle(), file_offset, bufs, num_bufs, ec);
#else #else
int ret = iov(&::read, native_handle(), file_offset, bufs, num_bufs, ec); int ret = iov(&::read, native_handle(), file_offset, bufs, num_bufs, ec);
@ -1873,7 +1867,6 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
coalesce_read_buffers_end(orig_bufs, orig_num_bufs coalesce_read_buffers_end(orig_bufs, orig_num_bufs
, static_cast<char*>(tmp.iov_base), !ec); , static_cast<char*>(tmp.iov_base), !ec);
#endif
return ret; return ret;
} }
@ -1899,12 +1892,6 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
ec.clear(); ec.clear();
#if TORRENT_USE_PREADV
TORRENT_UNUSED(flags);
int ret = iov(&::pwritev, native_handle(), file_offset, bufs, num_bufs, ec);
#else
// there's no point in coalescing single buffer writes // there's no point in coalescing single buffer writes
if (num_bufs == 1) if (num_bufs == 1)
{ {
@ -1919,7 +1906,9 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
flags &= ~file::coalesce_buffers; flags &= ~file::coalesce_buffers;
} }
#if TORRENT_USE_PREAD #if TORRENT_USE_PREADV
int ret = iov(&::pwritev, native_handle(), file_offset, bufs, num_bufs, ec);
#elif TORRENT_USE_PREAD
int ret = iov(&::pwrite, native_handle(), file_offset, bufs, num_bufs, ec); int ret = iov(&::pwrite, native_handle(), file_offset, bufs, num_bufs, ec);
#else #else
int ret = iov(&::write, native_handle(), file_offset, bufs, num_bufs, ec); int ret = iov(&::write, native_handle(), file_offset, bufs, num_bufs, ec);
@ -1928,7 +1917,6 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
if (flags & file::coalesce_buffers) if (flags & file::coalesce_buffers)
free(tmp.iov_base); free(tmp.iov_base);
#endif
#if TORRENT_USE_FDATASYNC \ #if TORRENT_USE_FDATASYNC \
&& !defined F_NOCACHE && \ && !defined F_NOCACHE && \
!defined DIRECTIO_ON !defined DIRECTIO_ON