Merge pull request #6 from MichaelBell/feature-improve-throughput

Improve throughput

Author: Pttn

.gitignore

@@ -0,0 +1,11 @@
+# Build artifacts
+*.o
+rieMiner
+rieMiner.exe
+
+# Per user configuration
+rieMiner.conf
+
+# Other
+rieMiner.exe.stackdump
+.*.swp

client.h

@@ -11,9 +11,6 @@
 
 class WorkManager;
 
-enum JobType {TYPE_CHECK, TYPE_MOD, TYPE_SIEVE};
-#define WORK_INDEXES 64
-
 struct BlockHeader { // Total 1024 bits/128 bytes (256 hex chars)
 	uint32_t version;
 	uint8_t  previousblockhash[32]; // 256 bits

external/mod_1_4_win.asm

@@ -120,18 +120,16 @@ PROLOGUE(rie_mod_1s_4p)
 
         mov     %rcx, %rdi
         mov     %rdx, %rsi
-        mov     %r8, %rdx
-        mov     %r9, %rcx
-
-	push	%rdx
-	mov	%rcx, %r14
-	mov	8(%rcx), R32(%r11)		C B1modb
-	mov	12(%rcx), R32(%rbx)		C B2modb
-	mov	16(%rcx), R32(%rbp)		C B3modb
-	mov	20(%rcx), R32(%r13)		C B4modb
-	mov	24(%rcx), R32(%r12)		C B5modb
-
-	mov	28(%rcx), R32(%r8)
+
+	push	%r8
+	mov	%r9, %r14
+	mov	8(%r9), R32(%r11)		C B1modb
+	mov	12(%r9), R32(%rbx)		C B2modb
+	mov	16(%r9), R32(%rbp)		C B3modb
+	mov	20(%r9), R32(%r13)		C B4modb
+	mov	24(%r9), R32(%r12)		C B5modb
+
+	mov	28(%r9), R32(%r8)
 	and	$0x1ffffff, R32(%r8)
 	jz	L(nohi)
 

main.cpp

@@ -53,15 +53,17 @@ void WorkManager::submitWork(WorkData wd, uint32_t* nOffset, uint8_t length) {
 	_clientMutex.unlock();
 }
 
+bool WorkManager::getWork(WorkData& wd) {
+	_clientMutex.lock();
+	wd = _client->workData();
+	_clientMutex.unlock();
+	return wd.height != 0;
+}
+
 void WorkManager::minerThread() {
 	WorkData wd;
 	while (true) {
-		bool hasValidWork(false);
-		_clientMutex.lock();
-		wd = _client->workData(); // Get generated work data from client
-		_clientMutex.unlock();
-		if (wd.height > 0) hasValidWork = true;
-		if (!hasValidWork) usleep(1000*_workRefresh/2);
+		if (!getWork(wd)) usleep(1000*_workRefresh/2);
 		else _miner->process(wd);
 	}
 }
@@ -114,7 +116,7 @@ void WorkManager::manage() {
 						_stats.updateHeight(_client->workData().height - 1);
 						std::cout << "-----------------------------------------------------------" << std::endl;
 						uint32_t startHeight(_client->workData().height);
-						std::cout << "[0000:00:00] Started mining at block " << startHeight << std::endl;
+						std::cout << "[0000:00:00] Started mining at block " << startHeight;
 						_stats.initHeight(startHeight);
 						_miningStarted = true;
 					}

main.h

@@ -322,6 +322,7 @@ class WorkManager : public std::enable_shared_from_this<WorkManager> {
 
 	void init();
 	void submitWork(WorkData wd, uint32_t* nOffset, uint8_t length);
+	bool getWork(WorkData& wd);
 	void manage();
 	Options options() const {return _options;}
 	uint32_t height() const {return _stats.height();}