NorwayFun
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

highlighting: Fix threading to avoid overlap crash 

It's not threadsafe code within the editor so block
a thread if another is already running.
Also ditch pthread for Ecore_Thread :)
This commit is contained in:
Andy Williams 2015-05-30 22:56:41 +01:00
parent 01fd2997d2
commit 7bf0fc7c3c
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/editor/edi_editor.c
View File

@ -486,8 +486,8 @@ _clang_load_errors(const char *path EINA_UNUSED, Edi_Editor *editor)
} }
} }
static void * static void
_edi_clang_setup(void *data) _edi_clang_setup(void *data, Ecore_Thread *thread EINA_UNUSED)
{ {
Edi_Editor *editor; Edi_Editor *editor;
Elm_Code *code; Elm_Code *code;
@ -514,20 +514,19 @@ _edi_clang_setup(void *data)
_clang_load_errors(path, editor); _clang_load_errors(path, editor);
_clang_load_highlighting(path, editor); _clang_load_highlighting(path, editor);
_clang_show_highlighting(editor); _clang_show_highlighting(editor);
_clang_free_highlighting(editor);
return NULL;
} }
/*
TODO - USE ME!
static void static void
_edi_clang_dispose(Edi_Editor *editor) _edi_clang_dispose(void *data, Ecore_Thread *thread EINA_UNUSED)
{ {
Edi_Editor *editor = (Edi_Editor *)data;
_clang_free_highlighting(editor);
clang_disposeTranslationUnit(editor->tx_unit); clang_disposeTranslationUnit(editor->tx_unit);
clang_disposeIndex(editor->idx); clang_disposeIndex(editor->idx);
editor->highlight_thread = NULL;
} }
*/
#endif #endif
static void static void
@ -559,15 +558,11 @@ _edi_editor_parse_file_cb(Elm_Code_File *file EINA_UNUSED, void *data)
Edi_Editor *editor; Edi_Editor *editor;
editor = (Edi_Editor *)data; editor = (Edi_Editor *)data;
if (editor->highlight_thread)
return;
#if HAVE_LIBCLANG #if HAVE_LIBCLANG
pthread_attr_t attr; editor->highlight_thread = ecore_thread_run(_edi_clang_setup, _edi_clang_dispose, NULL, editor);
pthread_t thread_id;
if (pthread_attr_init(&attr) != 0)
perror("pthread_attr_init");
if (pthread_create(&thread_id, &attr, _edi_clang_setup, editor) != 0)
perror("pthread_create");
#endif #endif
} }

1
src/bin/editor/edi_editor.h
View File

@ -55,6 +55,7 @@ struct _Edi_Editor
#endif #endif
Eina_Bool show_highlight; Eina_Bool show_highlight;
Ecore_Thread *highlight_thread;
time_t save_time; time_t save_time;
/* Add new members here. */ /* Add new members here. */