Skip to content

Commit 3e80306

Browse files
ThePhDThePhD
committed
🛠️ Fix up name getter/setter implementations!
1 parent 11cc78a commit 3e80306

File tree

4 files changed

+83
-43
lines changed

4 files changed

+83
-43
lines changed

‎CMakeLists.txt

+1-8
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ option(ZTD_THREAD_TESTS "Enable build of tests" OFF)
7878
option(ZTD_THREAD_DOCUMENTATION "Enable build of documentation" OFF)
7979
option(ZTD_THREAD_DOCUMENTATION_NO_SPHINX "Turn off Sphinx usage (useful for ReadTheDocs builds)" OFF)
8080
option(ZTD_THREAD_EXAMPLES "Enable build of examples" OFF)
81-
option(ZTD_THREAD_BENCHMARKS "Enable build of benchmarks" OFF)
8281
option(ZTD_THREAD_GENERATE_SINGLE "Enable generation of a single header and its target" OFF)
83-
set(ZTD_THREAD_BENCHMARKS_REPETITIONS 50 CACHE STRING "Number of repetitions to perform. Each repetition has a number of iterations: higher means a lot more time is spent benchmarking.")
8482

8583
# Modify bad flags / change defaults if we are the top level
8684
if(ZTD_THREAD_IS_TOP_LEVEL_PROJECT)
@@ -96,7 +94,7 @@ if(ZTD_THREAD_IS_TOP_LEVEL_PROJECT)
9694
set(CMAKE_C_STANDARD 11)
9795
endif()
9896

99-
if(ZTD_THREAD_BENCHMARKS OR ZTD_THREAD_EXAMPLES OR ZTD_THREAD_TESTS OR ZTD_THREAD_SCRATCH)
97+
if(ZTD_THREAD_EXAMPLES OR ZTD_THREAD_TESTS OR ZTD_THREAD_SCRATCH)
10098
# normal flags
10199
check_compiler_flag(disable-permissive MSVC /permissive- GCC -pedantic)
102100
check_compiler_flag(disable-aliasing GCC -fno-strict-aliasing)
@@ -234,11 +232,6 @@ if(ZTD_THREAD_DOCUMENTATION)
234232
add_subdirectory(documentation)
235233
endif()
236234

237-
if(ZTD_THREAD_BENCHMARKS)
238-
# none yet
239-
#add_subdirectory(benchmarks)
240-
endif()
241-
242235
if(ZTD_THREAD_EXAMPLES)
243236
add_subdirectory(examples)
244237
endif()

‎source/ztd/thread/threads.pthreads.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ int ztdc_thrd_set_mcname(thrd_t __thr, const char* __buffer) {
749749
return thrd_success;
750750
}
751751
#if ZTD_IS_ON(ZTD_PLATFORM_MAC_OS)
752-
if (thrd_equal(__thr, thrd_current())) {
752+
if (!thrd_equal(__thr, thrd_current())) {
753753
return thrd_error;
754754
}
755755
return __ztdc_pthread_to_thread_error(pthread_setname_np(__buffer));
@@ -789,7 +789,7 @@ int ztdc_thrd_set_c8name(thrd_t __thr, const ztd_char8_t* __buffer) {
789789
return thrd_success;
790790
}
791791
#if ZTD_IS_ON(ZTD_PLATFORM_MAC_OS)
792-
if (thrd_equal(__thr, thrd_current())) {
792+
if (!thrd_equal(__thr, thrd_current())) {
793793
return thrd_error;
794794
}
795795
return __ztdc_pthread_to_thread_error(pthread_setname_np((const char*)__buffer));
@@ -810,7 +810,7 @@ int ztdc_thrd_set_mwcname_sized(thrd_t __thr, size_t __buffer_size, const ztd_wc
810810
ztd_char8_t __tmp_buffer[ZTD_THREAD_INTERMEDIATE_BUFFER_SUGGESTED_SIZE(ztd_char8_t) + 1];
811811
ztd_char8_t* __tmp_buffer_ptr = __tmp_buffer;
812812
size_t __tmp_buffer_size = ZTD_THREAD_INTERMEDIATE_BUFFER_SUGGESTED_SIZE(ztd_char8_t);
813-
cnc_mcerr __conv_err = cnc_mwcntoc8n(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
813+
cnc_mcerr __conv_err = cnc_mwcsntoc8sn(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
814814
if (__conv_err != cnc_mcerr_ok) {
815815
return __conv_err == cnc_mcerr_incomplete_input ? thrd_nomem : thrd_error;
816816
}
@@ -854,7 +854,7 @@ int ztdc_thrd_set_c16name_sized(thrd_t __thr, size_t __buffer_size, const ztd_ch
854854
ztd_char8_t __tmp_buffer[ZTD_THREAD_INTERMEDIATE_BUFFER_SUGGESTED_SIZE(ztd_char8_t) + 1];
855855
ztd_char8_t* __tmp_buffer_ptr = __tmp_buffer;
856856
size_t __tmp_buffer_size = ZTD_THREAD_INTERMEDIATE_BUFFER_SUGGESTED_SIZE(ztd_char8_t);
857-
cnc_mcerr __conv_err = cnc_c16ntoc8n(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
857+
cnc_mcerr __conv_err = cnc_c16sntoc8sn(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
858858
if (__conv_err != cnc_mcerr_ok) {
859859
return __conv_err == cnc_mcerr_incomplete_input ? thrd_nomem : thrd_error;
860860
}
@@ -874,7 +874,7 @@ int ztdc_thrd_set_c32name_sized(thrd_t __thr, size_t __buffer_size, const ztd_ch
874874
ztd_char8_t __tmp_buffer[ZTD_THREAD_INTERMEDIATE_BUFFER_SUGGESTED_SIZE(ztd_char8_t) + 1];
875875
ztd_char8_t* __tmp_buffer_ptr = __tmp_buffer;
876876
size_t __tmp_buffer_size = ZTD_THREAD_INTERMEDIATE_BUFFER_SUGGESTED_SIZE(ztd_char8_t);
877-
cnc_mcerr __conv_err = cnc_c32ntoc8n(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
877+
cnc_mcerr __conv_err = cnc_c32sntoc8sn(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
878878
if (__conv_err != cnc_mcerr_ok) {
879879
return __conv_err == cnc_mcerr_incomplete_input ? thrd_nomem : thrd_error;
880880
}

‎source/ztd/thread/threads.windows.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ int ztdc_thrd_set_mcname_sized(thrd_t __thr, size_t __buffer_size, const ztd_cha
906906
ztd_wchar_t __tmp_buffer[DESC_MAX_SIZE + 1];
907907
ztd_wchar_t* __tmp_buffer_ptr = __tmp_buffer;
908908
size_t __tmp_buffer_size = DESC_MAX_SIZE;
909-
cnc_mcerr __conv_err = cnc_mcntomwcn(&__buffer_size, &__buffer, &__tmp_buffer_size, &__tmp_buffer_ptr);
909+
cnc_mcerr __conv_err = cnc_mcsntomwcsn(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
910910
if (__conv_err != cnc_mcerr_ok) {
911911
return __conv_err == cnc_mcerr_incomplete_input ? thrd_nomem : thrd_error;
912912
}
@@ -953,7 +953,7 @@ int ztdc_thrd_set_c8name_sized(thrd_t __thr, size_t __buffer_size, const ztd_cha
953953
ztd_wchar_t __tmp_buffer[DESC_MAX_SIZE + 1];
954954
ztd_wchar_t* __tmp_buffer_ptr = __tmp_buffer;
955955
size_t __tmp_buffer_size = DESC_MAX_SIZE;
956-
cnc_mcerr __conv_err = cnc_c8ntomwcn(&__buffer_size, &__buffer, &__tmp_buffer_size, &__tmp_buffer_ptr);
956+
cnc_mcerr __conv_err = cnc_c8sntomwcsn(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
957957
if (__conv_err != cnc_mcerr_ok) {
958958
return __conv_err == cnc_mcerr_incomplete_input ? thrd_nomem : thrd_error;
959959
}
@@ -973,7 +973,7 @@ int ztdc_thrd_set_c16name_sized(thrd_t __thr, size_t __buffer_size, const ztd_ch
973973
if (ztdc_c_string_ptr_size_limit_wc(__buffer_size, __buffer) == __buffer_size
974974
&& __buffer[__buffer_size] == (ztd_char16_t)0) {
975975
// it is of the right size, has no intermediate null terminators, and is null-terminated properly
976-
return ztdc_thrd_set_mwcname(__thr, __buffer);
976+
return ztdc_thrd_set_mwcname(__thr, (const ztd_wchar_t*)__buffer);
977977
}
978978
enum { DESC_MAX_SIZE = 1024 * 64 };
979979
if (__buffer_size > DESC_MAX_SIZE) {
@@ -1000,7 +1000,7 @@ int ztdc_thrd_set_c32name_sized(thrd_t __thr, size_t __buffer_size, const ztd_ch
10001000
ztd_wchar_t __tmp_buffer[DESC_MAX_SIZE + 1];
10011001
ztd_wchar_t* __tmp_buffer_ptr = __tmp_buffer;
10021002
size_t __tmp_buffer_size = DESC_MAX_SIZE;
1003-
cnc_mcerr __conv_err = cnc_c32ntomwcn(&__buffer_size, &__buffer, &__tmp_buffer_size, &__tmp_buffer_ptr);
1003+
cnc_mcerr __conv_err = cnc_c32sntomwcsn(&__tmp_buffer_size, &__tmp_buffer_ptr, &__buffer_size, &__buffer);
10041004
if (__conv_err != cnc_mcerr_ok) {
10051005
return __conv_err == cnc_mcerr_incomplete_input ? thrd_nomem : thrd_error;
10061006
}

0 commit comments

Comments
 (0)