[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libktorrent/frameworks] src/download: reorder Packer member to reduce its sizeof, remove unneeded '
From:       Nick Shaforostoff <shafff () ukr ! net>
Date:       2015-12-01 1:13:04
Message-ID: E1a3ZVA-0000Li-DW () scm ! kde ! org
[Download RAW message or body]

Git commit b9b42bc2b1f4e4d63722ec758badfd486ca44e09 by Nick Shaforostoff.
Committed on 01/12/2015 at 01:12.
Pushed by shaforo into branch 'frameworks'.

reorder Packer member to reduce its sizeof, remove unneeded 'virtual' marker

M  +7    -15   src/download/packet.cpp
M  +2    -2    src/download/packet.h

http://commits.kde.org/libktorrent/b9b42bc2b1f4e4d63722ec758badfd486ca44e09

diff --git a/src/download/packet.cpp b/src/download/packet.cpp
index 5d3ebdd..1f7f383 100644
--- a/src/download/packet.cpp
+++ b/src/download/packet.cpp
@@ -40,55 +40,47 @@ namespace bt
 	}
 
 
-	Packet::Packet(Uint8 type) : type(type),data(0),size(0),written(0)
+	Packet::Packet(Uint8 type) : data(0),size(5),written(0),type(type)
 	{
-		size = 5;
 		data = AllocPacket(size,type);
 	}
 	
-	Packet::Packet(Uint16 port) : type(PORT),data(0),size(0),written(0)
+	Packet::Packet(Uint16 port) : data(0),size(7),written(0),type(PORT)
 	{
-		size = 7;
 		data = AllocPacket(size,PORT);
 		WriteUint16(data,5,port);
-		
 	}
 	
-	Packet::Packet(Uint32 chunk,Uint8 type) : type(type),data(0),size(0),written(0)
+	Packet::Packet(Uint32 chunk,Uint8 type) : data(0),size(9),written(0),type(type)
 	{
-		size = 9;
 		data = AllocPacket(size,type);
 		WriteUint32(data,5,chunk);
 	}
 	
-	Packet::Packet(const BitSet & bs) : type(BITFIELD),data(0),size(0),written(0)
+	Packet::Packet(const BitSet & bs) : data(0),size(5 + \
bs.getNumBytes()),written(0),type(BITFIELD)  {
-		size = 5 + bs.getNumBytes();
 		data = AllocPacket(size,BITFIELD);
 		memcpy(data+5,bs.getData(),bs.getNumBytes());
 	}
 	
-	Packet::Packet(const Request & r,Uint8 type) : \
type(type),data(0),size(0),written(0) +	Packet::Packet(const Request & r,Uint8 type) \
: data(0),size(17),written(0),type(type)  {
-		size = 17;
 		data = AllocPacket(size,type);
 		WriteUint32(data,5,r.getIndex());
 		WriteUint32(data,9,r.getOffset());
 		WriteUint32(data,13,r.getLength());
 	}
 	
-	Packet::Packet(Uint32 index,Uint32 begin,Uint32 len,Chunk* ch) : \
type(PIECE),data(0),size(0),written(0) +	Packet::Packet(Uint32 index,Uint32 \
begin,Uint32 len,Chunk* ch) : data(0),size(13 + len),written(0),type(PIECE)  {
-		size = 13 + len;
 		data = AllocPacket(size,PIECE);
 		WriteUint32(data,5,index);
 		WriteUint32(data,9,begin);
 		ch->readPiece(begin,len,data + 13);
 	}
 
-	Packet::Packet(Uint8 ext_id,const QByteArray & ext_data) :  \
type(EXTENDED),data(0),size(0),written(0) +	Packet::Packet(Uint8 ext_id,const \
QByteArray & ext_data) : data(0),size(6 + ext_data.size()),written(0),type(EXTENDED)  \
                {
-		size = 6 + ext_data.size();
 		data = AllocPacket(size,EXTENDED);
 		data[5] = ext_id;
 		memcpy(data + 6,ext_data.data(),ext_data.size());
diff --git a/src/download/packet.h b/src/download/packet.h
index 7821c27..43b7e8f 100644
--- a/src/download/packet.h
+++ b/src/download/packet.h
@@ -50,7 +50,7 @@ namespace bt
 		Packet(const Request & req,Uint8 type);
 		Packet(Uint32 index,Uint32 begin,Uint32 len,Chunk* ch);
 		Packet(Uint8 ext_id,const QByteArray & ext_data); // extension protocol packet
-		virtual ~Packet();
+		~Packet();
 
 		/// Get the packet type
 		Uint8 getType() const {return type;}
@@ -91,10 +91,10 @@ namespace bt
 		typedef QSharedPointer<Packet> Ptr;
 		
 	private:
-		Uint8 type;
 		Uint8* data;
 		Uint32 size;
 		Uint32 written;
+		Uint8 type;
 	};
 
 }


[prev in list] [next in list] [prev in thread] [next in thread]