RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use linked list.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-10-01 11:03:27 -07:00
parent dd698b2374
commit ab4264b74c
2 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/bitcoind.js
View File

@ -399,6 +399,9 @@ Block.toBinary = function(block, type) {
off += utils.writeU32(p, block.nVersion || block.version, off); off += utils.writeU32(p, block.nVersion || block.version, off);
// prev_block // prev_block
if (!block.previousblockhash) {
block.previousblockhash = '0000000000000000000000000000000000000000000000000000000000000000';
}
utils.toArray(block.previousblockhash, 'hex').forEach(function(ch) { utils.toArray(block.previousblockhash, 'hex').forEach(function(ch) {
p[off++] = ch; p[off++] = ch;
}); });

70
src/bitcoindjs.cc
View File

@ -290,10 +290,17 @@ struct async_tx_data {
* async_poll_blocks_data * async_poll_blocks_data
*/ */
typedef struct _poll_blocks_list {
CBlock block;
CBlockIndex *block_index;
struct _poll_blocks_list *next;
} poll_blocks_list;
struct async_poll_blocks_data { struct async_poll_blocks_data {
std::string err_msg; std::string err_msg;
int poll_saved_height; int poll_saved_height;
int poll_top_height; int poll_top_height;
poll_blocks_list *head;
Persistent<Array> result_array; Persistent<Array> result_array;
Persistent<Function> callback; Persistent<Function> callback;
}; };
@ -863,12 +870,38 @@ async_poll_blocks(uv_work_t *req) {
if (cur_height != data->poll_top_height) { if (cur_height != data->poll_top_height) {
data->poll_top_height = cur_height; data->poll_top_height = cur_height;
break; break;
} else { }
// 100 milliseconds // 100 milliseconds
useconds_t usec = 100 * 1000; useconds_t usec = 100 * 1000;
usleep(usec); usleep(usec);
}
poll_blocks_list *head = NULL;
poll_blocks_list *cur = NULL;
for (int i = data->poll_saved_height; i < data->poll_top_height; i++) {
if (i == -1) continue;
CBlockIndex *pindex = chainActive[i];
if (pindex != NULL) {
CBlock block;
if (ReadBlockFromDisk(block, pindex)) {
// poll_blocks_list *next = (poll_blocks_list *)malloc(1 * sizeof(poll_blocks_list));
poll_blocks_list *next = new poll_blocks_list();
next->next = NULL;
if (cur == NULL) {
head = next;
cur = next;
} else {
cur->next = next;
cur = next;
}
cur->block = block;
cur->block_index = pindex;
}
} }
} }
data->head = head;
} }
static void static void
@ -889,19 +922,22 @@ async_poll_blocks_after(uv_work_t *req) {
const unsigned argc = 2; const unsigned argc = 2;
Local<Array> blocks = NanNew<Array>(); Local<Array> blocks = NanNew<Array>();
for (int i = data->poll_saved_height, j = 0; i < data->poll_top_height; i++) { //poll_blocks_list *cur = data->head;
if (i == -1) continue; poll_blocks_list *cur = static_cast<poll_blocks_list*>(data->head);
CBlockIndex *pindex = chainActive[i]; poll_blocks_list *next;
if (pindex != NULL) { int i = 0;
CBlock block;
// XXX Move this to async_poll_blocks! while (cur != NULL) {
if (ReadBlockFromDisk(block, pindex)) { CBlock block = cur->block;
Local<Object> obj = NanNew<Object>(); CBlockIndex *pindex = cur->block_index;
cblock_to_jsblock(block, pindex, obj); Local<Object> obj = NanNew<Object>();
blocks->Set(j, obj); cblock_to_jsblock(block, pindex, obj);
j++; blocks->Set(i, obj);
} i++;
} next = cur->next;
//free(cur);
delete cur;
cur = next;
} }
Local<Value> argv[argc] = { Local<Value> argv[argc] = {