Changeset 2760

Timestamp:

03/04/06 03:46:21 (3 years ago)

Author:

madcat

Message:

TCP server source requests are now split to 15-file-blocks, and sent at 4-minute intervals (max 75 files per 20 minutes). Rarest files are asked first.
UDP server source requests are now based on the rarity of the file, so that the rarest 25 or 31 files are always asked for. This should balance the average source count of large downloadlist, and ensure that all files have at least some sources.

Files:

• hydranode/hncore/ed2k/downloadlist.cpp (modified) (5 diffs)
• hydranode/hncore/ed2k/downloadlist.h (modified) (3 diffs)
• hydranode/hncore/ed2k/serverlist.cpp (modified) (4 diffs)
• hydranode/hncore/ed2k/serverlist.h (modified) (1 diff)

hydranode/hncore/ed2k/downloadlist.cpp

@@ -45 +45 @@
-// --------------
-Download::Download(PartData *pd, const Hash<ED2KHash> &hash) : m_partData(pd),
-, m_lastUdpQuery()
+
-        pd->getSourceCnt.connect(boost::bind(&Download::getSourceCount, this));
-        pd->getLinks.connect(boost::bind(&Download::getLink, this, _1, _2));
@@ -157 +157 @@
-                                        &Download::getHash
-                                >
-                        >,
-                        boost::multi_index::ordered_non_unique<
-                                boost::multi_index::const_mem_fun<
-                                        Download, uint32_t,
-                                        &Download::getSourceCount
-                                >
-                        >,
-                        boost::multi_index::ordered_non_unique<
-                                boost::multi_index::const_mem_fun<
-                                        Download, uint64_t,
-                                        &Download::getLastUdpQuery
-                                >
-                        >
-                >
-        > {};
-SrcCnt, ID_
+
-        typedef MIDownloadList::nth_index<ID_PD>::type::iterator Iter;
-        typedef MIDownloadList::nth_index<ID_Download>::type::iterator DIter;
-        typedef MIDownloadList::nth_index<ID_Hash>::type::iterator HashIter;
-        typedef MIDownloadList::nth_index<ID_SrcCnt>::type::iterator SrcCIter;
-        typedef MIDownloadList::nth_index<ID_UdpQTime>::type::iterator QTIter;
-        struct MIDownloadListIterator : public Iter {
-                template<typename T>
@@ -255 +241 @@
-        Detail::Iter it = list.find(pd);
-        if (it != list.end() && pd->isRunning()) {
-                // resumed download - force next UDP query
-                list.modify(it, bind(&Download::m_lastUdpQuery, __1) = 0);
-                onAdded(**it);
-                return;
@@ -288 +272 @@
-                        m_list->erase(it);
-                }
-        } else if (evt == PD_PAUSED) {
-                Detail::Iter it = m_list->find(pd);
-                if (it != m_list->end()) {
-                        // disables UDP queries for this file
-                        m_list->modify(
-                                it, bind(&Download::m_lastUdpQuery, __1)
-                                = std::numeric_limits<uint32_t>::max()
-                        );
-                }
-        } else if (evt == PD_RESUMED) {
-                tryAddFile(pd);
@@ -308 +283 @@
-                }
-        }
-}
-
-Download* DownloadList::getNextForUdpQuery() {
-        uint64_t curTick = Utils::getTick();
-        Detail::QTIter it = m_list->get<Detail::ID_UdpQTime>().lower_bound(0);
-
-        if (it != m_list->get<Detail::ID_UdpQTime>().end()) {
-                m_list->get<Detail::ID_UdpQTime>().modify(
-                        it, bind(&Download::m_lastUdpQuery, __1) = curTick
-                );
-                if ((*it)->getPartData()->isRunning()) {
-                        return *it;
-                }
-        }
-        return 0;
-}
-

hydranode/hncore/ed2k/downloadlist.h

@@ -60 +60 @@
-        uint32_t getSourceCount() const { return m_sources.size(); }
-        uint64_t getLastSrcExch() const { return m_lastSrcExch; }
-        uint64_t getLastUdpQuery() const { return m_lastUdpQuery; }
-        PartData* getPartData() const { return m_partData; }
-        uint32_t getSourceLimit() const { return m_sourceLimit; }
@@ -124 +123 @@
-        uint64_t          m_lastSrcExch;   //!< time of last source-exchange req
-        uint32_t          m_sourceLimit;   //!< limit sources
-        uint64_t          m_lastUdpQuery;  //!< last udp query time
-};
-
@@ -193 +191 @@
-        bool valid(Download *ptr) const;
-
-        /**
-         * Selects next download for sending ServerUDP query to
-         *
-         * \returns Download to be queried, or 0 if something goes wrong
-         */
-        Download* getNextForUdpQuery();
-
-        //! Emitted when a download is removed
-        boost::signal<void (Download&)> onRemoved;

hydranode/hncore/ed2k/serverlist.cpp

@@ -732 +732 @@
-        }
-
+        std::vector<Download*> downloads;
-        DownloadList& list = DownloadList::instance();
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        m_lastSourceRequest = Utils::getTick();
-        getEventTable().postEvent(this, EVT_REQSOURCES, SOURCEREASKTIME);
@@ -749 +798 @@
-                if (m_serverSocket && m_serverSocket->isConnected()) {
-                        reqSources();
+                } else {
+                        m_lastSourceRequest = Utils::getTick();
+                        getEventTable().postEvent(
+                                this, EVT_REQSOURCES, SOURCEREASKTIME
+                        );
-                }
-        } else if (evt == EVT_PINGSERVER) {
@@ -1001 +1055 @@
-        }
-
+        std::vector<Download*> downloads;
+        DownloadList& list = DownloadList::instance();
+        // can't use std::copy since Iter isn't fully standard-conformant
+        for (DownloadList::Iter i = list.begin(); i != list.end(); ++i) {
+                downloads.push_back(&*i);
+        }
+        std::sort(
+                downloads.begin(), downloads.end(),
+                boost::bind(&Download::getSourceCount, _1) <
+                boost::bind(&Download::getSourceCount, _2)
+        );
+
-        uint32_t cnt = 0;
-        ED2KPacket::GlobGetSources packet(sendSize);
-
-
-
+
+
+
+
+
+
-                        packet.addHash(d->getHash(), d->getSize());
-                        ++cnt;
-
-break
+if (limit < downloads.size()) 
+++limit
-                }
-        }
@@ -1296 +1365 @@
-}
-
+void ServerList::reqMoreSources(ED2KClientSocket *sock, std::string data) {
+        if (m_serverSocket && sock == m_serverSocket && sock->isConnected()) {
+                logDebug("Sending source request to server.");
+                CHECK(data.size());
+                *m_serverSocket << data;
+        } else {
+                logDebug(
+                        "Source request callback, but server "
+                        "has changed since then."
+                );
+        }
+}
+
-} // end namespace Donkey

hydranode/hncore/ed2k/serverlist.h

@@ -232 +232 @@
-
-        /**
+         * Requests sources from current server for next 15 files; this method
+         * is called via timed callbacks and shouldn't be called directly.
+         *
+         * @param sock        Socket to write to; writing is only performed if
+         *                    it matches m_serverSocket.
+         * @param data        Data to be written to the socket.
+         */
+        void reqMoreSources(ED2KClientSocket *sock, std::string data);
+
+        /**
-         * Chooses next server to perform UDP queries with
-         */