Added in RsItem a new virtual method queueType() that returns the type of the queue to

use for handling the packet: RsItem::DATA_QUEUE for data and RsItem::CONTROL_QUEUE for 
control packets, to be used in pqistreamer.

Up to now, File data chunks where the only packets that were going into the --less prioritized--
data queue. Now, the default in RsItem::queueType() being to return CONTROL_QUEUE, developpers can
choose which queue t use by simply overloading this method so that it returns a different value.

The first use of this was to make generic turtle tunnel packets use the data queue instead of 
the control queuem, which restores a correct balance between turtle downloads and friends downloads.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-06-16 21:09:58 +00:00
parent 347c80fb1e
commit 95c5c4b1a1
4 changed files with 22 additions and 2 deletions

View file

@ -321,9 +321,17 @@ int pqistreamer::queue_outpqi(RsItem *pqi)
}
/* decide which type of packet it is */
RsFileData *dta = dynamic_cast<RsFileData *>(pqi);
RsFileData *dta = dynamic_cast<RsFileData *>(pqi); // This is the old test method
bool isCntrl = (dta == NULL);
if(pqi->queueType() == RsItem::DATA_QUEUE) // this is the new test method. More general.
{
#ifdef DEBUG_PQISTREAMER
std::cerr << "PQISTREAMER:: got a data queue packet !!" << std::endl ;
#endif
isCntrl = false ;
}
uint32_t pktsize = rsSerialiser->size(pqi);
void *ptr = malloc(pktsize);