Bitmessage/bitmessage-js
2
0
Fork 1
Code Issues 1 Pull Requests 1 Actions Packages Releases Activity

Do not use macroses

Browse Source
This commit is contained in:
Kagami Hiiragi 2015-01-11 01:33:30 +03:00
parent 4c5fc4d3eb
commit 728bd6d3ae
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/pow.cc
View File

@ -11,20 +11,6 @@
#include <openssl/sha.h> #include <openssl/sha.h>
#define HASH_SIZE 64 #define HASH_SIZE 64
#define NTOHLL(x) \
( \
((uint64_t)(ntohl( (unsigned int)((x << 32) >> 32) )) << 32) | \
ntohl( ((unsigned int)(x >> 32)) ) \
)
#define SET_RESULT(res, nonce) \
{ \
pthread_mutex_lock(&g_mutex); \
if (g_result == RESULT_NOT_READY) { \
g_result = res; \
g_nonce = nonce; \
} \
pthread_mutex_unlock(&g_mutex); \
}
typedef enum { typedef enum {
RESULT_NOT_READY, RESULT_NOT_READY,
@ -44,6 +30,23 @@ pthread_mutex_t g_mutex;
Result g_result = RESULT_NOT_READY; Result g_result = RESULT_NOT_READY;
uint64_t g_nonce; uint64_t g_nonce;
inline uint64_t ntohll(uint64_t x) {
return (
((uint64_t)(ntohl( (unsigned int)((x << 32) >> 32) )) << 32) |
ntohl( ((unsigned int)(x >> 32)) )
);
}
// Set POW computation result in a thread-safe way.
void set_result(Result res, uint64_t nonce) {
pthread_mutex_lock(&g_mutex);
if (g_result == RESULT_NOT_READY) {
g_result = res;
g_nonce = nonce;
}
pthread_mutex_unlock(&g_mutex);
}
void* pow_thread(void* num) { void* pow_thread(void* num) {
uint64_t i = *((size_t *)num); uint64_t i = *((size_t *)num);
uint8_t message[HASH_SIZE+sizeof(uint64_t)]; uint8_t message[HASH_SIZE+sizeof(uint64_t)];
@ -60,18 +63,18 @@ void* pow_thread(void* num) {
// This is very unlikely to be ever happen but it's better to be // This is very unlikely to be ever happen but it's better to be
// sure anyway. // sure anyway.
if (i > g_max_nonce) { if (i > g_max_nonce) {
SET_RESULT(RESULT_OVERFLOW, 0); set_result(RESULT_OVERFLOW, 0);
return NULL; return NULL;
} }
*be_nonce = NTOHLL(i); *be_nonce = ntohll(i);
SHA512_Init(&sha); SHA512_Init(&sha);
SHA512_Update(&sha, message, HASH_SIZE+sizeof(uint64_t)); SHA512_Update(&sha, message, HASH_SIZE+sizeof(uint64_t));
SHA512_Final(digest, &sha); SHA512_Final(digest, &sha);
SHA512_Init(&sha); SHA512_Init(&sha);
SHA512_Update(&sha, digest, HASH_SIZE); SHA512_Update(&sha, digest, HASH_SIZE);
SHA512_Final(digest, &sha); SHA512_Final(digest, &sha);
if (NTOHLL(*be_trial) <= g_target) { if (ntohll(*be_trial) <= g_target) {
SET_RESULT(RESULT_OK, i); set_result(RESULT_OK, i);
return NULL; return NULL;
} }
i += g_pool_size; i += g_pool_size;
@ -99,7 +102,7 @@ int pow(size_t pool_size,
args[i] = i; args[i] = i;
error = pthread_create(&threads[i], NULL, pow_thread, &args[i]); error = pthread_create(&threads[i], NULL, pow_thread, &args[i]);
if (error) { if (error) {
SET_RESULT(RESULT_ERROR, 0); set_result(RESULT_ERROR, 0);
break; break;
} }
} }

1
src/worker.cc
View File

@ -25,6 +25,7 @@ class PowWorker : public NanAsyncWorker {
pool_size(pool_size), pool_size(pool_size),
target(target), target(target),
initial_hash(initial_hash) {} initial_hash(initial_hash) {}
~PowWorker() { ~PowWorker() {
free(initial_hash); free(initial_hash);
} }