Skip to content
This repository was archived by the owner on Oct 21, 2019. It is now read-only.

Commit a388e2e

Browse files
committed
speedup, keepalive changes
1 parent 4f5945b commit a388e2e

6 files changed

Lines changed: 417 additions & 73 deletions

File tree

ethminer/MinerAux.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class MinerCLI
128128
m_farmURL = argv[++i];
129129
m_activeFarmURL = m_farmURL;
130130
}
131-
else if ((arg == "-FF" || arg == "-FS" || arg == "--farm-failover" || arg == "--stratum-failover") && i + 1 < argc)
131+
else if ((arg == "-FF" || arg == "-FS" || arg == "--farm-failover" || arg == "--failover-stratum") && i + 1 < argc)
132132
{
133133
string url = argv[++i];
134134

libethash-cl/CL/cl.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2790,11 +2790,11 @@ __declspec(selectany) Context Context::default_;
27902790
__declspec(selectany) volatile cl_int Context::default_error_ = CL_SUCCESS;
27912791
#else // !_WIN32
27922792
#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED
2793-
__attribute__((weak)) std::atomic<int> Context::default_initialized_;
2793+
std::atomic<int> Context::default_initialized_;
27942794
#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED
2795-
__attribute__((weak)) volatile int Context::default_initialized_ = __DEFAULT_NOT_INITIALIZED;
2795+
volatile int Context::default_initialized_ = __DEFAULT_NOT_INITIALIZED;
27962796
#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED
2797-
__attribute__((weak)) Context Context::default_;
2797+
Context Context::default_;
27982798
__attribute__((weak)) volatile cl_int Context::default_error_ = CL_SUCCESS;
27992799
#endif // !_WIN32
28002800

@@ -6562,11 +6562,11 @@ __declspec(selectany) CommandQueue CommandQueue::default_;
65626562
__declspec(selectany) volatile cl_int CommandQueue::default_error_ = CL_SUCCESS;
65636563
#else // !_WIN32
65646564
#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED
6565-
__attribute__((weak)) std::atomic<int> CommandQueue::default_initialized_;
6565+
std::atomic<int> CommandQueue::default_initialized_;
65666566
#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED
6567-
__attribute__((weak)) volatile int CommandQueue::default_initialized_ = __DEFAULT_NOT_INITIALIZED;
6567+
volatile int CommandQueue::default_initialized_ = __DEFAULT_NOT_INITIALIZED;
65686568
#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED
6569-
__attribute__((weak)) CommandQueue CommandQueue::default_;
6569+
CommandQueue CommandQueue::default_;
65706570
__attribute__((weak)) volatile cl_int CommandQueue::default_error_ = CL_SUCCESS;
65716571
#endif // !_WIN32
65726572

libethash-cl/ethash_cl_miner.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ void ethash_cl_miner::finish()
327327
m_queue.finish();
328328
}
329329

330+
330331
bool ethash_cl_miner::init(
331332
ethash_light_t _light,
332333
uint8_t const* _lightData,

0 commit comments

Comments
 (0)