Various networking fixes.

gavofyork · gavofyork · commit d60ee48ddd3e · 2014-09-20T18:56:15.000-05:00
diff --git a/alethzero/DownloadView.cpp b/alethzero/DownloadView.cpp
@@ -38,15 +38,21 @@ void DownloadView::paintEvent(QPaintEvent*)
 {
 	QPainter p(this);
 
-	if (!m_man || m_man->chain().empty())
+	if (!m_man || m_man->chain().empty() || !m_man->subCount())
 	{
 		p.fillRect(rect(), Qt::white);
 		return;
 	}
 
 	p.fillRect(rect(), Qt::black);
 
-	double n = sqrt(double(rect().width()) * rect().height() / m_man->chain().size());
+
+	double ratio = (double)rect().width() / rect().height();
+	if (ratio < 1)
+		ratio = 1 / ratio;
+	double n = min(rect().width(), rect().height()) / ceil(sqrt(m_man->chain().size() / ratio));
+
+//	double n = sqrt(double(rect().width()) * rect().height() / (m_man->chain().size()));
 	QSizeF area(n, n);
 	QPointF pos(0, 0);
 
@@ -57,6 +63,14 @@ void DownloadView::paintEvent(QPaintEvent*)
 		QColor c = Qt::black;
 		if (bg.contains(i))
 			c = Qt::white;
+		unsigned h = 0;
+		unsigned dh = 360 / m_man->subCount();
+		m_man->foreachSub([&](DownloadSub const& s)
+		{
+			if (s.asked().contains(i))
+				c = QColor::fromHsv(h, 64, 128);
+			h += dh;
+		});
 		p.fillRect(QRectF(pos, area), QBrush(c));
 
 		pos.setX(pos.x() + n);
diff --git a/libdevcore/Worker.cpp b/libdevcore/Worker.cpp
@@ -40,7 +40,7 @@ void Worker::startWorking()
 		setThreadName(m_name.c_str());
 		while (!m_stop)
 		{
-			this_thread::sleep_for(chrono::milliseconds(100));
+			this_thread::sleep_for(chrono::milliseconds(30));
 			doWork();
 		}
 		cdebug << "Finishing up worker thread";
diff --git a/libethereum/DownloadMan.h b/libethereum/DownloadMan.h
@@ -120,6 +120,7 @@ class DownloadMan
 
 	h256s chain() const { return m_chain; }
 	void foreachSub(std::function<void(DownloadSub const&)> const& _f) const { ReadGuard l(x_subs); for(auto i: m_subs) _f(*i); }
+	unsigned subCount() const { ReadGuard l(x_subs); return m_subs.size(); }
 	RangeMask<unsigned> blocksGot() const { return m_blocksGot; }
 
 private:
diff --git a/libethereum/EthereumPeer.cpp b/libethereum/EthereumPeer.cpp
@@ -117,7 +117,7 @@ void EthereumPeer::giveUpOnFetch()
 	clogS(NetNote) << "GIVE UP FETCH";
 
 	// a bit overkill given that the other nodes may yet have the needed blocks, but better to be safe than sorry.
-	if (m_grabbing == Grabbing::Chain)
+	if (m_grabbing == Grabbing::Chain || m_grabbing == Grabbing::ChainHelper)
 	{
 		host()->noteDoneBlocks(this);
 		m_grabbing = Grabbing::Nothing;
diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp
@@ -452,7 +452,6 @@ void Host::growPeers()
 				m_lastPeersRequest = chrono::steady_clock::now();
 			}
 
-
 			if (!m_accepting)
 				ensureAccepting();
 
@@ -462,10 +461,8 @@ void Host::growPeers()
 		auto x = time(0) % m_freePeers.size();
 		m_incomingPeers[m_freePeers[x]].second++;
 		if (!m_peers.count(m_freePeers[x]))
-		{
 			connect(m_incomingPeers[m_freePeers[x]].first);
-			m_freePeers.erase(m_freePeers.begin() + x);
-		}
+		m_freePeers.erase(m_freePeers.begin() + x);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void Worker::startWorking()`
`40`	`40`	`setThreadName(m_name.c_str());`
`41`	`41`	`while (!m_stop)`
`42`	`42`	`{`
`43`		`- this_thread::sleep_for(chrono::milliseconds(100));`
	`43`	`+ this_thread::sleep_for(chrono::milliseconds(30));`
`44`	`44`	`doWork();`
`45`	`45`	`}`
`46`	`46`	`cdebug << "Finishing up worker thread";`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void EthereumPeer::giveUpOnFetch()`
`117`	`117`	`clogS(NetNote) << "GIVE UP FETCH";`
`118`	`118`
`119`	`119`	`// a bit overkill given that the other nodes may yet have the needed blocks, but better to be safe than sorry.`
`120`		`- if (m_grabbing == Grabbing::Chain)`
	`120`	`+ if (m_grabbing == Grabbing::Chain \|\| m_grabbing == Grabbing::ChainHelper)`
`121`	`121`	`{`
`122`	`122`	`host()->noteDoneBlocks(this);`
`123`	`123`	`m_grabbing = Grabbing::Nothing;`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,6 @@ void Host::growPeers()`
`452`	`452`	`m_lastPeersRequest = chrono::steady_clock::now();`
`453`	`453`	`}`
`454`	`454`
`455`		`-`
`456`	`455`	`if (!m_accepting)`
`457`	`456`	`ensureAccepting();`
`458`	`457`
`@@ -462,10 +461,8 @@ void Host::growPeers()`
`462`	`461`	`auto x = time(0) % m_freePeers.size();`
`463`	`462`	`m_incomingPeers[m_freePeers[x]].second++;`
`464`	`463`	`if (!m_peers.count(m_freePeers[x]))`
`465`		`- {`
`466`	`464`	`connect(m_incomingPeers[m_freePeers[x]].first);`
`467`		`- m_freePeers.erase(m_freePeers.begin() + x);`
`468`		`- }`
	`465`	`+ m_freePeers.erase(m_freePeers.begin() + x);`
`469`	`466`	`}`
`470`	`467`	`}`
`471`	`468`