diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | xmrstak/misc/executor.cpp | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index def7fee..6ae815a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ addons: env: global: - CUDA_ROOT: $HOME/.cache/cuda - + matrix: include: - os: linux @@ -76,7 +76,10 @@ matrix: - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF" before_install: - - if [ $TRAVIS_OS_NAME = osx ]; then brew tap homebrew/science; fi + - if [ $TRAVIS_OS_NAME = osx ]; then + brew update; + brew tap homebrew/science; + fi - export PATH=$CUDA_ROOT/bin:$PATH install: @@ -100,7 +103,7 @@ script: - if [ $TRAVIS_OS_NAME = osx ]; then brew install hwloc; cmake -DMICROHTTPD_ENABLE=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl ${XMRSTAK_CMAKE_FLAGS} .; - else + else cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ${XMRSTAK_CMAKE_FLAGS} .; fi; - make VERBOSE=1 install diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index ec9ac12..4627794 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -451,7 +451,7 @@ void executor::ex_main() for (i = 0; i < pvThreads->size(); i++) { - fTelem = telem->calc_telemetry_data(2500, i); + fTelem = telem->calc_telemetry_data(10000, i); if(std::isnormal(fTelem)) { fHps += fTelem; @@ -730,7 +730,7 @@ void executor::http_hashrate_report(std::string& out) { double fHps[3]; - fHps[0] = telem->calc_telemetry_data(2500, i); + fHps[0] = telem->calc_telemetry_data(10000, i); fHps[1] = telem->calc_telemetry_data(60000, i); fHps[2] = telem->calc_telemetry_data(900000, i); @@ -870,7 +870,7 @@ void executor::http_json_report(std::string& out) if(i != 0) hr_thds.append(1, ','); double fHps[3]; - fHps[0] = telem->calc_telemetry_data(2500, i); + fHps[0] = telem->calc_telemetry_data(10000, i); fHps[1] = telem->calc_telemetry_data(60000, i); fHps[2] = telem->calc_telemetry_data(900000, i); |
