fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for new release

Browse source 
3.3.3-3
This commit is contained in:
enWILLYado 2018-03-18 23:21:33 +01:00
parent afd97d26fe
commit 451e710af6
8 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -11,6 +11,8 @@ include (cmake/cpu.cmake)
set(HEADERS set(HEADERS
src/3rdparty/align.h
src/api/Api.h src/api/Api.h
src/api/ApiState.h src/api/ApiState.h
src/api/NetworkState.h src/api/NetworkState.h

3
README.md
View file

@ -7,6 +7,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
* This software is like the [CPU-mining](https://github.com/xmrig/xmrig) version; but there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd). * This software is like the [CPU-mining](https://github.com/xmrig/xmrig) version; but there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd). * This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
* You can use [config.xmrig.com](https://config.xmrig.com/) to generate/edit/share your configurations. :new:
## Own features ## Own features
@ -22,4 +23,4 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
* xmrig@enwillyado.com * xmrig@enwillyado.com
* [telegram](https://telegram.me/enWILLYado) * [telegram](https://telegram.me/enWILLYado)
¡Se habla español! ¡Se habla español!

BIN
res/app.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

2
src/Mem_unix.cpp
View file

@ -99,8 +99,6 @@ bool Mem::allocate(int algo, int threads, bool doubleHash, bool enabled)
void Mem::release() void Mem::release()
{ {
const int size = MEMORY * (m_threads + 1);
if(m_flags & HugepagesEnabled) if(m_flags & HugepagesEnabled)
{ {
if(m_flags & Lock) if(m_flags & Lock)

12
src/net/Job.cpp
View file

@ -61,6 +61,7 @@ static inline char hf_bin2hex(unsigned char c)
Job::Job() : Job::Job() :
m_nicehash(false), m_nicehash(false),
m_coin(),
m_algo(xmrig::ALGO_CRYPTONIGHT), m_algo(xmrig::ALGO_CRYPTONIGHT),
m_poolId(-2), m_poolId(-2),
m_threadId(-1), m_threadId(-1),
@ -75,6 +76,7 @@ Job::Job() :
Job::Job(int poolId, bool nicehash, int algo, int variant) : Job::Job(int poolId, bool nicehash, int algo, int variant) :
m_nicehash(nicehash), m_nicehash(nicehash),
m_coin(),
m_algo(algo), m_algo(algo),
m_poolId(poolId), m_poolId(poolId),
m_threadId(-1), m_threadId(-1),
@ -168,16 +170,16 @@ bool Job::setTarget(const char* target)
} }
void Job::setCoin(const char* coin) void Job::setCoin(const std::string & coin)
{ {
if(!coin || strlen(coin) > 4) if(m_coin.size() == 0 || m_coin.size() > 4)
{ {
memset(m_coin, 0, sizeof(m_coin)); m_coin.clear();
return; return;
} }
strncpy(m_coin, coin, sizeof(m_coin)); m_coin = coin;
m_algo = strcmp(m_coin, "AEON") == 0 ? xmrig::ALGO_CRYPTONIGHT_LITE : xmrig::ALGO_CRYPTONIGHT; m_algo = (m_coin != "AEON") ? xmrig::ALGO_CRYPTONIGHT_LITE : xmrig::ALGO_CRYPTONIGHT;
} }

11
src/net/Job.h
View file

@ -31,6 +31,7 @@
#include <string> #include <string>
#include "align.h"
#include "net/Id.h" #include "net/Id.h"
#include "xmrig.h" #include "xmrig.h"
@ -44,7 +45,7 @@ public:
bool setBlob(const char* blob); bool setBlob(const char* blob);
bool setTarget(const char* target); bool setTarget(const char* target);
void setCoin(const char* coin); void setCoin(const std::string & coin);
void setVariant(int variant); void setVariant(int variant);
inline bool isNicehash() const inline bool isNicehash() const
@ -55,11 +56,11 @@ public:
{ {
return m_size > 0 && m_diff > 0; return m_size > 0 && m_diff > 0;
} }
inline bool setId(const char* id) inline bool setId(const std::string & id)
{ {
return m_id.setId(id); return m_id.setId(id);
} }
inline const char* coin() const inline const std::string & coin() const
{ {
return m_coin; return m_coin;
} }
@ -127,7 +128,7 @@ public:
private: private:
bool m_nicehash; bool m_nicehash;
char m_coin[5]; std::string m_coin;
int m_algo; int m_algo;
int m_poolId; int m_poolId;
int m_threadId; int m_threadId;
@ -135,7 +136,7 @@ private:
size_t m_size; size_t m_size;
uint64_t m_diff; uint64_t m_diff;
uint64_t m_target; uint64_t m_target;
uint8_t m_blob[96]; // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk. VAR_ALIGN(16, uint8_t m_blob[96]); // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.
xmrig::Id m_id; xmrig::Id m_id;
}; };

4
src/version.h
View file

@ -27,14 +27,14 @@
#define APP_ID "xmrig-eWa" #define APP_ID "xmrig-eWa"
#define APP_NAME "XMRig-eWa" #define APP_NAME "XMRig-eWa"
#define APP_DESC "XMRig CPU miner-eWa" #define APP_DESC "XMRig CPU miner-eWa"
#define APP_VERSION "3.0.3-3" #define APP_VERSION "3.3.3-3"
#define APP_DOMAIN "enWILLYado.com" #define APP_DOMAIN "enWILLYado.com"
#define APP_SITE "www.enWILLYado.com" #define APP_SITE "www.enWILLYado.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com by enWILLYado.com" #define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com by enWILLYado.com"
#define APP_KIND "cpu" #define APP_KIND "cpu"
#define APP_VER_MAJOR 3 #define APP_VER_MAJOR 3
#define APP_VER_MINOR 0 #define APP_VER_MINOR 3
#define APP_VER_BUILD 3 #define APP_VER_BUILD 3
#define APP_VER_REV 3 #define APP_VER_REV 3

8
vs/xmrig.vcxproj
View file

@ -245,8 +245,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc-release|x64'">$(SolutionDir)\..\build\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='vc-release|x64'">$(SolutionDir)\..\build\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|x64'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|x64'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc-release|x64'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='vc-release|x64'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='vc-debug|x64'">$(ProjectName)$(Platform)d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='vc-debug|x64'">$(ProjectName)-x$(PlatformArchitecture)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='vc-release|x64'">$(ProjectName)$(Platform)</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='vc-release|x64'">$(ProjectName)-x$(PlatformArchitecture)d</TargetName>
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|Win32'">cd $(OutDir) &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeBuildCommandLine> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|Win32'">cd $(OutDir) &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|Win32'">cd $(OutDir) &amp;&amp; make clean &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|Win32'">cd $(OutDir) &amp;&amp; make clean &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeReBuildCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='make|Win32'">cd $(OutDir) &amp;&amp; make clean</NMakeCleanCommandLine> <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='make|Win32'">cd $(OutDir) &amp;&amp; make clean</NMakeCleanCommandLine>
@ -255,8 +255,8 @@
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make clean</NMakeCleanCommandLine> <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make clean</NMakeCleanCommandLine>
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(SolutionDir)\..\build\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(SolutionDir)\..\build\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(ProjectName)$(Platform)d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(ProjectName)-x$(PlatformArchitecture)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(ProjectName)$(Platform)</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(ProjectName)-x$(PlatformArchitecture)d</TargetName>
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(SolutionDir)\..\build\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(SolutionDir)\..\build\</OutDir>
</PropertyGroup> </PropertyGroup>