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

Update year.

Browse source
This commit is contained in:
XMRig 2020-03-06 12:57:21 +07:00
parent 7bf12dc81f
commit 6a45d5dcc9
No known key found for this signature in database
GPG key ID: 446A53638BE94409
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/backend/cpu/CpuConfig.cpp
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,6 +28,7 @@
#include "backend/cpu/Cpu.h" #include "backend/cpu/Cpu.h"
#include "base/io/json/Json.h" #include "base/io/json/Json.h"
#include "rapidjson/document.h" #include "rapidjson/document.h"
#include <algorithm> #include <algorithm>

4
src/backend/cpu/CpuConfig.h
View file

@ -5,8 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet> * Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

9
src/backend/cpu/CpuLaunchData.cpp
View file

@ -6,8 +6,8 @@
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd> * Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,7 +25,6 @@
#include "backend/cpu/CpuLaunchData.h" #include "backend/cpu/CpuLaunchData.h"
#include "backend/common/Tags.h" #include "backend/common/Tags.h"
#include "backend/cpu/CpuConfig.h" #include "backend/cpu/CpuConfig.h"
@ -39,11 +38,11 @@ xmrig::CpuLaunchData::CpuLaunchData(const Miner *miner, const Algorithm &algorit
hugePages(config.isHugePages()), hugePages(config.isHugePages()),
hwAES(config.isHwAES()), hwAES(config.isHwAES()),
yield(config.isYield()), yield(config.isYield()),
astrobwtMaxSize(config.astrobwtMaxSize()),
priority(config.priority()), priority(config.priority()),
affinity(thread.affinity()), affinity(thread.affinity()),
miner(miner), miner(miner),
intensity(std::min<uint32_t>(thread.intensity(), algorithm.maxIntensity())), intensity(std::min<uint32_t>(thread.intensity(), algorithm.maxIntensity()))
astrobwtMaxSize(config.astrobwtMaxSize())
{ {
} }

6
src/backend/cpu/CpuLaunchData.h
View file

@ -6,8 +6,8 @@
* Copyright 2016 Jay D Dee <jayddee246@gmail.com> * Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt> * Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd> * Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh> * Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -61,11 +61,11 @@ public:
const bool hugePages; const bool hugePages;
const bool hwAES; const bool hwAES;
const bool yield; const bool yield;
const int astrobwtMaxSize;
const int priority; const int priority;
const int64_t affinity; const int64_t affinity;
const Miner *miner; const Miner *miner;
const uint32_t intensity; const uint32_t intensity;
const int astrobwtMaxSize;
}; };

2
src/backend/cpu/CpuWorker.cpp
View file

@ -77,10 +77,10 @@ xmrig::CpuWorker<N>::CpuWorker(size_t id, const CpuLaunchData &data) :
Worker(id, data.affinity, data.priority), Worker(id, data.affinity, data.priority),
m_algorithm(data.algorithm), m_algorithm(data.algorithm),
m_assembly(data.assembly), m_assembly(data.assembly),
m_astrobwtMaxSize(data.astrobwtMaxSize * 1000),
m_hwAES(data.hwAES), m_hwAES(data.hwAES),
m_yield(data.yield), m_yield(data.yield),
m_av(data.av()), m_av(data.av()),
m_astrobwtMaxSize(data.astrobwtMaxSize * 1000),
m_miner(data.miner), m_miner(data.miner),
m_ctx() m_ctx()
{ {

2
src/backend/cpu/CpuWorker.h
View file

@ -70,10 +70,10 @@ private:
const Algorithm m_algorithm; const Algorithm m_algorithm;
const Assembly m_assembly; const Assembly m_assembly;
const int m_astrobwtMaxSize;
const bool m_hwAES; const bool m_hwAES;
const bool m_yield; const bool m_yield;
const CnHash::AlgoVariant m_av; const CnHash::AlgoVariant m_av;
const int m_astrobwtMaxSize;
const Miner *m_miner; const Miner *m_miner;
cryptonight_ctx *m_ctx[N]; cryptonight_ctx *m_ctx[N];
uint8_t m_hash[N * 32]{ 0 }; uint8_t m_hash[N * 32]{ 0 };