Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-02 11:49:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added debug tags, updated priority list

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5_QoS@4518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-08-03 13:41:20 +00:00
parent bf82ee38bb
commit d69294c8bc
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libretroshare/src/pqi/pqihandler.cc
View File

@ -110,8 +110,6 @@ int pqihandler::tick()
bool pqihandler::drawFromQoS_queue() bool pqihandler::drawFromQoS_queue()
{ {
//std::cerr<< "pqihandler: Queue has " << qos_queue_size() << " elements. Treating " << 1+qos_queue_size()/10 << " of them." << std::endl;
++nb_ticks ; ++nb_ticks ;
time_t now = time(NULL) ; time_t now = time(NULL) ;
if(last_m + 3 < now) if(last_m + 3 < now)
@ -121,8 +119,9 @@ bool pqihandler::drawFromQoS_queue()
last_m = now ; last_m = now ;
} }
float avail_out = getMaxRate(false) * 1024 / ticks_per_sec ; float avail_out = getMaxRate(false) * 1024 / ticks_per_sec ;
#ifdef DEBUG_QOS
std::cerr << "ticks per sec: " << ticks_per_sec << ", max rate in bytes/s = " << getMaxRate(false)*1024 << ", avail out per tick= " << avail_out << std::endl; std::cerr << "ticks per sec: " << ticks_per_sec << ", max rate in bytes/s = " << getMaxRate(false)*1024 << ", avail out per tick= " << avail_out << std::endl;
#endif
uint64_t total_bytes_sent = 0 ; uint64_t total_bytes_sent = 0 ;
for(uint32_t i=0;i<qos_queue_size() && total_bytes_sent < avail_out;++i) for(uint32_t i=0;i<qos_queue_size() && total_bytes_sent < avail_out;++i)
@ -135,10 +134,18 @@ bool pqihandler::drawFromQoS_queue()
uint32_t size ; uint32_t size ;
HandleRsItem(item, 0, size); HandleRsItem(item, 0, size);
total_bytes_sent += size ; total_bytes_sent += size ;
#ifdef DEBUG_QOS
std::cerr << "treating item " << (void*)item << ", priority " << (int)item->priority_level() << ", size=" << size << std::endl; std::cerr << "treating item " << (void*)item << ", priority " << (int)item->priority_level() << ", size=" << size << std::endl;
#endif
} }
} }
std::cerr << "total bytes sent = " << total_bytes_sent << std::endl; #ifdef DEBUG_QOS
std::cerr << "total bytes sent = " << total_bytes_sent << ", " ;
if(qos_queue_size() > 0)
std::cerr << "Queue still has elements." << std::endl;
else
std::cerr << "Queue is empty." << std::endl;
#endif
return (qos_queue_size() > 0) ; return (qos_queue_size() > 0) ;
} }

39
libretroshare/src/pqi/pqiqos.h
View File

@ -40,36 +40,45 @@
// |Item type | low priority <---- --------------> high priority | Comment | // |Item type | low priority <---- --------------> high priority | Comment |
// | | | | // | | | |
// +-------------------------+- 0 -- 1 -- 2 -- 3 -- 4 -- 5 -- 6 -- 7 -- 8 -- 9 -+-----------------------------------------------+ // +-------------------------+- 0 -- 1 -- 2 -- 3 -- 4 -- 5 -- 6 -- 7 -- 8 -- 9 -+-----------------------------------------------+
// |Turtle items | | | // |Turtle items (Direct) | | |
// | RsGenericTunnelsItem | X | States for all turtle FT except file requests |
// | RsTurtleFileReqItem | X | |
// | RsTunnelRequestItem | X | | // | RsTunnelRequestItem | X | |
// | RsTunnelOkItem | X | | // | RsTunnelOkItem | X | |
// | RsTurtleFileReqItem | X | |
// | RsTurtleSearchRequest | X | | // | RsTurtleSearchRequest | X | |
// | RsTurtleFileDataItem | X | |
// | RsTurtleSearchResult | X | | // | RsTurtleSearchResult | X | |
// | RsGenericTunnelsItem | X | States for all turtle FT except file requests |
// | | | | // | | | |
// |File transfer | | | // |Turtle items (Forwarded) | | |
// | RsFileChunkMapRequest | X | | // | RsTurtleFileReqItem | X | |
// | RsFileChunkMap | X | | // | RsTurtleSearchRequest | X | |
// | RsFileCRC32MapRequest | X | | // | RsTurtleFileDataItem | X | |
// | RsFileCRC32Map | X | | // | RsTurtleSearchResult | X | |
// | RsGenericTunnelsItem | X | States for all turtle FT except file requests |
// | | | |
// |Direct file transfer | | |
// | RsFileRequest | X | | // | RsFileRequest | X | |
// | RsFileData | X | | // | RsFileChunkMapRequest | X | |
// | RsFileCRC32MapRequest | X | |
// | RsFileChunkMap | X | |
// | RsFileCRC32Map | X | |
// | RsFileData | X | |
// | RsCacheRequest | X | | // | RsCacheRequest | X | |
// | RsCacheItem | X | | // | RsCacheItem | X | |
// | | | | // | | | |
// |Discovery | | | // |Discovery | | |
// | RsDiscReply | X | | // | RsDiscReply | X | |
// | RsDiscAskInfo | X | | // | RsDiscAskInfo | X | |
// | RsDiscVersion | X | | // | RsDiscVersion | X | |
// | RsDiscHeartBeat | X | | // | RsDiscHeartBeat | X | |
// | | | | // | | | |
// |Chat | | | // |Chat/Msgs | | |
// | RsChatItem | X | Parent of all chat messages | // | RsChatItem | X | Parent of all chat messages |
// | RsChatAvatarItem | X | | // | RsChatAvatarItem | X | |
// | RsMsgItem | X | |
// | | | | // | | | |
// |Various | | | // |Various | | |
// | RsStatusItem | X | | // | RsStatusItem | X | |
// | VOIP stream items | X | | // | VOIP stream items | X | |
// | | | | // | | | |
// +-------------------------+--------------------------------------------------+-----------------------------------------------+ // +-------------------------+--------------------------------------------------+-----------------------------------------------+