Skip to content

Commit 5adb37c

Browse files
committed
utils_rwlock_init fix
1 parent 134e16b commit 5adb37c

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/provider/provider_level_zero.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ static umf_result_t ze_memory_provider_initialize(const void *params,
657657
}
658658
}
659659

660-
if (utils_rwlock_init(&ze_provider->resident_device_rwlock) == NULL) {
660+
if (utils_rwlock_init(&ze_provider->resident_device_rwlock) != 0) {
661661
LOG_ERR("Cannot initialize resident device rwlock");
662662
umf_ba_global_free(ze_provider);
663663
return UMF_RESULT_ERROR_OUT_OF_RESOURCES;

src/utils/utils_concurrency.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ typedef struct utils_rwlock_t {
7171
#endif
7272
} utils_rwlock_t;
7373

74-
utils_rwlock_t *utils_rwlock_init(utils_rwlock_t *ptr);
74+
int utils_rwlock_init(utils_rwlock_t *ptr);
7575
void utils_rwlock_destroy_not_free(utils_rwlock_t *rwlock);
7676
void utils_read_lock(utils_rwlock_t *rwlock);
7777
void utils_write_lock(utils_rwlock_t *rwlock);

src/utils/utils_posix_concurrency.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ void utils_init_once(UTIL_ONCE_FLAG *flag, void (*oneCb)(void)) {
4646
pthread_once(flag, oneCb);
4747
}
4848

49-
utils_rwlock_t *utils_rwlock_init(utils_rwlock_t *ptr) {
49+
int utils_rwlock_init(utils_rwlock_t *ptr) {
5050
pthread_rwlock_t *rwlock = (pthread_rwlock_t *)ptr;
51-
int ret = pthread_rwlock_init(rwlock, NULL);
52-
return ret == 0 ? ((utils_rwlock_t *)rwlock) : NULL;
51+
return pthread_rwlock_init(rwlock, NULL);
5352
}
5453

5554
void utils_rwlock_destroy_not_free(utils_rwlock_t *ptr) {

src/utils/utils_windows_concurrency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ int utils_mutex_unlock(utils_mutex_t *mutex) {
3636
return 0;
3737
}
3838

39-
utils_rwlock_t *utils_rwlock_init(utils_rwlock_t *rwlock) {
39+
int utils_rwlock_init(utils_rwlock_t *rwlock) {
4040
InitializeSRWLock(&rwlock->lock);
4141
return 0; // never fails
4242
}

0 commit comments

Comments
 (0)