Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Implement dcn_stop_threads #34

Merged
merged 1 commit into from
Jul 27, 2018
Merged

Implement dcn_stop_threads #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,9 @@ setTimeout(function () {
console.log('\n\n\n>>>>>>> BEGIN INFO')
console.log(res)
console.log('<<<<<<< END INFO\n\n\n')
}, 10000)
setTimeout(function () {
console.log('Stopping threads ...')
binding.dcn_stop_threads(dcn_context)
console.log('Done.')
}, 2000)
}, 5000)
55 changes: 44 additions & 11 deletions src/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ typedef struct dcn_context_t {
napi_threadsafe_function napi_event_handler;
uv_thread_t smtp_thread;
uv_thread_t imap_thread;
int loop_thread;
int is_offline;
} dcn_context_t;

Expand Down Expand Up @@ -117,14 +118,13 @@ NAPI_METHOD(dcn_set_event_handler) {
napi_value async_resource_name;
NAPI_STATUS_THROWS(napi_create_string_utf8(env, "dc_event_callback", NAPI_AUTO_LENGTH, &async_resource_name));

//TODO: Figure out how to release threadsafe_function
NAPI_STATUS_THROWS(napi_create_threadsafe_function(
env,
callback,
0,
async_resource_name,
0,
3,
100,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to set something for queue size. If we set to 0 it means we get an unlimited queue and this will crash.

1,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I changed this from 3 to 1, since we haven't actually started the threads yet, so can't assume there are three threads running.

0,
NULL, // TODO: file an issue that the finalize parameter should be optional
dcn_context,
Expand All @@ -136,37 +136,68 @@ NAPI_METHOD(dcn_set_event_handler) {

static void imap_thread_func(void* arg)
{
dc_context_t* dc_context = (dc_context_t*)arg;
dcn_context_t* dcn_context = (dcn_context_t*)arg;
dc_context_t* dc_context = dcn_context->dc_context;

napi_acquire_threadsafe_function(dcn_context->napi_event_handler);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will bump internal thread count.


while (true) {
while (dcn_context->loop_thread) {
dc_perform_imap_jobs(dc_context);
dc_perform_imap_fetch(dc_context);
dc_perform_imap_idle(dc_context);
}

napi_release_threadsafe_function(dcn_context->napi_event_handler, napi_tsfn_release);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will reduce thread count.

}

static void smtp_thread_func(void* arg)
{
dc_context_t* dc_context = (dc_context_t*)arg;
dcn_context_t* dcn_context = (dcn_context_t*)arg;
dc_context_t* dc_context = dcn_context->dc_context;

while (true) {
napi_acquire_threadsafe_function(dcn_context->napi_event_handler);

while (dcn_context->loop_thread) {
dc_perform_smtp_jobs(dc_context);
dc_perform_smtp_idle(dc_context);
}

napi_release_threadsafe_function(dcn_context->napi_event_handler, napi_tsfn_release);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto for this function.

}

NAPI_METHOD(dcn_start_threads) {
NAPI_ARGV(1);
NAPI_DCN_CONTEXT();

uv_thread_create(&dcn_context->imap_thread, imap_thread_func,
dcn_context->dc_context);
uv_thread_create(&dcn_context->smtp_thread, smtp_thread_func,
dcn_context->dc_context);
dcn_context->loop_thread = 1;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now we set it to 1.

uv_thread_create(&dcn_context->imap_thread, imap_thread_func, dcn_context);
uv_thread_create(&dcn_context->smtp_thread, smtp_thread_func, dcn_context);

NAPI_RETURN_INT32(1);
}

NAPI_METHOD(dcn_stop_threads) {
NAPI_ARGV(1);
NAPI_DCN_CONTEXT();

dcn_context->loop_thread = 0;

if (dcn_context->imap_thread && dcn_context->smtp_thread) {
dc_interrupt_imap_idle(dcn_context->dc_context);
dc_interrupt_smtp_idle(dcn_context->dc_context);

uv_thread_join(&dcn_context->imap_thread);
uv_thread_join(&dcn_context->smtp_thread);

dcn_context->imap_thread = 0;
dcn_context->smtp_thread = 0;
}

napi_release_threadsafe_function(dcn_context->napi_event_handler, napi_tsfn_release);

NAPI_RETURN_UNDEFINED();
}

/**
* Bindings to deltachat-core api below
*/
Expand Down Expand Up @@ -266,6 +297,7 @@ NAPI_METHOD(dcn_context_new) {
dcn_context->napi_event_handler = NULL;
dcn_context->imap_thread = 0;
dcn_context->smtp_thread = 0;
dcn_context->loop_thread = 0;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this should be 0, since we don't have any threads running atm. It doesn't really matter though.

dcn_context->is_offline = 0;

napi_value dcn_context_napi;
Expand Down Expand Up @@ -607,6 +639,7 @@ NAPI_INIT() {
// Setup functions
NAPI_EXPORT_FUNCTION(dcn_set_event_handler);
NAPI_EXPORT_FUNCTION(dcn_start_threads);
NAPI_EXPORT_FUNCTION(dcn_stop_threads);

// deltachat-core api
//NAPI_EXPORT_FUNCTION(dcn_add_address_book);
Expand Down