Browse Source

fix previous in getwork mode.

log output enhancements
new zip
cl-refactor
Genoil 9 years ago
parent
commit
6b0730e5c9
  1. 10
      ethminer/MinerAux.h
  2. 2
      libethash-cuda/CMakeLists.txt
  3. 3
      libethcore/EthashCUDAMiner.cpp
  4. 2
      libethcore/EthashGPUMiner.cpp
  5. BIN
      releases/ethminer-0.9.41-genoil-1.0.8.zip

10
ethminer/MinerAux.h

@ -924,13 +924,15 @@ private:
if (hh != current.headerHash)
{
x_current.lock();
previous.headerHash = current.headerHash;
previous.seedHash = current.seedHash;
previous.boundary = current.boundary;
current.headerHash = hh;
current.seedHash = newSeedHash;
current.boundary = h256(fromHex(v[2].asString()), h256::AlignRight);
minelog << "Got work package:";
minelog << " Header-hash:" << current.headerHash.hex();
minelog << " Seedhash:" << current.seedHash.hex();
minelog << " Target: " << h256(current.boundary).hex();
minelog << "Got work package: #" + current.headerHash.hex().substr(0,8);
//minelog << " Seedhash:" << current.seedHash.hex();
//minelog << " Target: " << h256(current.boundary).hex();
f.setWork(current);
x_current.unlock();
}

2
libethash-cuda/CMakeLists.txt

@ -13,7 +13,7 @@ LIST(APPEND CUDA_NVCC_FLAGS_DEBUG -G)
if(COMPUTE AND (COMPUTE GREATER 0))
LIST(APPEND CUDA_NVCC_FLAGS -gencode arch=compute_${COMPUTE},code=sm_${COMPUTE})
else(COMPUTE AND (COMPUTE GREATER 0))
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-gencode arch=compute_30,code=sm_30;-gencode arch=compute_35,code=sm_35;-gencode arch=compute_50,code=sm_50;-gencode arch=compute_52,code=sm_52)
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-gencode arch=compute_50,code=sm_50;-gencode arch=compute_52,code=sm_52)
endif(COMPUTE AND (COMPUTE GREATER 0))

3
libethcore/EthashCUDAMiner.cpp

@ -149,7 +149,8 @@ void EthashCUDAMiner::workLoop()
// take local copy of work since it may end up being overwritten by kickOff/pause.
try {
WorkPackage w = work();
cnote << "seedhash" << "#" + m_minerSeed.hex().substr(0, 16);
//cnote << "seedhash" << "#" + m_minerSeed.hex().substr(0, 16);
cnote << "set work to" << "#" + w.headerHash.hex().substr(0, 8) + ", target " << "#" + w.boundary.hex().substr(0, 16);
if (!m_miner || m_minerSeed != w.seedHash)
{
cnote << "Initialising miner...";

2
libethcore/EthashGPUMiner.cpp

@ -139,7 +139,7 @@ void EthashGPUMiner::workLoop()
// take local copy of work since it may end up being overwritten by kickOff/pause.
try {
WorkPackage w = work();
cnote << "seedhash" << "#"+m_minerSeed.hex().substr(0,16);
cnote << "set work to:" << "#" + w.headerHash.hex().substr(0, 8) + ", target " << "#" + w.boundary.hex().substr(0, 16);
if (!m_miner || m_minerSeed != w.seedHash)
{
cnote << "Initialising miner...";

BIN
releases/ethminer-0.9.41-genoil-1.0.8.zip

Binary file not shown.
Loading…
Cancel
Save