Added debug thread log.

This commit is contained in:
XMRig 2018-09-15 16:48:57 +03:00
parent 93216a51f4
commit 812cd9760f
6 changed files with 47 additions and 13 deletions

View file

@ -134,9 +134,11 @@ static void print_pools(xmrig::Config *config)
} }
# ifdef APP_DEBUG # ifdef APP_DEBUG
LOG_NOTICE("POOLS --------------------------------------------------------------------");
for (const Pool &pool : pools) { for (const Pool &pool : pools) {
pool.print(); pool.print();
} }
LOG_NOTICE("--------------------------------------------------------------------------");
# endif # endif
} }

View file

@ -80,13 +80,17 @@ public:
HardwareAESKey = 1011, HardwareAESKey = 1011,
// xmrig amd // xmrig amd
OclPlatform = 1400, OclPlatformKey = 1400,
OclAffinity = 1401, OclAffinityKey = 1401,
OclDevices = 1402, OclDevicesKey = 1402,
OclLaunch = 1403, OclLaunchKey = 1403,
OclCache = 1404, OclCacheKey = 1404,
OclPrint = 1405, OclPrintKey = 1405,
OclLoader = 1406, OclLoaderKey = 1406,
OclSridedIndexKey = 1407,
OclMemChunkKey = 1408,
OclUnrollKey = 1409,
OclCompModeKey = 1410,
// xmrig-proxy // xmrig-proxy
AccessLogFileKey = 'A', AccessLogFileKey = 'A',

View file

@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __ITHREAD_H__ #ifndef XMRIG_ITHREAD_H
#define __ITHREAD_H__ #define XMRIG_ITHREAD_H
#include <stdint.h> #include <stdint.h>
@ -64,10 +64,14 @@ public:
# ifndef XMRIG_NO_API # ifndef XMRIG_NO_API
virtual rapidjson::Value toAPI(rapidjson::Document &doc) const = 0; virtual rapidjson::Value toAPI(rapidjson::Document &doc) const = 0;
# endif # endif
# ifdef APP_DEBUG
virtual void print() const = 0;
# endif
}; };
} /* namespace xmrig */ } /* namespace xmrig */
#endif // __ITHREAD_H__ #endif // XMRIG_ITHREAD_H

View file

@ -24,6 +24,7 @@
#include <assert.h> #include <assert.h>
#include "common/log/Log.h"
#include "common/net/Pool.h" #include "common/net/Pool.h"
#include "rapidjson/document.h" #include "rapidjson/document.h"
#include "workers/CpuThread.h" #include "workers/CpuThread.h"
@ -361,6 +362,17 @@ xmrig::IThread::Multiway xmrig::CpuThread::multiway(AlgoVariant av)
} }
#ifdef APP_DEBUG
void xmrig::CpuThread::print() const
{
LOG_DEBUG(GREEN_BOLD("CPU thread: ") " index " WHITE_BOLD("%zu") ", multiway " WHITE_BOLD("%d") ", av " WHITE_BOLD("%d") ",",
index(), static_cast<int>(multiway()), static_cast<int>(m_av));
LOG_DEBUG(" affine_to_cpu: %" PRId64, affinity());
}
#endif
#ifndef XMRIG_NO_API #ifndef XMRIG_NO_API
rapidjson::Value xmrig::CpuThread::toAPI(rapidjson::Document &doc) const rapidjson::Value xmrig::CpuThread::toAPI(rapidjson::Document &doc) const
{ {

View file

@ -21,8 +21,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __CPUTHREAD_H__ #ifndef XMRIG_CPUTHREAD_H
#define __CPUTHREAD_H__ #define XMRIG_CPUTHREAD_H
#include "common/xmrig.h" #include "common/xmrig.h"
@ -80,6 +80,10 @@ public:
inline Type type() const override { return CPU; } inline Type type() const override { return CPU; }
protected: protected:
# ifdef APP_DEBUG
void print() const override;
# endif
# ifndef XMRIG_NO_API # ifndef XMRIG_NO_API
rapidjson::Value toAPI(rapidjson::Document &doc) const override; rapidjson::Value toAPI(rapidjson::Document &doc) const override;
# endif # endif
@ -101,4 +105,4 @@ private:
} /* namespace xmrig */ } /* namespace xmrig */
#endif /* __CPUTHREAD_H__ */ #endif /* XMRIG_CPUTHREAD_H */

View file

@ -160,6 +160,14 @@ void Workers::setJob(const Job &job, bool donate)
void Workers::start(xmrig::Controller *controller) void Workers::start(xmrig::Controller *controller)
{ {
# ifdef APP_DEBUG
LOG_NOTICE("THREADS ------------------------------------------------------------------");
for (const xmrig::IThread *thread : controller->config()->threads()) {
thread->print();
}
LOG_NOTICE("--------------------------------------------------------------------------");
# endif
m_controller = controller; m_controller = controller;
const std::vector<xmrig::IThread *> &threads = controller->config()->threads(); const std::vector<xmrig::IThread *> &threads = controller->config()->threads();