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

(trunk libT) omit unnecessary malloc/free calls in peer-io

This commit is contained in:
Charles Kerr 2008-12-29 19:01:47 +00:00
parent 9ea0489471
commit 798bac0fcb
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libtransmission/inout.c
View File

@ -229,7 +229,7 @@ recalculateHash( const tr_torrent * tor,
while( bytesLeft )
{
uint8_t buf[8192];
uint8_t buf[MAX_STACK_ARRAY_SIZE];
const int len = MIN( bytesLeft, sizeof( buf ) );
success = !tr_ioRead( tor, pieceIndex, offset, len, buf );
if( !success )

26
libtransmission/peer-io.c
View File

@ -31,6 +31,7 @@
#include "list.h"
#include "net.h"
#include "peer-io.h"
#include "platform.h" /* MAX_STACK_ARRAY_SIZE */
#include "trevent.h"
#include "utils.h"
@ -769,7 +770,7 @@ tr_peerIoWriteBytes( tr_peerIo * io,
const void * bytes,
size_t byteCount )
{
uint8_t * tmp;
uint8_t tmp[MAX_STACK_ARRAY_SIZE];
switch( io->encryptionMode )
{
@ -778,10 +779,14 @@ tr_peerIoWriteBytes( tr_peerIo * io,
break;
case PEER_ENCRYPTION_RC4:
tmp = tr_new( uint8_t, byteCount );
tr_cryptoEncrypt( io->crypto, byteCount, bytes, tmp );
evbuffer_add( outbuf, tmp, byteCount );
tr_free( tmp );
evbuffer_expand( outbuf, byteCount );
while( byteCount > 0 ) {
const size_t thisPass = MIN( byteCount, sizeof( tmp ) );
tr_cryptoEncrypt( io->crypto, thisPass, bytes, tmp );
evbuffer_add( outbuf, tmp, thisPass );
bytes += thisPass;
byteCount -= thisPass;
}
break;
default:
@ -884,13 +889,16 @@ tr_peerIoDrain( tr_peerIo * io,
struct evbuffer * inbuf,
size_t byteCount )
{
uint8_t * tmp;
uint8_t tmp[MAX_STACK_ARRAY_SIZE];
assert( tr_isPeerIo( io ) );
tmp = tr_new( uint8_t, byteCount );
tr_peerIoReadBytes( io, inbuf, tmp, byteCount );
tr_free( tmp );
while( byteCount > 0 )
{
const size_t thisPass = MIN( byteCount, sizeof( tmp ) );
tr_peerIoReadBytes( io, inbuf, tmp, thisPass );
byteCount -= thisPass;
}
}
int

2
libtransmission/platform.h
View File

@ -39,6 +39,8 @@
#define MAX_PATH_LENGTH 1024
#endif
#define MAX_STACK_ARRAY_SIZE 8192
typedef struct tr_lock tr_lock;
typedef struct tr_thread tr_thread;