Skip to content

Commit d6b8655

Browse files
committed
quick hack, use a mutex
1 parent 87e02be commit d6b8655

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"nconf": "*"
1414
},
1515
"engine": ">= 0.6.13 && < 0.11.0",
16-
"version": "0.0.1",
16+
"version": "0.0.2",
1717
"files": [
1818
"index.js",
1919
"binding.gyp",

src/messenger.cc

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -307,30 +307,6 @@ void Messenger::Work_AddSourceFilter(uv_work_t* req) {
307307
baton->msgr->SetSourceFilter(baton->address, baton->filter_key, baton->filter_value);
308308
NODE_CPROTON_MUTEX_UNLOCK(&baton->msgr->mutex)
309309

310-
/*
311-
pn_link_t *link = pn_messenger_get_link(baton->msgr->receiver, baton->address.c_str(), 0);
312-
if(link) {
313-
pn_terminus_t *sr = pn_link_source(link);
314-
if(sr) {
315-
pn_data_t *filter = pn_terminus_filter(sr);
316-
if(filter) {
317-
if(pn_data_size(filter) == 0) {
318-
pn_data_put_map(filter);
319-
}
320-
pn_data_next(filter);
321-
pn_data_enter(filter);
322-
while(pn_data_next(filter)) {
323-
// go to the end of the map
324-
;
325-
}
326-
pn_data_append(filter, baton->filter_key);
327-
pn_data_append(filter, baton->filter_value);
328-
pn_data_exit(filter);
329-
pn_data_rewind(filter);
330-
}
331-
}
332-
}
333-
*/
334310
}
335311

336312
void Messenger::Work_AfterAddSourceFilter(uv_work_t* req) {
@@ -389,10 +365,13 @@ void Messenger::Work_Send(uv_work_t* req) {
389365
pn_messenger_t* messenger = baton->msgr->messenger;
390366
pn_message_t* message = baton->msg;
391367

368+
NODE_CPROTON_MUTEX_LOCK(&baton->msgr->mutex)
392369
assert(!pn_messenger_put(messenger, message));
393370
baton->tracker = pn_messenger_outgoing_tracker(messenger);
394371

395372
assert(!pn_messenger_send(messenger, -1));
373+
NODE_CPROTON_MUTEX_UNLOCK(&baton->msgr->mutex)
374+
396375

397376
pn_message_free(message);
398377

0 commit comments

Comments
 (0)