Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No longer silently hide errors in Metal completion handlers (alternative approach) #8240

Merged
merged 14 commits into from
Jun 14, 2024
Merged

No longer silently hide errors in Metal completion handlers (alternative approach) #8240

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5a1702f
No longer silently hide errors in Metal completion handlers
shoaibkamil May 23, 2024
4386a2a
Actually implement alternative
shoaibkamil May 28, 2024
5e05ea7
Merge branch 'main' into shoaibkamil/metal_completion_handler_error_a…
steven-johnson Jun 3, 2024
4b8a7a5
clang-format
steven-johnson Jun 3, 2024
660e038
Merge remote-tracking branch 'origin/main' into shoaibkamil/metal_com…
shoaibkamil Jun 7, 2024
a443963
Implement new API
shoaibkamil Jun 7, 2024
79f29d5
Implement test and refine the API
shoaibkamil Jun 10, 2024
9270b21
Format.
shoaibkamil Jun 10, 2024
b7ae0fb
Remove some debug code
shoaibkamil Jun 10, 2024
51eb3aa
Add missing includes.
shoaibkamil Jun 10, 2024
faaa65e
Add comment noting why we manually null-terminate after strncpy
shoaibkamil Jun 10, 2024
3c3a656
Reverse engineer Objective-C API for passing void* in a block; it tur…
shoaibkamil Jun 12, 2024
c3a11b2
Formatting
shoaibkamil Jun 12, 2024
588a59c
Don't add const-ness to declaration.
shoaibkamil Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add comment noting why we manually null-terminate after strncpy
  • Loading branch information
@shoaibkamil
shoaibkamil committed Jun 10, 2024
commit faaa65e0ddc723b68d38d732854a4cc62c809eff
4 changes: 4 additions & 0 deletions src/runtime/metal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ class MetalContextHolder {
saved_status = halide_error_code_success;
if (error_string != nullptr && result != halide_error_code_success && strnlen(MetalContextHolder::error_string, 1024) > 0) {
strncpy(error_string, MetalContextHolder::error_string, 1024);
// Ensure null-termination, since strncpy won't if the source string is too long
error_string[1023] = '\0';
MetalContextHolder::error_string[0] = '\0';
debug(nullptr) << "MetalContextHolder::get_and_clear_saved_status: " << error_string << "\n";
Expand All @@ -432,6 +433,7 @@ class MetalContextHolder {
int result = saved_status;
if (error_string != nullptr && result != halide_error_code_success && strnlen(MetalContextHolder::error_string, 1024) > 0) {
strncpy(error_string, MetalContextHolder::error_string, 1024);
// Ensure null-termination, since strncpy won't if the source string is too long
error_string[1023] = '\0';
}
halide_mutex_unlock(&saved_status_mutex);
Expand All @@ -443,6 +445,7 @@ class MetalContextHolder {
saved_status = new_status;
if (error_string != nullptr) {
strncpy(MetalContextHolder::error_string, error_string, 1024);
shoaibkamil marked this conversation as resolved.
Show resolved Hide resolved
// Ensure null-termination, since strncpy won't if the source string is too long
error_string[1023] = '\0';
debug(nullptr) << "MetalContextHolder::set_saved_status: " << error_string << "\n";
}
Expand Down Expand Up @@ -509,6 +512,7 @@ WEAK int halide_metal_command_buffer_completion_handler(void *user_context, mtl_
*returned_error_string = (char *)malloc(sizeof(char) * 1024);
if (*returned_error_string != nullptr) {
strncpy(*returned_error_string, error_string, 1024);
// Ensure null-termination, since strncpy won't if the source string is too long
(*returned_error_string)[1023] = '\0';
} else {
debug(user_context) << "halide_metal_command_buffer_completion_handler: Failed to allocate memory for error string.\n";
Expand Down
Loading