Merge remote-tracking branch 'origin/master' into release/0.14

Author: chfast

cmake/EthCompilerSettings.cmake

@@ -25,28 +25,26 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 
+	# declare Windows XP requirement
+	# undefine windows.h MAX & MIN macros because they conflict with std::min & std::max functions
+	# disable unsafe CRT Library functions warnings
+	add_definitions(/D_WIN32_WINNT=0x0501 /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS)
+
 	# enable parallel compilation
-	# specify Exception Handling Model in msvc
+	# specify Exception Handling Model
 	# enable LTCG for faster builds
-	# disable unknown pragma warning (4068)
-	# disable unsafe function warning (4996)
-	# disable decorated name length exceeded, name was truncated (4503)
-	# disable conversion from 'size_t' to 'type', possible loss of data (4267)
-	# disable qualifier applied to function type has no meaning; ignored (4180)
-	# disable C++ exception specification ignored except to indicate a function is not __declspec(nothrow) (4290)
-	# disable conversion from 'type1' to 'type2', possible loss of data (4244)
-	# disable forcing value to bool 'true' or 'false' (performance warning) (4800)
-	# declare Windows XP requirement
-	# undefine windows.h MAX & MIN macros because they cause conflicts with std::min & std::max functions
-	add_compile_options(/MP /EHsc /GL /wd4068 /wd4996 /wd4503 /wd4267 /wd4180 /wd4290 /wd4244 /wd4800 -D_WIN32_WINNT=0x0501 /DNOMINMAX)
-	# disable empty object file warning
-	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG /ignore:4221")
+	# disable conversion from 'size_t' to 'type', possible loss of data (C4267)
+	# disable C++ exception specification ignored except to indicate a function is not __declspec(nothrow) (C4290)
+	# disable decorated name length exceeded, name was truncated (C4503)
+	add_compile_options(/MP /EHsc /GL /wd4267 /wd4290 /wd4503)
+
+	# enable LTCG for faster builds
+	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
+
 	# enable LTCG for faster builds
-	# enable RELEASE so that the executable file has its checksum set
 	# enable unused references removal
-	# warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/SAFESEH' specification
-	# warning LNK4099: pdb was not found with lib
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG /RELEASE /OPT:REF /OPT:ICF /ignore:4099,4075")
+	# enable RELEASE so that the executable file has its checksum set
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG /OPT:REF /OPT:ICF /RELEASE")
 else ()
 	message(WARNING "Your compiler is not tested, if you run into any issues, we'd welcome any patches.")
 endif ()
@@ -55,4 +53,3 @@ set(SANITIZE NO CACHE STRING "Instrument build with provided sanitizer")
 if(SANITIZE)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=${SANITIZE}")
 endif()
-

cmake/cable

@@ -334,7 +334,7 @@ class MinerCLI
 		{
 			m_show_hwmonitors = true;
 			if ((i + 1 < argc) && (*argv[i + 1] != '-'))
-				m_show_power = (bool)atoi(argv[++i]);
+				m_show_power = atoi(argv[++i]) != 0;
 		}
 		else if ((arg == "--exit"))
 		{
@@ -870,7 +870,8 @@ class MinerCLI
 		WorkPackage current = WorkPackage(genesis);
 
 
-		map<uint64_t, WorkingProgress> results;
+		vector<uint64_t> results;
+		results.reserve(_trials);
 		uint64_t mean = 0;
 		uint64_t innerMean = 0;
 		for (unsigned i = 0; i <= _trials; ++i)
@@ -890,16 +891,19 @@ class MinerCLI
 			auto rate = mp.rate();
 
 			cout << rate << endl;
-			results[rate] = mp;
+			results.push_back(rate);
 			mean += rate;
 		}
-		int j = -1;
-		for (auto const& r: results)
-			if (++j > 0 && j < (int)_trials - 1)
-				innerMean += r.second.rate();
-		innerMean /= (_trials - 2);
-		cout << "min/mean/max: " << results.begin()->second.rate() << "/" << (mean / _trials) << "/" << results.rbegin()->second.rate() << " H/s" << endl;
-		cout << "inner mean: " << innerMean << " H/s" << endl;
+		sort(results.begin(), results.end());
+		cout << "min/mean/max: " << results.front() << "/" << (mean / _trials) << "/" << results.back() << " H/s" << endl;
+		if (results.size() > 2) {
+			for (auto it = results.begin()+1; it != results.end()-1; it++)
+				innerMean += *it;
+			innerMean /= (_trials - 2);
+			cout << "inner mean: " << innerMean << " H/s" << endl;
+		}
+		else
+			cout << "inner mean: n/a" << endl;
 
 		exit(0);
 	}

ethminer/MinerAux.h

@@ -23,11 +23,6 @@
 
 #pragma once
 
-// way to many unsigned to size_t warnings in 32 bit build
-#ifdef _M_IX86
-#pragma warning(disable:4244)
-#endif
-
 #include <map>
 #include <unordered_map>
 #include <vector>

libdevcore/Common.h

@@ -508,17 +508,8 @@ void CUDAMiner::search(
 					found_count = SEARCH_RESULTS;
 				for (unsigned int j = 0; j < found_count; j++) {
 					nonces[j] = nonce_base + buffer->result[j].gid;
-					if (s_noeval) {
-						uint32_t* m = (uint32_t *)(mixes + j);
-						m[0] = buffer->result[j].mix[0] ;
-						m[1] = buffer->result[j].mix[1] ;
-						m[2] = buffer->result[j].mix[2] ;
-						m[3] = buffer->result[j].mix[3] ;
-						m[4] = buffer->result[j].mix[4] ;
-						m[5] = buffer->result[j].mix[5] ;
-						m[6] = buffer->result[j].mix[6] ;
-						m[7] = buffer->result[j].mix[7] ;
-					}
+					if (s_noeval)
+						memcpy(mixes[j].data(), (void *)&buffer->result[j].mix, sizeof(buffer->result[j].mix));
 				}
 			}
 		}

libethash-cuda/CUDAMiner.cpp

@@ -17,8 +17,6 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS
-
 #include <time.h>
 #include <functional>
 #include <libethash/ethash.h>

libethash-cuda/CUDAMiner.h

@@ -208,7 +208,7 @@ class Farm: public FarmFace
             m_lastProgresses.push_back(p);
 
         // We smooth the hashrate over the last x seconds
-        int allMs = 0;
+        uint64_t allMs = 0;
         for (auto const& cp : m_lastProgresses)
             allMs += cp.ms;
 
@@ -439,7 +439,7 @@ class Farm: public FarmFace
 	bool b_lastMixed = false;
 
 	std::chrono::steady_clock::time_point m_lastStart;
-	int m_hashrateSmoothInterval = 10000;
+	uint64_t m_hashrateSmoothInterval = 10000;
 	std::thread m_serviceThread;  ///< The IO service thread.
 	boost::asio::io_service m_io_service;
 	boost::asio::deadline_timer m_hashrateTimer;

libethcore/Farm.h

@@ -287,7 +287,7 @@ int wrap_adl_get_power_usage(wrap_adl_handle *adlh, int gpuindex, unsigned int*
 
 	int power = 0;
 	rc = adlh->adl2Overdrive6CurrentPowerGet(adlh->context, adlh->phys_logi_device_id[gpuindex], 0, &power);
-	*miliwatts = power * 3.90625;
+	*miliwatts = (unsigned int)(power * 3.90625);
 	return rc;
 }
 

libhwmon/wrapadl.cpp

@@ -312,7 +312,7 @@ int wrap_amdsysfs_get_fanpcnt(wrap_amdsysfs_handle *sysfsh, int index, unsigned
 		gpuindex, hwmonindex);
 	getFileContentValue(dbuf, pwmMin);
 
-	*fanpcnt = double(pwm - pwmMin) / double(pwmMax - pwmMin) * 100.0;
+	*fanpcnt = (unsigned int)(double(pwm - pwmMin) / double(pwmMax - pwmMin) * 100.0);
 	return 0;
 }
 

libhwmon/wrapamdsysfs.cpp

@@ -33,12 +33,11 @@ static void diffToTarget(uint32_t *target, double diff)
 
 
 EthStratumClient::EthStratumClient(int const & worktimeout, string const & email, bool const & submitHashrate) : PoolClient(),
-	m_socket(nullptr),
-	m_securesocket(nullptr),
+        m_socket(nullptr),
 	m_worktimer(m_io_service),
 	m_responsetimer(m_io_service),
 	m_hashrate_event(m_io_service),
-	m_resolver(m_io_service)
+        m_resolver(m_io_service)
 {
 	m_authorized = false;
 	m_pending = 0;
@@ -54,15 +53,6 @@ EthStratumClient::~EthStratumClient()
 {
 	m_io_service.stop();
 	m_serviceThread.join();
-
-	if (m_connection.SecLevel() != SecureLevel::NONE) {
-		if (m_securesocket) 
-			delete m_securesocket;
-	}
-	else {
-		if (m_socket)
-			delete m_socket;
-	}
 }
 
 void EthStratumClient::connect()
@@ -85,7 +75,7 @@ void EthStratumClient::connect()
 			method = boost::asio::ssl::context::tlsv12;
 
 		boost::asio::ssl::context ctx(method);
-		m_securesocket = new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_service, ctx);
+		m_securesocket = std::make_shared<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> >(m_io_service, ctx);
 		m_socket = &m_securesocket->next_layer();
 
 		if (m_connection.SecLevel() != SecureLevel::ALLOW_SELFSIGNED) {
@@ -127,7 +117,8 @@ void EthStratumClient::connect()
 		}
 	}
 	else {
-		m_socket = new boost::asio::ip::tcp::socket(m_io_service);
+	  m_nonsecuresocket = std::make_shared<boost::asio::ip::tcp::socket>(m_io_service);
+	  m_socket = m_nonsecuresocket.get();
 	}
 
 	// Activate keep alive to detect disconnects
@@ -182,14 +173,6 @@ void EthStratumClient::disconnect()
 	catch (std::exception const& _e) {
 		cwarn << "Error while disconnecting:" << _e.what();
 	}
-
-	if (m_connection.SecLevel() != SecureLevel::NONE) {
-		delete m_securesocket;
-	}
-	else {
-		delete m_socket;
-	}
-
 	m_authorized = false;
 	m_connected.store(false, std::memory_order_relaxed);
 
@@ -233,7 +216,7 @@ void EthStratumClient::async_write_with_response()
 				boost::asio::placeholders::error));
 	}
 	else {
-		async_write(*m_socket, m_requestBuffer,
+		async_write(*m_nonsecuresocket, m_requestBuffer,
 			boost::bind(&EthStratumClient::handleResponse, this,
 				boost::asio::placeholders::error));
 	}
@@ -606,7 +589,7 @@ void EthStratumClient::hashrate_event_handler(const boost::system::error_code& e
 		async_write(*m_securesocket, m_requestBuffer,
 			boost::bind(&EthStratumClient::handleHashrateResponse, this, boost::asio::placeholders::error));
 	else
-		async_write(*m_socket, m_requestBuffer,
+		async_write(*m_nonsecuresocket, m_requestBuffer,
 			boost::bind(&EthStratumClient::handleHashrateResponse, this, boost::asio::placeholders::error));
 }
 

libpoolprotocols/stratum/EthStratumClient.cpp

@@ -73,7 +73,12 @@ class EthStratumClient : public PoolClient
 	std::thread m_serviceThread;  ///< The IO service thread.
 	boost::asio::io_service m_io_service;
 	boost::asio::ip::tcp::socket *m_socket;
-	boost::asio::ssl::stream<boost::asio::ip::tcp::socket> *m_securesocket;
+	// Use shared ptrs to avoid crashes due to async_writes
+	// see https://stackoverflow.com/questions/41526553/can-async-write-cause-segmentation-fault-when-this-is-deleted
+	std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> >
+	  m_securesocket;
+	std::shared_ptr<boost::asio::ip::tcp::socket>
+	  m_nonsecuresocket;
 
 	boost::asio::streambuf m_requestBuffer;
 	boost::asio::streambuf m_responseBuffer;