jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start of use of writev instead of coalescing into a heap allocated buffer

Browse Source
This commit is contained in:
Arvid Norberg
2009-01-01 01:47:57 +00:00
parent 82ded974c8
commit 233f2ed00c
2 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/libtorrent/file.hpp
View File

@@ -60,6 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
// posix part // posix part
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include <unistd.h> #include <unistd.h>
#include <sys/uio.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -89,6 +90,16 @@ namespace libtorrent
#endif #endif
}; };
#ifdef TORRENT_WINDOWS
struct iovec_t
{
void* iov_base;
size_t iov_len;
};
#else
typedef iovec iovec_t;
#endif
file(); file();
file(fs::path const& p, int m, error_code& ec); file(fs::path const& p, int m, error_code& ec);
~file(); ~file();
@@ -98,7 +109,10 @@ namespace libtorrent
void close(); void close();
bool set_size(size_type size, error_code& ec); bool set_size(size_type size, error_code& ec);
size_type write(const char*, size_type num_bytes, error_code& ec); size_type writev(iovec_t const* bufs, int num_bufs, error_code& ec);
size_type readv(iovec_t const* bufs, int num_bufs, error_code& ec);
size_type write(char const*, size_type num_bytes, error_code& ec);
size_type read(char*, size_type num_bytes, error_code& ec); size_type read(char*, size_type num_bytes, error_code& ec);
size_type seek(size_type pos, int m, error_code& ec); size_type seek(size_type pos, int m, error_code& ec);

56
src/file.cpp
View File

@@ -219,7 +219,6 @@ namespace libtorrent
TORRENT_ASSERT(is_open()); TORRENT_ASSERT(is_open());
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
TORRENT_ASSERT(DWORD(num_bytes) == num_bytes); TORRENT_ASSERT(DWORD(num_bytes) == num_bytes);
DWORD ret = 0; DWORD ret = 0;
if (num_bytes != 0) if (num_bytes != 0)
@@ -237,6 +236,60 @@ namespace libtorrent
return ret; return ret;
} }
size_type file::readv(iovec_t const* bufs, int num_bufs, error_code& ec)
{
TORRENT_ASSERT(m_open_mode == read_only || m_open_mode == read_write);
TORRENT_ASSERT(bufs);
TORRENT_ASSERT(num_bufs >= 0);
TORRENT_ASSERT(is_open());
#ifdef TORRENT_WINDOWS
size_type ret = 0;
for (iovec_t* i = bufs, end(bufs + num_bufs); i < end; ++i)
{
if (i->iov_len <= 0) continue;
DWORD intermediate = 0;
if (ReadFile(m_file_handle, i->iov_base, (DWORD)i->iov_len, &intermediate, 0) == FALSE)
{
ec = error_code(GetLastError(), get_system_category());
return -1;
}
ret += intermediate;
}
#else
size_type ret = ::readv(m_fd, bufs, num_bufs);
if (ret == -1) ec = error_code(errno, get_posix_category());
#endif
return ret;
}
size_type file::writev(iovec_t const* bufs, int num_bufs, error_code& ec)
{
TORRENT_ASSERT(m_open_mode == write_only || m_open_mode == read_write);
TORRENT_ASSERT(bufs);
TORRENT_ASSERT(num_bufs >= 0);
TORRENT_ASSERT(is_open());
#ifdef TORRENT_WINDOWS
size_type ret = 0;
for (iovec_* i = bufs, end(bufs + num_bufs); i < end; ++i)
{
if (i->iov_len <= 0) continue;
DWORD intermediate = 0;
if (WriteFile(m_file_handle, i->iov_base, (DWORD)i->iov_len, &intermediate, 0) == FALSE)
{
ec = error_code(GetLastError(), get_system_category());
return -1;
}
ret += intermediate;
}
#else
size_type ret = ::writev(m_fd, bufs, num_bufs);
if (ret == -1) ec = error_code(errno, get_posix_category());
#endif
return ret;
}
size_type file::write(const char* buf, size_type num_bytes, error_code& ec) size_type file::write(const char* buf, size_type num_bytes, error_code& ec)
{ {
TORRENT_ASSERT(m_open_mode == write_only || m_open_mode == read_write); TORRENT_ASSERT(m_open_mode == write_only || m_open_mode == read_write);
@@ -245,7 +298,6 @@ namespace libtorrent
TORRENT_ASSERT(is_open()); TORRENT_ASSERT(is_open());
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
DWORD ret = 0; DWORD ret = 0;
if (num_bytes != 0) if (num_bytes != 0)
{ {