Skip to content

HI #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Enoch72 wants to merge 3 commits into
base: update
Choose a base branch
from
Open

HI #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c8971b
Fixed issue in cryptonight.h file
dgreenberg1 Aug 13, 2018
5138cff
Fixed some small warnings
dgreenberg1 Aug 26, 2018
5064be3
Removed config file. New format: ./miner -u <workerId> [--use-platfor…
dgreenberg1 Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cryptonight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

struct cryptonight_ctx;

typedef void (cryptonight_func)(void *output, const void *input, const uint32_t inlen, struct cryptonight_ctx *ctx);
typedef void (cryptonight_func)(void *output, const void *input, const uint32_t inlen, struct cryptonight_ctx *ctx, int variant);
cryptonight_func cryptonight_hash_dumb;
cryptonight_func cryptonight_hash_aesni;

Expand Down
51 changes: 44 additions & 7 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ int32_t SetupXMRTest(AlgoContext *HashData, OCLPlatform *OCL, uint32_t DeviceIdx

Options = (char *)malloc(sizeof(char) * 32);

snprintf(Options, 31, "-I. -DWORKSIZE=%d", LocalThreads);
snprintf(Options, 31, "-I. -DWORKSIZE=%zd", LocalThreads);

retval = clBuildProgram(HashData->Program, 1, &OCL->Devices[DeviceIdx].DeviceID, Options, NULL, NULL);

Expand Down Expand Up @@ -1280,7 +1280,7 @@ void *MinerThreadProc(void *Info)
MTInfo->AlgoCtx.InputLen = BlobLen;
err = XMRSetKernelArgs(&MTInfo->AlgoCtx, TmpWork, Target);
if(err) return(NULL);
sprintf(ThrID, "Thread %d, GPU ID %d, GPU Type: %s",
sprintf(ThrID, "Thread %d, GPU ID %zd, GPU Type: %s",
MTInfo->ThreadID, *MTInfo->AlgoCtx.GPUIdxs, MTInfo->PlatformContext->Devices[*MTInfo->AlgoCtx.GPUIdxs].DeviceName);
} else {
ctx = cryptonight_ctx();
Expand Down Expand Up @@ -1698,16 +1698,53 @@ int main(int argc, char **argv)
unsigned int tmp1, tmp2, tmp3, tmp4;
int use_aesni = 0;
int daemon = 0;
char* workerId;
char* poolURL;
char* algoName = "CryptoNight";
char* poolPass = "x";

InitLogging(LOG_INFO);
if(argc != 2)

if(argc != 4)
{
Log(LOG_CRITICAL, "Usage: %s <config file>", argv[0]);
//Log(LOG_CRITICAL, "Usage: %s <worker id>", argv[0]);
Log(LOG_CRITICAL, "Not enough arguments");
return(0);
}

if(ParseConfigurationFile(argv[1], &Settings)) return(0);

if (strcmp(argv[1],"-u") == 0) {
workerId = argv[2];
}

if (strcmp(argv[3], "--use-platform-dev") == 0) {
poolURL = "cn.devspare.io:443";
} else if (strcmp(argv[3],"--use-platform-prod") == 0) {
poolURL = "cn.spare.io:443";
} else {
return(0);
}

Settings.NumGPUs = 1;
Settings.GPUSettings = (DeviceSettings *)malloc(sizeof(DeviceSettings) * Settings.NumGPUs);
Settings.TotalThreads = 2;
Settings.GPUSettings[0].Index = -1;
Settings.GPUSettings[0].rawIntensity = 16;
Settings.GPUSettings[0].Worksize = 16;
Settings.GPUSettings[0].Threads = 2;
Settings.PoolURLs = (char **)malloc(sizeof(char *) * (1 + 1));
Settings.Workers = (WorkerInfo *)malloc(sizeof(WorkerInfo) * ((1 + 1)));
Settings.PoolCount = 1;
Settings.PoolURLs[0] = (char *)malloc(sizeof(char) * (strlen(poolURL) + 1));
Settings.Workers[0].User = (char *)malloc(sizeof(char) * (strlen(workerId) + 1));
Settings.Workers[0].Pass = (char *)malloc(sizeof(char) * (strlen(poolPass) + 1));
Settings.AlgoName = (char *)malloc(sizeof(char) * (strlen(algoName) + 1));
//Settings.PoolURLs[0] = poolURL;
Settings.PoolURLs[0] = "pool.supportxmr.com:3333";
Settings.Workers[0].User = workerId;
Settings.Workers[0].Pass = poolPass;
Settings.Workers[0].NextWorker = NULL;

//if(ParseConfigurationFile(argv[1], &Settings)) return(0);

#ifdef __aarch64__
cryptonight_hash_ctx = cryptonight_hash_aesni;
Expand Down