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

removed unused method for OutQueue statistics; improved BW curve display; fixed a few display bugs

Browse source
This commit is contained in:
csoler 2015-07-17 22:13:31 +02:00 • committed by cave beat
parent bdad800509
commit 2a47095599
18 changed files with 153 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/pqi/pqi_base.h
View file

@ -94,7 +94,6 @@ virtual void getRates(RsBwRates &rates)
return;
}
virtual int gatherOutQueueStatistics(std::vector<uint32_t>& /*per_service_count*/,std::vector<uint32_t>& /*per_priority_count*/) { return 0;}
virtual int gatherStatistics(std::list<RSTrafficClue>& /* outqueue_lst */,std::list<RSTrafficClue>& /* inqueue_lst */) { return 0;}
virtual int getQueueSize(bool /* in */) { return 0;}

29
libretroshare/src/pqi/pqihandler.cc
View file

@ -387,33 +387,20 @@ RsRawItem *pqihandler::GetRsRawItem()
static const float MIN_RATE = 0.01; // 10 B/s
int pqihandler::ExtractOutQueueStatistics(OutQueueStatistics& stats)
{
stats.per_service_item_count.clear() ;
std::vector<uint32_t> item_counts(65536,0) ;
stats.per_priority_item_count.clear() ;
stats.per_priority_item_count.resize(10,0) ;
std::map<RsPeerId, SearchModule *>::iterator it;
for(it = mods.begin(); it != mods.end(); ++it)
(it -> second)->pqi->gatherOutQueueStatistics(item_counts,stats.per_priority_item_count) ;
for(int i=0;i<65536;++i)
if(item_counts[i] > 0)
stats.per_service_item_count[i] = item_counts[i] ;
return 1 ;
}
int pqihandler::ExtractTrafficInfo(std::list<RSTrafficClue>& out_lst,std::list<RSTrafficClue>& in_lst)
{
in_lst.clear() ;
out_lst.clear() ;
for( std::map<RsPeerId, SearchModule *>::iterator it = mods.begin(); it != mods.end(); ++it)
(it -> second)->pqi->gatherStatistics(out_lst,in_lst) ;
{
std::list<RSTrafficClue> ilst,olst ;
(it -> second)->pqi->gatherStatistics(olst,ilst) ;
for(std::list<RSTrafficClue>::const_iterator it(ilst.begin());it!=ilst.end();++it) in_lst.push_back(*it) ;
for(std::list<RSTrafficClue>::const_iterator it(olst.begin());it!=olst.end();++it) out_lst.push_back(*it) ;
}
return 1 ;
}

1
libretroshare/src/pqi/pqihandler.h
View file

@ -78,7 +78,6 @@ class pqihandler: public P3Interface, public pqiPublisher
// TESTING INTERFACE.
int ExtractRates(std::map<RsPeerId, RsBwRates> &ratemap, RsBwRates &totals);
int ExtractOutQueueStatistics(OutQueueStatistics& stats) ;
int ExtractTrafficInfo(std::list<RSTrafficClue> &out_lst, std::list<RSTrafficClue> &in_lst);
protected:

10
libretroshare/src/pqi/pqiperson.cc
View file

@ -592,16 +592,6 @@ void pqiperson::getRates(RsBwRates &rates)
return;
activepqi -> getRates(rates);
}
int pqiperson::gatherOutQueueStatistics(std::vector<uint32_t>& per_service,std::vector<uint32_t>& per_priority)
{
RsStackMutex stack(mPersonMtx); /**** LOCK MUTEX ****/
// get the rate from the active one.
if ((!active) || (activepqi == NULL))
return 0;
return activepqi -> gatherOutQueueStatistics(per_service,per_priority);
}
int pqiperson::gatherStatistics(std::list<RSTrafficClue>& out_lst,std::list<RSTrafficClue>& in_lst)
{
RsStackMutex stack(mPersonMtx); /**** LOCK MUTEX ****/

1
libretroshare/src/pqi/pqiperson.h
View file

@ -170,7 +170,6 @@ virtual void getRates(RsBwRates &rates);
virtual float getRate(bool in);
virtual void setMaxRate(bool in, float val);
virtual void setRateCap(float val_in, float val_out);
virtual int gatherOutQueueStatistics(std::vector<uint32_t>& per_service,std::vector<uint32_t>& per_priority);
virtual int gatherStatistics(std::list<RSTrafficClue>& outqueue_lst,std::list<RSTrafficClue>& inqueue_lst) ;

9
libretroshare/src/pqi/pqistreamer.cc
View file

@ -1024,15 +1024,6 @@ void pqistreamer::free_rpend_locked()
mPkt_rpend_size = 0;
}
int pqistreamer::gatherOutQueueStatistics(std::vector<uint32_t>& per_service_count,std::vector<uint32_t>& per_priority_count)
{
#ifdef TO_REMOVE
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
return locked_gatherStatistics(per_service_count,per_priority_count);
#endif
}
int pqistreamer::gatherStatistics(std::list<RSTrafficClue>& outqueue_lst,std::list<RSTrafficClue>& inqueue_lst)
{
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/

1
libretroshare/src/pqi/pqistreamer.h
View file

@ -62,7 +62,6 @@ class pqistreamer: public PQInterface
time_t getLastIncomingTS(); // Time of last data packet, for checking a connection is alive.
virtual void getRates(RsBwRates &rates);
virtual int getQueueSize(bool in); // extracting data.
virtual int gatherOutQueueStatistics(std::vector<uint32_t>& per_service_count,std::vector<uint32_t>& per_priority_count); // extracting data.
virtual int gatherStatistics(std::list<RSTrafficClue>& outqueue_stats,std::list<RSTrafficClue>& inqueue_stats); // extracting data.
protected:

8
libretroshare/src/retroshare/rsconfig.h
View file

@ -186,13 +186,6 @@ public:
RSTrafficClue& operator+=(const RSTrafficClue& tc) { size += tc.size; count += tc.count ; return *this ;}
};
class OutQueueStatistics
{
public:
std::map<uint16_t,uint32_t> per_service_item_count ;
std::vector<uint32_t> per_priority_item_count ;
};
class RsConfigNetStatus
{
public:
@ -261,7 +254,6 @@ public:
virtual int getTotalBandwidthRates(RsConfigDataRates &rates) = 0;
virtual int getAllBandwidthRates(std::map<RsPeerId, RsConfigDataRates> &ratemap) = 0;
virtual int getOutQueueStatistics(OutQueueStatistics& stats) = 0 ;
virtual int getTrafficInfo(std::list<RSTrafficClue>& out_lst,std::list<RSTrafficClue>& in_lst) = 0 ;
/* From RsInit */

7
libretroshare/src/rsserver/p3serverconfig.cc
View file

@ -207,13 +207,6 @@ int p3ServerConfig::getTotalBandwidthRates(RsConfigDataRates &rates)
return 0;
}
int p3ServerConfig::getOutQueueStatistics(OutQueueStatistics& stats)
{
if (rsBandwidthControl)
return rsBandwidthControl->ExtractOutQueueStatistics(stats);
else
return 0;
}
int p3ServerConfig::getAllBandwidthRates(std::map<RsPeerId, RsConfigDataRates> &ratemap)
{
if (rsBandwidthControl)

1
libretroshare/src/rsserver/p3serverconfig.h
View file

@ -58,7 +58,6 @@ virtual int getConfigStartup(RsConfigStartup &params);
virtual int getTotalBandwidthRates(RsConfigDataRates &rates);
virtual int getAllBandwidthRates(std::map<RsPeerId, RsConfigDataRates> &ratemap);
virtual int getOutQueueStatistics(OutQueueStatistics& stats) ;
virtual int getTrafficInfo(std::list<RSTrafficClue>& out_lst, std::list<RSTrafficClue> &in_lst) ;
/* From RsInit */

5
libretroshare/src/services/p3bwctrl.cc
View file

@ -280,11 +280,6 @@ int p3BandwidthControl::getAllBandwidthRates(std::map<RsPeerId, RsConfigDataRate
}
int p3BandwidthControl::ExtractOutQueueStatistics(OutQueueStatistics& stats)
{
return mPg->ExtractOutQueueStatistics(stats) ;
}
int p3BandwidthControl::ExtractTrafficInfo(std::list<RSTrafficClue>& in_stats,std::list<RSTrafficClue>& out_stats)
{
return mPg->ExtractTrafficInfo(out_stats,in_stats) ;