mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: remove redundant MAX_BLOCK_SIZE constant (#2740)

This commit is contained in:
Charles Kerr 2022-03-04 23:35:22 -08:00 committed by GitHub
parent cdd819772d
commit 0ac8c6079a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libtransmission/cache.cc
View File

@ -12,7 +12,6 @@
#include "cache.h"
#include "inout.h"
#include "log.h"
#include "peer-common.h" /* MAX_BLOCK_SIZE */
#include "ptrarray.h"
#include "torrent.h"
#include "tr-assert.h"
@ -157,7 +156,7 @@ static int calcRuns(tr_cache const* cache, struct run_info* runs)
static int flushContiguous(tr_cache* cache, int pos, int n)
{
int err = 0;
auto* const buf = tr_new(uint8_t, n * MAX_BLOCK_SIZE);
auto* const buf = tr_new(uint8_t, n * tr_block_info::BlockSize);
auto* walk = buf;
auto** blocks = (struct cache_block**)tr_ptrArrayBase(&cache->blocks);
@ -237,7 +236,7 @@ static int cacheTrim(tr_cache* cache)
static int getMaxBlocks(int64_t max_bytes)
{
return max_bytes / (double)MAX_BLOCK_SIZE;
return max_bytes / static_cast<double>(tr_block_info::BlockSize);
}
int tr_cacheSetLimit(tr_cache* cache, int64_t max_bytes)

5
libtransmission/peer-common.h
View File

@ -24,11 +24,6 @@ class tr_peer;
class tr_swarm;
struct peer_atom;
/* This is the maximum size of a block request.
most bittorrent clients will reject requests
larger than this size. */
auto inline constexpr MAX_BLOCK_SIZE = 1024 * 16;
/**
*** Peer Publish / Subscribe
**/

3
libtransmission/peer-io.cc
View File

@ -20,7 +20,6 @@
#include "bandwidth.h"
#include "log.h"
#include "net.h"
#include "peer-common.h" /* MAX_BLOCK_SIZE */
#include "peer-io.h"
#include "tr-assert.h"
#include "tr-utp.h"
@ -1007,7 +1006,7 @@ static unsigned int getDesiredOutputBufferSize(tr_peerIo const* io, uint64_t now
unsigned int const currentSpeed_Bps = io->bandwidth->getPieceSpeedBytesPerSecond(now, TR_UP);
unsigned int const period = 15U; /* arbitrary */
/* the 3 is arbitrary; the .5 is to leave room for messages */
static auto const ceiling = (unsigned int)(MAX_BLOCK_SIZE * 3.5);
static auto const ceiling = (unsigned int)(tr_block_info::BlockSize * 3.5);
return std::max(ceiling, currentSpeed_Bps * period);
}

3
libtransmission/torrent.cc
View File

@ -41,7 +41,6 @@
#include "inout.h" /* tr_ioTestPiece() */
#include "log.h"
#include "magnet-metainfo.h"
#include "peer-common.h" /* MAX_BLOCK_SIZE */
#include "peer-mgr.h"
#include "resume.h"
#include "session.h"
@ -1959,7 +1958,7 @@ bool tr_torrentReqIsValid(tr_torrent const* tor, tr_piece_index_t index, uint32_
{
err = 3;
}
else if (length > MAX_BLOCK_SIZE)
else if (length > tr_block_info::BlockSize)
{
err = 4;
}