Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: tr_block_info class (#2210)

Browse Source 
* refactor: add tr_block_info with tests
This commit is contained in:
Charles Kerr
2021-11-24 08:48:52 -06:00
committed by GitHub
parent 449b83e340
commit 843e486d2a
17 changed files with 442 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libtransmission/webseed.cc
View File

@@ -147,7 +147,7 @@ static void fire_client_got_rejs(tr_torrent* tor, tr_webseed* w, tr_block_index_
{
if (i == count)
{
e.length = tr_torBlockCountBytes(tor, block + count - 1);
e.length = tor->countBytesInBlock(block + count - 1);
}
publish(w, &e);
@@ -165,7 +165,7 @@ static void fire_client_got_blocks(tr_torrent* tor, tr_webseed* w, tr_block_inde
{
if (i == count)
{
e.length = tr_torBlockCountBytes(tor, block + count - 1);
e.length = tor->countBytesInBlock(block + count - 1);
}
publish(w, &e);
@@ -206,7 +206,7 @@ static void write_block_func(void* vdata)
auto* const tor = tr_torrentFindFromId(data->session, data->torrent_id);
if (tor != nullptr)
{
uint32_t const block_size = tor->blockSize;
uint32_t const block_size = tor->block_size;
uint32_t len = evbuffer_get_length(buf);
uint32_t const offset_end = data->block_offset + len;
tr_cache* cache = data->session->cache;
@@ -371,12 +371,12 @@ static void on_idle(tr_webseed* w)
task->session = tor->session;
task->webseed = w;
task->block = first;
task->piece_index = tr_torBlockPiece(tor, first);
task->piece_offset = tor->blockSize * first - tor->info.pieceSize * task->piece_index;
task->length = (last - first) * tor->blockSize + tr_torBlockCountBytes(tor, last);
task->piece_index = tor->pieceForBlock(first);
task->piece_offset = tor->block_size * first - tor->info.pieceSize * task->piece_index;
task->length = (last - first) * tor->block_size + tor->countBytesInBlock(last);
task->blocks_done = 0;
task->response_code = 0;
task->block_size = tor->blockSize;
task->block_size = tor->block_size;
task->content = evbuffer_new();
evbuffer_add_cb(task->content, on_content_changed, task);
w->tasks.insert(task);
@@ -425,7 +425,7 @@ static void web_response_func(
if (!success)
{
tr_block_index_t const blocks_remain = (t->length + tor->blockSize - 1) / tor->blockSize - t->blocks_done;
tr_block_index_t const blocks_remain = (t->length + tor->block_size - 1) / tor->block_size - t->blocks_done;
if (blocks_remain != 0)
{
@@ -448,7 +448,7 @@ static void web_response_func(
}
else
{
uint32_t const bytes_done = t->blocks_done * tor->blockSize;
uint32_t const bytes_done = t->blocks_done * tor->block_size;
uint32_t const buf_len = evbuffer_get_length(t->content);
if (bytes_done + buf_len < t->length)
@@ -508,7 +508,7 @@ static void task_request_next_chunk(struct tr_webseed_task* t)
auto& urls = t->webseed->file_urls;
tr_info const* inf = tr_torrentInfo(tor);
uint64_t const remain = t->length - t->blocks_done * tor->blockSize - evbuffer_get_length(t->content);
uint64_t const remain = t->length - t->blocks_done * tor->block_size - evbuffer_get_length(t->content);
uint64_t const total_offset = tr_pieceOffset(tor, t->piece_index, t->piece_offset, t->length - remain);
tr_piece_index_t const step_piece = total_offset / inf->pieceSize;