zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #96 from braydonf/fixlock 

Fix "Abort trap 6" bug
This commit is contained in:
Patrick Nagurny 2015-08-03 16:32:09 -04:00
parent 34de8bc602 286f917dd0
commit 1e32aa36b7
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/libbitcoind.cc
View File

@ -90,7 +90,6 @@ init(Handle<Object>);
* Private Global Variables
* Used only by bitcoindjs functions.
*/
static uv_mutex_t txmon_mutex;
static std::vector<std::string> txmon_messages;
static uv_async_t txmon_async;
static Eternal<Function> txmon_callback;
@ -235,29 +234,31 @@ txmon(uv_async_t *handle) {
Isolate* isolate = Isolate::GetCurrent();
HandleScope scope(isolate);
uv_mutex_lock(&txmon_mutex);
{
Local<Array> results = Array::New(isolate);
int arrayIndex = 0;
LOCK(cs_main);
Local<Array> results = Array::New(isolate);
int arrayIndex = 0;
BOOST_FOREACH(const std::string& message, txmon_messages) {
results->Set(arrayIndex, NanNew<String>(message));
arrayIndex++;
}
const unsigned argc = 1;
Local<Value> argv[argc] = {
Local<Value>::New(isolate, results)
};
Local<Function> cb = txmon_callback.Get(isolate);
cb->Call(isolate->GetCurrentContext()->Global(), argc, argv);
txmon_messages.clear();
BOOST_FOREACH(const std::string& message, txmon_messages) {
results->Set(arrayIndex, NanNew<String>(message));
arrayIndex++;
}
const unsigned argc = 1;
Local<Value> argv[argc] = {
Local<Value>::New(isolate, results)
};
Local<Function> cb = txmon_callback.Get(isolate);
cb->Call(isolate->GetCurrentContext()->Global(), argc, argv);
txmon_messages.clear();
uv_mutex_unlock(&txmon_mutex);
}
static bool
@ -316,10 +317,11 @@ process_messages(CNode* pfrom) {
string txHash = tx.GetHash().GetHex();
uv_mutex_lock(&txmon_mutex);
txmon_messages.push_back(txHash);
uv_mutex_unlock(&txmon_mutex);
uv_async_send(&txmon_async);
{
LOCK(cs_main);
txmon_messages.push_back(txHash);
uv_async_send(&txmon_async);
}
}