mirrors/Modest
1
0
Fork 0
mirror of https://github.com/lexborisov/Modest synced 2024-11-24 22:59:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from Azq2/patch-14

Browse Source 
Fix segfaults in ALL_IN_ONE mode
This commit is contained in:
Alexander 2019-01-13 19:53:50 +03:00 committed by GitHub
commit 0f1531a27f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/mycore/thread_queue.c
View File

@ -352,13 +352,14 @@ mythread_queue_list_entry_t * mythread_queue_list_entry_push(mythread_t** mythre
entry->queue = queue; entry->queue = queue;
for(size_t i = 0; i < list_size; i++) { for(size_t i = 0; i < list_size; i++) {
if(mythread_list[i]->type == MyTHREAD_TYPE_BATCH) if(mythread_list[i]) {
mythread_queue_list_entry_make_batch(mythread_list[i], entry); if(mythread_list[i]->type == MyTHREAD_TYPE_BATCH)
else mythread_queue_list_entry_make_batch(mythread_list[i], entry);
mythread_queue_list_entry_make_stream(mythread_list[i], entry); else
mythread_queue_list_entry_make_stream(mythread_list[i], entry);
if(mythread_list[i])
mythread_suspend(mythread_list[i]); mythread_suspend(mythread_list[i]);
}
} }
if(queue_list->first) { if(queue_list->first) {
@ -453,11 +454,11 @@ bool mythread_queue_list_entry_see_for_done(mythread_queue_list_entry_t *entry)
void mythread_queue_list_entry_make_batch(mythread_t* mythread, mythread_queue_list_entry_t* entry) void mythread_queue_list_entry_make_batch(mythread_t* mythread, mythread_queue_list_entry_t* entry)
{ {
if(entry == NULL) if(entry == NULL || mythread == NULL)
return; return;
size_t i = 0; size_t i = 0;
for(size_t from = mythread->id_increase; from <= mythread->entries_length; from++) { for(size_t from = mythread->id_increase; from < mythread->entries_length; from++) {
entry->thread_param[from].use = i; entry->thread_param[from].use = i;
i++; i++;
} }
@ -465,10 +466,10 @@ void mythread_queue_list_entry_make_batch(mythread_t* mythread, mythread_queue_l
void mythread_queue_list_entry_make_stream(mythread_t* mythread, mythread_queue_list_entry_t* entry) void mythread_queue_list_entry_make_stream(mythread_t* mythread, mythread_queue_list_entry_t* entry)
{ {
if(entry == NULL) if(entry == NULL || mythread == NULL)
return; return;
for(size_t from = mythread->id_increase; from <= mythread->entries_length; from++) { for(size_t from = mythread->id_increase; from < mythread->entries_length; from++) {
entry->thread_param[from].use = 0; entry->thread_param[from].use = 0;
} }
} }