From d7d5997d86a5698547b6ec61dc69d81176aaaaaa Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 8 May 2010 14:43:55 +0000 Subject: [PATCH] suppressed unused files git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2865 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/ft/ftdwlqueue.cc | 524 ----------------------------- libretroshare/src/ft/ftdwlqueue.h | 118 ------- 2 files changed, 642 deletions(-) delete mode 100644 libretroshare/src/ft/ftdwlqueue.cc delete mode 100644 libretroshare/src/ft/ftdwlqueue.h diff --git a/libretroshare/src/ft/ftdwlqueue.cc b/libretroshare/src/ft/ftdwlqueue.cc deleted file mode 100644 index 3a217bb8a..000000000 --- a/libretroshare/src/ft/ftdwlqueue.cc +++ /dev/null @@ -1,524 +0,0 @@ -/* - * ftdwlqueue.cc - * - * Created on: Jul 20, 2009 - * Author: alexandrut - */ - -#include "ftdwlqueue.h" -#include "ftserver.h" -#include "serialiser/rsbaseserial.h" - -#include - -/*#define DEBUG_QUEUE 1*/ - -#ifdef DEBUG_QUEUE -#include -#endif - -ftDwlQueue::ftDwlQueue(ftController *ftc, unsigned int downloadLimit, unsigned int retryLimit) - : p3Config(CONFIG_TYPE_FT_DWLQUEUE), mFtController(ftc), downloadLimit(downloadLimit), retryLimit(retryLimit) { - return; -} - -ftDwlQueue::~ftDwlQueue() { - return; -} - -void ftDwlQueue::run() -{ -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::run() started" << std::endl; -#endif - - while (1) { - -#ifdef WIN32 - Sleep(1000); -#else - sleep(1); -#endif - - /* first wait for files to start resume else - * downloads will not be correctly counted */ - - if (!mFtController->isActiveAndNoPending()) continue; - - /* we have to know if the next download from - * the queue will exceed the download limit */ - - unsigned int sDwl = totalSystemDwl(); - if (sDwl + 1 > downloadLimit) continue; - - /* now get the next dwl from the queue - * and request for it */ - - DwlDetails details; - if (!getNext(details)) continue; - - if (!mFtController->FileRequest(details.fname, details.hash, details.count, details.dest, details.flags, details.srcIds)) { - /* reque the download but with lower priority */ - - if (details.retries < retryLimit - 1) { - details.retries ++; - if (details.priority > 0) { - details.priority = (DwlPriority) (details.priority - 1); - } - - prmtx.lock(); { - priorities.push_back(details); - priorities.sort(PriorityCompare()); - } - prmtx.unlock(); - - IndicateConfigChanged(); - } - } - } -} - -void ftDwlQueue::insertDownload(const DwlDetails & details) { - DwlDetails _details(details); - -#ifdef DEBUG_QUEUE - std::list::iterator it; - std::cerr << "ftDwlQueue::insertDownload(" - << _details.fname << "," - << _details.hash << "," - << _details.count << "," - << _details.dest << "," - << _details.flags << ",<"; - - for(it = _details.srcIds.begin(); it != _details.srcIds.end(); it ++) { - std::cerr << *it << ","; - } - std::cerr << ">)"; - std::cerr << std::endl; -#endif - - /* if queue is empty and # of dwls does not - * exceed limit, start the download without - * putting it in the queue, else put it back - * in the queue */ - - unsigned int sDwl = totalSystemDwl(); - - RsStackMutex stack(prmtx); - - if (priorities.empty() && (sDwl + 1 <= downloadLimit)) { - if (!mFtController->FileRequest(_details.fname, _details.hash, _details.count, _details.dest, _details.flags, _details.srcIds)) { - /* reque the download but with lower priority */ - - if (_details.retries < (retryLimit - 1)) { - _details.retries ++; - if (_details.priority > 0) { - _details.priority = (DwlPriority) (_details.priority - 1); - } - - priorities.push_back(_details); - priorities.sort(PriorityCompare()); - IndicateConfigChanged(); - } - } - } else { - priorities.push_back(_details); - priorities.sort(PriorityCompare()); - IndicateConfigChanged(); - } -} - -bool ftDwlQueue::getNext(DwlDetails & details) { - RsStackMutex stack(prmtx); - - if (!priorities.empty()) { - details = priorities.front(); - priorities.pop_front(); -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::getNext() file: " << details.fname - << " priority: " << details.priority << std::endl; -#endif - IndicateConfigChanged(); - - return true; - } - - return false; -} - -bool ftDwlQueue::peekAtNext(DwlDetails & details) { - RsStackMutex stack(prmtx); - - if (!priorities.empty()) { - details = priorities.front(); -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::peekAtNext() file: " << details.fname - << " priority: " << details.priority << std::endl; -#endif - - return true; - } - - return false; -} - -bool ftDwlQueue::changePriority(const std::string hash, DwlPriority priority) { - RsStackMutex stack(prmtx); - - std::list::iterator it; - for (it = priorities.begin(); it != priorities.end(); it ++) { - if (it->hash == hash) { - it->priority = priority; - priorities.sort(PriorityCompare()); -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::changePriority() file: " << hash - << " new priority: " << it->priority << std::endl; -#endif - IndicateConfigChanged(); - - return true; - } - } - - return false; -} - -bool ftDwlQueue::getPriority(const std::string hash, DwlPriority & priority) { - RsStackMutex stack(prmtx); - - std::list::const_iterator it; - for (it = priorities.begin(); it != priorities.end(); it ++) { - if (it->hash == hash) { - priority = it->priority; -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::getPriority() file: " << hash - << " priority: " << priority << std::endl; -#endif - - return true; - } - } - - return false; -} - -bool ftDwlQueue::clearDownload(const std::string hash) { - RsStackMutex stack(prmtx); - - std::list::iterator it; - for (it = priorities.begin(); it != priorities.end(); it ++) { - if (it->hash == hash) { - it = priorities.erase(it); -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::clearDownload() file: " << hash << std::endl; -#endif - IndicateConfigChanged(); - - return true; - } - } - - return false; -} - -void ftDwlQueue::getDwlDetails(std::list & details) { -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::getDwlDetails()" << std::endl; -#endif - details.clear(); - - RsStackMutex stack(prmtx); - - std::list::iterator it; - for (it = priorities.begin(); it != priorities.end(); it ++) { - details.push_back(*it); - } -} - -void ftDwlQueue::clearQueue() { -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::clearQueue()" << std::endl; -#endif - RsStackMutex stack(prmtx); - - priorities.clear(); -} - -unsigned int ftDwlQueue::totalSystemDwl() { - unsigned int totalDwl = 0; - - std::list hashes; - std::list::iterator it; - - rsFiles->FileDownloads(hashes); - - /* count the number of downloading files */ - for (it = hashes.begin(); it != hashes.end(); it ++) { - uint32_t flags = RS_FILE_HINTS_DOWNLOAD; - FileInfo info; - - if (!rsFiles->FileDetails(*it, flags, info)) continue; - - /* i'm not sure what other types should be counted here */ - if (info.downloadStatus == FT_STATE_DOWNLOADING || info.downloadStatus == FT_STATE_WAITING) - totalDwl ++; - } - - return totalDwl; -} - -/*********************************************/ -/************ Serialisation ******************/ -/*********************************************/ - -RsDwlQueueItem::~RsDwlQueueItem() { - return; -} - -void RsDwlQueueItem::clear() { - file.TlvClear(); - allPeerIds.TlvClear(); - priority = 0; -} - -std::ostream &RsDwlQueueItem::print(std::ostream &out, uint16_t indent) { - printRsItemBase(out, "RsDwlQueueItem", indent); - - file.print(out, indent + 2); - allPeerIds.print(out, indent + 2); - - printIndent(out, indent + 2); - - switch (priority) { - case 0: - out << "priority: " << "Low" << std::endl; - break; - case 1: - out << "priority: " << "Normal" << std::endl; - break; - case 2: - out << "priority: " << "High" << std::endl; - break; - case 3: - out << "priority: " << "Auto" << std::endl; - break; - default: - out << "priority: " << "Auto" << std::endl; - break; - } - - printRsItemEnd(out, "RsDwlQueueItem", indent); - - return out; -} - -RsDwlQueueSerialiser::~RsDwlQueueSerialiser() { - return; -} - -uint32_t RsDwlQueueSerialiser::size(RsItem *i) { - RsDwlQueueItem *item; - uint32_t s = 0; - - if (NULL != (item = dynamic_cast(i))) { - s = 8; /* header */ - s += item->file.TlvSize(); /* file size */ - s += item->allPeerIds.TlvSize(); /* peers size */ - s += 4; /* priority size */ - } - - return s; -} - -bool RsDwlQueueSerialiser::serialise(RsItem *i, void *data, uint32_t *size) { - RsDwlQueueItem *item = (RsDwlQueueItem *) i; - uint32_t tlvsize = RsDwlQueueSerialiser::size(item); - uint32_t offset = 0; - - if (*size < tlvsize) { - return false; /* not enough space */ - } - - *size = tlvsize; - - bool ok = true; - - ok &= setRsItemHeader(data, tlvsize, item->PacketId(), tlvsize); - -#ifdef RSSERIAL_DEBUG - std::cerr << "RsDwlQueueSerialiser::serialise() Header: " << ok << std::endl; - std::cerr << "RsDwlQueueSerialiser::serialise() Size: " << size << std::endl; -#endif - - /* skip the header */ - offset += 8; - - ok &= item->file.SetTlv(data, tlvsize, &offset); - ok &= item->allPeerIds.SetTlv(data, tlvsize, &offset); - ok &= setRawUInt32(data, tlvsize, &offset, item->priority); - - if (offset !=tlvsize) { - ok = false; -#ifdef RSSERIAL_DEBUG - std::cerr << "RsDwlQueueSerialiser::serialise() Size Error! " << std::endl; -#endif - } - - return ok; -} - -RsItem *RsDwlQueueSerialiser::deserialise(void *data, uint32_t *size) { - /* get the type and size */ - uint32_t rstype = getRsItemId(data); - uint32_t rssize = getRsItemSize(data); - - uint32_t offset = 0; - - if ((RS_PKT_VERSION1 != getRsItemVersion(rstype)) || - (RS_PKT_CLASS_CONFIG != getRsItemClass(rstype)) || - (RS_PKT_TYPE_QUEUE_CONFIG != getRsItemType(rstype)) || - (RS_PKT_SUBTYPE_FILE_ITEM != getRsItemSubType(rstype))) { - return NULL; /* wrong type */ - } - - if (*size < rssize) { - return NULL; /* not enough data */ - } - - /* set the packet length */ - *size = rssize; - - bool ok = true; - - /* ready to load */ - RsDwlQueueItem *item = new RsDwlQueueItem(); - item->clear(); - - /* skip the header */ - offset += 8; - - ok &= item->file.GetTlv(data, rssize, &offset); - ok &= item->allPeerIds.GetTlv(data, rssize, &offset); - ok &= getRawUInt32(data, rssize, &offset, &item->priority); - - if (offset != rssize) { -#ifdef RSSERIAL_DEBUG - std::cerr << "RsDwlQueueSerialiser::deserialise() offset != rssize" << std::endl; -#endif - delete item; - return NULL; - } - - if (!ok) { -#ifdef RSSERIAL_DEBUG - std::cerr << "RsDwlQueueSerialiser::deserialise() ok = false" << std::endl; -#endif - delete item; - return NULL; - } - - return item; -} - -/*********************************************/ -/* p3Config interface methods implementation */ -/*********************************************/ - -RsSerialiser *ftDwlQueue::setupSerialiser() { - RsSerialiser *rss = new RsSerialiser(); - rss->addSerialType(new RsDwlQueueSerialiser()); - - return rss; -} - -std::list ftDwlQueue::saveList(bool &cleanup) { -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::saveList()" << std::endl; -#endif - RsStackMutex stack(prmtx); - - cleanup = true; - std::list result; - - std::list::iterator it; - for (it = priorities.begin(); it != priorities.end(); it ++) { - RsDwlQueueItem *item = new RsDwlQueueItem(); - - RsTlvFileItem file; - file.filesize = it->count; - file.hash = it->hash; - file.name = it->fname; - file.path = it->dest; - - RsTlvPeerIdSet allPeerIds; - allPeerIds.ids = it->srcIds; - - item->file = file; - item->allPeerIds = allPeerIds; - item->priority = it->priority; - -#ifdef DEBUG_QUEUE - std::list::iterator dit; - std::cerr << "ftDwlQueue::saveList - save item(" - << it->fname << "," - << it->hash << "," - << it->count << "," - << it->dest << "," - << it->flags << ",<"; - - for(dit = it->srcIds.begin(); dit != it->srcIds.end(); dit ++) { - std::cerr << *dit << ","; - } - std::cerr << ">)"; - std::cerr << std::endl; -#endif - result.push_back(item); - } - - return result; -} - -bool ftDwlQueue::loadList(std::list load) { -#ifdef DEBUG_QUEUE - std::cerr << "ftDwlQueue::loadList()" << std::endl; -#endif - RsStackMutex stack(prmtx); - - priorities.clear(); - - std::list::iterator it; - for (it = load.begin(); it != load.end(); it ++) { - RsDwlQueueItem *item = dynamic_cast(*it); -#ifdef DEBUG_QUEUE - assert(item != NULL); -#endif - if (!item) continue; - - DwlDetails details(item->file.name, item->file.hash, item->file.filesize, item->file.path, - 0, item->allPeerIds.ids, (DwlPriority) item->priority); - -#ifdef DEBUG_QUEUE - std::list::iterator dit; - std::cerr << "ftDwlQueue::loadList - load item(" - << details.fname << "," - << details.hash << "," - << details.count << "," - << details.dest << "," - << details.flags << ",<"; - - for(dit = details.srcIds.begin(); dit != details.srcIds.end(); dit ++) { - std::cerr << *dit << ","; - } - std::cerr << ">)"; - std::cerr << std::endl; -#endif - priorities.push_back(details); - - delete item; - } - - /* not sure if necessary, list should be already sorted */ - priorities.sort(PriorityCompare()); - - return true; -} diff --git a/libretroshare/src/ft/ftdwlqueue.h b/libretroshare/src/ft/ftdwlqueue.h deleted file mode 100644 index d86235d49..000000000 --- a/libretroshare/src/ft/ftdwlqueue.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * ftdwlqueue.h - * - * Created on: Jul 22, 2009 - * Author: alexandrut - */ - -#ifndef FTDWLQUEUE_H_ -#define FTDWLQUEUE_H_ - -#include "util/rsthreads.h" -#include "ftcontroller.h" - -#include -#include - -const uint8_t RS_PKT_TYPE_QUEUE_CONFIG = 0x05; - -class RsDwlQueueItem: public RsItem { -public: - RsDwlQueueItem() - : RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_QUEUE_CONFIG, RS_PKT_SUBTYPE_FILE_ITEM) { - return; - } - - virtual ~RsDwlQueueItem(); - - virtual void clear(); - virtual std::ostream &print(std::ostream &out, uint16_t indent = 0); - - RsTlvFileItem file; - RsTlvPeerIdSet allPeerIds; - uint32_t priority; -}; - -class RsDwlQueueSerialiser: public RsSerialType { -public: - RsDwlQueueSerialiser() - : RsSerialType(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_QUEUE_CONFIG) { - return; - } - - virtual ~RsDwlQueueSerialiser(); - - virtual uint32_t size(RsItem *); - virtual bool serialise (RsItem *item, void *data, uint32_t *size); - virtual RsItem * deserialise(void *data, uint32_t *size); -}; - -/* comparator class used when sorting list */ -class PriorityCompare { -public: - PriorityCompare(bool reverse = false) - : reverse(reverse) { return; } - bool operator()(const DwlDetails & l, const DwlDetails & r) { - if (reverse) {return (l.priority < r.priority);} - else return (l.priority > r.priority); - } - -private: - bool reverse; -}; - -/* base class for a download queue with - * default actions for a priority queue */ -class DwlQueue { -public: - /* specific actions for a priority queue */ - virtual void insertDownload(const DwlDetails & details) = 0; - virtual bool getNext(DwlDetails & details) = 0; - virtual bool peekAtNext(DwlDetails & details) = 0; - - /* administrative actions */ - virtual bool changePriority(const std::string hash, DwlPriority priority) = 0; - virtual bool getPriority(const std::string hash, DwlPriority & priority) = 0; - virtual bool clearDownload(const std::string hash) = 0; - virtual void clearQueue() = 0; -}; - -/* general class for download queue which - * contains the a download priority list */ -class ftDwlQueue : public DwlQueue, public RsThread, public p3Config { -public: - ftDwlQueue(ftController *ftc, unsigned int downloadLimit = 7, unsigned int retryLimit = 10); - virtual ~ftDwlQueue(); - - /* from thread interface */ - virtual void run(); - - /* from download queue interface */ - virtual void insertDownload(const DwlDetails & details); - virtual bool getNext(DwlDetails & details); - virtual bool peekAtNext(DwlDetails & details); - virtual bool changePriority(const std::string hash, DwlPriority priority); - virtual bool getPriority(const std::string hash, DwlPriority & priority); - virtual bool clearDownload(const std::string hash); - virtual void clearQueue(); - virtual void getDwlDetails(std::list & details); - - /* from p3 config interface */ -protected: - virtual RsSerialiser *setupSerialiser(); - virtual std::list saveList(bool &cleanup); - virtual bool loadList(std::list load); - -private: - unsigned int downloadLimit; - unsigned int retryLimit; - - ftController *mFtController; - - RsMutex prmtx; - std::list priorities; - - unsigned int totalSystemDwl(); -}; - -#endif /* FTDWLQUEUE_H_ */