diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:13:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:13:46 +0300 |
commit | 2aef87bfae4a6a91f626780767aab68b7791c9d4 (patch) | |
tree | 8c920050c424fd30fc649ad5b9a374b517f2ebad /source/blender/imbuf/intern/thumbs.c | |
parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) |
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.
Diffstat (limited to 'source/blender/imbuf/intern/thumbs.c')
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 3629332a4ac..3c587684641 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -652,7 +652,7 @@ static struct IMBThumbLocks { void IMB_thumb_locks_acquire(void) { - BLI_lock_thread(LOCK_IMAGE); + BLI_thread_lock(LOCK_IMAGE); if (thumb_locks.lock_counter == 0) { BLI_assert(thumb_locks.locked_paths == NULL); @@ -663,12 +663,12 @@ void IMB_thumb_locks_acquire(void) BLI_assert(thumb_locks.locked_paths != NULL); BLI_assert(thumb_locks.lock_counter > 0); - BLI_unlock_thread(LOCK_IMAGE); + BLI_thread_unlock(LOCK_IMAGE); } void IMB_thumb_locks_release(void) { - BLI_lock_thread(LOCK_IMAGE); + BLI_thread_lock(LOCK_IMAGE); BLI_assert((thumb_locks.locked_paths != NULL) && (thumb_locks.lock_counter > 0)); thumb_locks.lock_counter--; @@ -678,14 +678,14 @@ void IMB_thumb_locks_release(void) BLI_condition_end(&thumb_locks.cond); } - BLI_unlock_thread(LOCK_IMAGE); + BLI_thread_unlock(LOCK_IMAGE); } void IMB_thumb_path_lock(const char *path) { void *key = BLI_strdup(path); - BLI_lock_thread(LOCK_IMAGE); + BLI_thread_lock(LOCK_IMAGE); BLI_assert((thumb_locks.locked_paths != NULL) && (thumb_locks.lock_counter > 0)); if (thumb_locks.locked_paths) { @@ -694,14 +694,14 @@ void IMB_thumb_path_lock(const char *path) } } - BLI_unlock_thread(LOCK_IMAGE); + BLI_thread_unlock(LOCK_IMAGE); } void IMB_thumb_path_unlock(const char *path) { const void *key = path; - BLI_lock_thread(LOCK_IMAGE); + BLI_thread_lock(LOCK_IMAGE); BLI_assert((thumb_locks.locked_paths != NULL) && (thumb_locks.lock_counter > 0)); if (thumb_locks.locked_paths) { @@ -711,5 +711,5 @@ void IMB_thumb_path_unlock(const char *path) BLI_condition_notify_all(&thumb_locks.cond); } - BLI_unlock_thread(LOCK_IMAGE); + BLI_thread_unlock(LOCK_IMAGE); } |