Skip to content
Snippets Groups Projects
Commit 970c9528 authored by psychocrypt's avatar psychocrypt
Browse files

fix missing algorithm name 

During the implementation of `cryptonight_gpu` we missed to add the name
of the algorithm to jpsock.

- add function to translate an algorithm into a name.
parent c0f81dee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
xmrstak/backend/cryptonight.hpp
+ 70
− 9
View file @ 970c9528
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <stddef.h> #include <stddef.h>
#include <inttypes.h> #include <inttypes.h>
#include <type_traits> #include <type_traits>
#include <string>
enum xmrstak_algo enum xmrstak_algo
{ {
...@@ -20,8 +21,68 @@ enum xmrstak_algo ...@@ -20,8 +21,68 @@ enum xmrstak_algo
cryptonight_superfast = 12, cryptonight_superfast = 12,
cryptonight_gpu = 13, cryptonight_gpu = 13,
cryptonight_turtle = 14 cryptonight_turtle = 14
// please add the algorithm name to get_algo_name()
}; };
/** get name of the algorithm
*
* @param algo mining algorithm
*/
inline std::string get_algo_name(xmrstak_algo algo)
{
std::string algo_name;
switch(algo)
{
case invalid_algo:
algo_name = "invalid_algo";
break;
case cryptonight:
algo_name = "cryptonight";
break;
case cryptonight_lite:
algo_name = "cryptonight_lite";
break;
case cryptonight_monero:
algo_name = "cryptonight_v7";
break;
case cryptonight_monero_v8:
algo_name = "cryptonight_v8";
break;
case cryptonight_aeon:
algo_name = "cryptonight_lite_v7";
break;
case cryptonight_stellite:
algo_name = "cryptonight_v7_stellite";
break;
case cryptonight_ipbc:
algo_name = "cryptonight_lite_v7_xor";
break;
case cryptonight_heavy:
algo_name = "cryptonight_heavy";
break;
case cryptonight_haven:
algo_name = "cryptonight_haven";
break;
case cryptonight_masari:
algo_name = "cryptonight_masari";
break;
case cryptonight_superfast:
algo_name = "cryptonight_superfast";
break;
case cryptonight_gpu:
algo_name = "cryptonight_gpu";
break;
case cryptonight_turtle:
algo_name = "cryptonight_turtle";
break;
default:
algo_name = "unknown";
break;
}
return algo_name;
}
// define aeon settings // define aeon settings
constexpr size_t CRYPTONIGHT_LITE_MEMORY = 1 * 1024 * 1024; constexpr size_t CRYPTONIGHT_LITE_MEMORY = 1 * 1024 * 1024;
constexpr uint32_t CRYPTONIGHT_LITE_MASK = 0xFFFF0; constexpr uint32_t CRYPTONIGHT_LITE_MASK = 0xFFFF0;
...@@ -40,7 +101,7 @@ constexpr uint32_t CRYPTONIGHT_GPU_ITER = 0xC000; ...@@ -40,7 +101,7 @@ constexpr uint32_t CRYPTONIGHT_GPU_ITER = 0xC000;
constexpr uint32_t CRYPTONIGHT_MASARI_ITER = 0x40000; constexpr uint32_t CRYPTONIGHT_MASARI_ITER = 0x40000;
constexpr uint32_t CRYPTONIGHT_SUPERFAST_ITER = 0x20000; constexpr uint32_t CRYPTONIGHT_SUPERFAST_ITER = 0x20000;
constexpr size_t CRYPTONIGHT_TURTLE_MEMORY = 256 * 1024; constexpr size_t CRYPTONIGHT_TURTLE_MEMORY = 256 * 1024;
constexpr uint32_t CRYPTONIGHT_TURTLE_MASK = 0x1FFF0; constexpr uint32_t CRYPTONIGHT_TURTLE_MASK = 0x1FFF0;
...@@ -83,10 +144,10 @@ template<> ...@@ -83,10 +144,10 @@ template<>
inline constexpr size_t cn_select_memory<cryptonight_bittube2>() { return CRYPTONIGHT_HEAVY_MEMORY; } inline constexpr size_t cn_select_memory<cryptonight_bittube2>() { return CRYPTONIGHT_HEAVY_MEMORY; }
template<> template<>
inline constexpr size_t cn_select_memory<cryptonight_superfast>() { return CRYPTONIGHT_MEMORY; } inline constexpr size_t cn_select_memory<cryptonight_superfast>() { return CRYPTONIGHT_MEMORY; }
template<> template<>
inline constexpr size_t cn_select_memory<cryptonight_gpu>() { return CRYPTONIGHT_MEMORY; } inline constexpr size_t cn_select_memory<cryptonight_gpu>() { return CRYPTONIGHT_MEMORY; }
template<> template<>
inline constexpr size_t cn_select_memory<cryptonight_turtle>() { return CRYPTONIGHT_TURTLE_MEMORY; } inline constexpr size_t cn_select_memory<cryptonight_turtle>() { return CRYPTONIGHT_TURTLE_MEMORY; }
...@@ -100,7 +161,7 @@ inline size_t cn_select_memory(xmrstak_algo algo) ...@@ -100,7 +161,7 @@ inline size_t cn_select_memory(xmrstak_algo algo)
case cryptonight_monero_v8: case cryptonight_monero_v8:
case cryptonight_masari: case cryptonight_masari:
case cryptonight: case cryptonight:
case cryptonight_superfast: case cryptonight_superfast:
case cryptonight_gpu: case cryptonight_gpu:
return CRYPTONIGHT_MEMORY; return CRYPTONIGHT_MEMORY;
case cryptonight_ipbc: case cryptonight_ipbc:
...@@ -155,10 +216,10 @@ template<> ...@@ -155,10 +216,10 @@ template<>
inline constexpr uint32_t cn_select_mask<cryptonight_bittube2>() { return CRYPTONIGHT_HEAVY_MASK; } inline constexpr uint32_t cn_select_mask<cryptonight_bittube2>() { return CRYPTONIGHT_HEAVY_MASK; }
template<> template<>
inline constexpr uint32_t cn_select_mask<cryptonight_superfast>() { return CRYPTONIGHT_MASK; } inline constexpr uint32_t cn_select_mask<cryptonight_superfast>() { return CRYPTONIGHT_MASK; }
template<> template<>
inline constexpr uint32_t cn_select_mask<cryptonight_gpu>() { return CRYPTONIGHT_GPU_MASK; } inline constexpr uint32_t cn_select_mask<cryptonight_gpu>() { return CRYPTONIGHT_GPU_MASK; }
template<> template<>
inline constexpr uint32_t cn_select_mask<cryptonight_turtle>() { return CRYPTONIGHT_TURTLE_MASK; } inline constexpr uint32_t cn_select_mask<cryptonight_turtle>() { return CRYPTONIGHT_TURTLE_MASK; }
...@@ -172,7 +233,7 @@ inline size_t cn_select_mask(xmrstak_algo algo) ...@@ -172,7 +233,7 @@ inline size_t cn_select_mask(xmrstak_algo algo)
case cryptonight_monero_v8: case cryptonight_monero_v8:
case cryptonight_masari: case cryptonight_masari:
case cryptonight: case cryptonight:
case cryptonight_superfast: case cryptonight_superfast:
return CRYPTONIGHT_MASK; return CRYPTONIGHT_MASK;
case cryptonight_ipbc: case cryptonight_ipbc:
case cryptonight_aeon: case cryptonight_aeon:
...@@ -228,10 +289,10 @@ template<> ...@@ -228,10 +289,10 @@ template<>
inline constexpr uint32_t cn_select_iter<cryptonight_bittube2>() { return CRYPTONIGHT_HEAVY_ITER; } inline constexpr uint32_t cn_select_iter<cryptonight_bittube2>() { return CRYPTONIGHT_HEAVY_ITER; }
template<> template<>
inline constexpr uint32_t cn_select_iter<cryptonight_superfast>() { return CRYPTONIGHT_SUPERFAST_ITER; } inline constexpr uint32_t cn_select_iter<cryptonight_superfast>() { return CRYPTONIGHT_SUPERFAST_ITER; }
template<> template<>
inline constexpr uint32_t cn_select_iter<cryptonight_gpu>() { return CRYPTONIGHT_GPU_ITER; } inline constexpr uint32_t cn_select_iter<cryptonight_gpu>() { return CRYPTONIGHT_GPU_ITER; }
template<> template<>
inline constexpr uint32_t cn_select_iter<cryptonight_turtle>() { return CRYPTONIGHT_TURTLE_ITER; } inline constexpr uint32_t cn_select_iter<cryptonight_turtle>() { return CRYPTONIGHT_TURTLE_ITER; }
......
xmrstak/net/jpsock.cpp
+ 1
− 45
View file @ 970c9528
...@@ -673,51 +673,7 @@ bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bRes ...@@ -673,51 +673,7 @@ bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bRes
if(ext_algo) if(ext_algo)
{ {
const char* algo_name; snprintf(sAlgo, sizeof(sAlgo), ",\"algo\":\"%s\"", get_algo_name(algo).c_str());
switch(algo)
{
case cryptonight:
algo_name = "cryptonight";
break;
case cryptonight_lite:
algo_name = "cryptonight_lite";
break;
case cryptonight_monero:
algo_name = "cryptonight_v7";
break;
case cryptonight_monero_v8:
algo_name = "cryptonight_v8";
break;
case cryptonight_aeon:
algo_name = "cryptonight_lite_v7";
break;
case cryptonight_stellite:
algo_name = "cryptonight_v7_stellite";
break;
case cryptonight_ipbc:
algo_name = "cryptonight_lite_v7_xor";
break;
case cryptonight_heavy:
algo_name = "cryptonight_heavy";
break;
case cryptonight_haven:
algo_name = "cryptonight_haven";
break;
case cryptonight_masari:
algo_name = "cryptonight_masari";
break;
case cryptonight_superfast:
algo_name = "cryptonight_superfast";
break;
case cryptonight_turtle:
algo_name = "cryptonight_turtle";
break;
default:
algo_name = "unknown";
break;
}
snprintf(sAlgo, sizeof(sAlgo), ",\"algo\":\"%s\"", algo_name);
} }
bin2hex((unsigned char*)&iNonce, 4, sNonce); bin2hex((unsigned char*)&iNonce, 4, sNonce);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment