From 2aef87bfae4a6a91f626780767aab68b7791c9d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 16 Feb 2018 01:13:46 +1100 Subject: Cleanup: rename BLI_thread.h API - Use BLI_threadpool_ prefix for (deprecated) thread/listbase API. - Use BLI_thread as prefix for other functions. See P614 to apply instead of manually resolving conflicts. --- source/blender/blenlib/BLI_threads.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/blenlib/BLI_threads.h') diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index 84e25daa348..66eb5cfd22b 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -55,19 +55,19 @@ void BLI_threadapi_exit(void); struct TaskScheduler *BLI_task_scheduler_get(void); -void BLI_init_threads(struct ListBase *threadbase, void *(*do_thread)(void *), int tot); +void BLI_threadpool_init(struct ListBase *threadbase, void *(*do_thread)(void *), int tot); int BLI_available_threads(struct ListBase *threadbase); -int BLI_available_thread_index(struct ListBase *threadbase); -void BLI_insert_thread(struct ListBase *threadbase, void *callerdata); -void BLI_remove_thread(struct ListBase *threadbase, void *callerdata); -void BLI_remove_thread_index(struct ListBase *threadbase, int index); -void BLI_remove_threads(struct ListBase *threadbase); -void BLI_end_threads(struct ListBase *threadbase); +int BLI_threadpool_available_thread_index(struct ListBase *threadbase); +void BLI_threadpool_insert(struct ListBase *threadbase, void *callerdata); +void BLI_threadpool_remove(struct ListBase *threadbase, void *callerdata); +void BLI_threadpool_remove_index(struct ListBase *threadbase, int index); +void BLI_threadpool_clear(struct ListBase *threadbase); +void BLI_threadpool_end(struct ListBase *threadbase); int BLI_thread_is_main(void); -void BLI_begin_threaded_malloc(void); -void BLI_end_threaded_malloc(void); +void BLI_threaded_malloc_begin(void); +void BLI_threaded_malloc_end(void); /* System Information */ @@ -91,8 +91,8 @@ int BLI_system_num_threads_override_get(void); #define LOCK_FFTW 9 #define LOCK_VIEW3D 10 -void BLI_lock_thread(int type); -void BLI_unlock_thread(int type); +void BLI_thread_lock(int type); +void BLI_thread_unlock(int type); /* Mutex Lock */ -- cgit v1.2.3