wip

Author: marcotc

ext/datadog_profiling_native_extension/profiling.c

@@ -41,7 +41,6 @@ static VALUE _native_enforce_success(DDTRACE_UNUSED VALUE _self, VALUE syserr_er
 static void *trigger_enforce_success(void *trigger_args);
 static VALUE _native_malloc_stats(DDTRACE_UNUSED VALUE _self);
 static VALUE _native_safe_object_info(DDTRACE_UNUSED VALUE _self, VALUE obj);
-static VALUE _native_raise_native_error_with_invalid_class(DDTRACE_UNUSED VALUE _self, VALUE invalid_exception_class, VALUE message, VALUE telemetry_message);
 
 void DDTRACE_EXPORT Init_datadog_profiling_native_extension(void) {
   // The profiler still has a lot of limitations around being used in Ractors BUT for now we're choosing to take care of those
@@ -90,7 +89,6 @@ void DDTRACE_EXPORT Init_datadog_profiling_native_extension(void) {
   rb_define_singleton_method(testing_module, "_native_enforce_success", _native_enforce_success, 2);
   rb_define_singleton_method(testing_module, "_native_malloc_stats", _native_malloc_stats, 0);
   rb_define_singleton_method(testing_module, "_native_safe_object_info", _native_safe_object_info, 1);
-  rb_define_singleton_method(testing_module, "_native_raise_native_error_with_invalid_class", _native_raise_native_error_with_invalid_class, 3);
 }
 
 static VALUE native_working_p(DDTRACE_UNUSED VALUE _self) {
@@ -289,13 +287,3 @@ static VALUE _native_malloc_stats(DDTRACE_UNUSED VALUE _self) {
 static VALUE _native_safe_object_info(DDTRACE_UNUSED VALUE _self, VALUE obj) {
   return rb_str_new_cstr(safe_object_info(obj));
 }
-
-// Allows testing raise_error with an unrecognized exception class
-// TODO: REMOVE THIS UNUSED METHOD
-static VALUE _native_raise_native_error_with_invalid_class(DDTRACE_UNUSED VALUE _self, VALUE invalid_exception_class, VALUE message, VALUE telemetry_message) {
-  ENFORCE_TYPE(message, T_STRING);
-  ENFORCE_TYPE(telemetry_message, T_STRING);
-
-  VALUE exception = rb_exc_new_cstr(invalid_exception_class, StringValueCStr(message));
-  private_raise_exception(exception, StringValueCStr(message), StringValueCStr(telemetry_message));
-}

ext/datadog_profiling_native_extension/ruby_helpers.c

@@ -40,7 +40,7 @@ void ruby_helpers_init(void) {
 // Make sure to *not* invoke Ruby code as this function can run in unsafe contexts.
 // NOTE: Raising the exception acquires the GVL (unsafe), but it also aborts the current execution flow.
 // @see debug_enter_unsafe_context
-void private_raise_exception(VALUE exception, const char *detailed_message, const char *static_message) {
+static void private_raise_exception(VALUE exception, const char *detailed_message, const char *static_message) {
   rb_ivar_set(exception, telemetry_message_id, rb_str_new_cstr(static_message));
   rb_exc_raise(exception);
 }

ext/datadog_profiling_native_extension/ruby_helpers.h

@@ -70,11 +70,7 @@ NORETURN(
   __attribute__ ((format (printf, 3, 4)));
 );
 
-// NOTE: Only used externally for testing
-// TODO: unexpose this.
-NORETURN(
-  void private_raise_exception(VALUE exception, const char *detailed_message, const char *static_message)
-);
+
 
 #define ENFORCE_SUCCESS_GVL(expression) ENFORCE_SUCCESS_HELPER(expression, true)
 #define ENFORCE_SUCCESS_NO_GVL(expression) ENFORCE_SUCCESS_HELPER(expression, false)