vivarium_usdt 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76911f6bea49e8566350654970c25f4f78eac5e4a8b27b5302b4fa3a601adeb
-  data.tar.gz: ec793930d4cd636ead77368bdb524e303cfd728bae224a839b2968a44adbfcbe
+  metadata.gz: 0011c748448f6875e94c69e9c6c8f9278c8336772ab1755469f64a017279b225
+  data.tar.gz: d64f94363f10b94463e9e5de1441dd215bcae31296c3dc4f57949e5c5081687d
 SHA512:
-  metadata.gz: 0b0d070b76a2667ebfabfe60b626fa1c5206c98933b96a7bef5046b9d66a06843cd6bf4fe33c8a2856be45a61c536e360c729e83bc793cc7525cee1efa79e770
-  data.tar.gz: 48caf2ae17b43ed1cf86e49e712d03b7cbe40cef2f023c68121f61c8181b953dfed7321d3cc45b59a7027e8334d5f259413d473fbb67a2aeb70fc13bb7610bd8
+  metadata.gz: 5b3cb49e9103c52bc3447dc92770975ce3a6c078fd8e2d49608284d155440345c6575ba84f3a22a28c1092a1dcb70e7c9befacf68141c304e010817852d81462
+  data.tar.gz: bec8e1cab4cce013e59c969e9f56e3857c33575568d3d4a11d4a70079d395e8af2c255935d0f8ef8e5ef067dccbc5e2e8f3d592fef32cd6dd65cc42808a60ef1

data/ext/vivarium_usdt/src/lib.rs

@@ -6,7 +6,7 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
     let module = ruby.define_module("VivariumUsdt")?;
     module.define_singleton_method("invoke_start_probe", function!(invoke_start_probe, 3))?;
     module.define_singleton_method("invoke_stop_probe", function!(invoke_stop_probe, 3))?;
-    module.define_singleton_method("invoke_raise_probe", function!(invoke_raise_probe, 3))?;
+    module.define_singleton_method("invoke_raise_probe", function!(invoke_raise_probe, 4))?;
 
     let kernel = ruby.module_kernel();
     kernel.define_method(
@@ -34,11 +34,23 @@ pub(crate) fn invoke_stop_probe(method_id: i64, file_id: i64, lineno: i64) -> Re
     Ok(())
 }
 
-pub(crate) fn invoke_raise_probe(error_id: i64, file_id: i64, lineno: i64) -> Result<(), Error> {
+pub(crate) fn invoke_raise_probe(
+    error_id: i64,
+    message_id: i64,
+    file_id: i64,
+    lineno: i64,
+) -> Result<(), Error> {
     #[cfg(target_os = "linux")]
     {
         use probe::probe;
-        probe::probe!(vivarium_usdt, raise_probe, error_id, file_id, lineno);
+        probe::probe!(
+            vivarium_usdt,
+            raise_probe,
+            error_id,
+            message_id,
+            file_id,
+            lineno
+        );
     }
     Ok(())
 }

data/lib/vivarium/usdt.rb

@@ -7,10 +7,17 @@ module Vivarium
         @__method_id_table ||= {}
       end
       private :__method_id_table
+
       def __error_id_table
         @__error_id_table ||= {}
       end
       private :__error_id_table
+
+      def __message_id_table
+        @__message_id_table ||= {}
+      end
+      private :__message_id_table
+
       def __file_id_table
         @__file_id_table ||= {}
       end
@@ -24,6 +31,10 @@ module Vivarium
         __error_id_table[u64]
       end
 
+      def get_message_name(u64)
+        __message_id_table[u64]
+      end
+
       def get_file_name(u64)
         __file_id_table[u64]
       end
@@ -34,6 +45,18 @@ module Vivarium
         id
       end
 
+      def register_or_resolve_error(error_name)
+        id = __helper_get_hash_from_name(error_name)
+        __error_id_table[id] ||= error_name
+        id
+      end
+
+      def register_or_resolve_message(message)
+        id = __helper_get_hash_from_name(message)
+        __message_id_table[id] ||= message
+        id
+      end
+
       def register_or_resolve_file(file_name)
         id = __helper_get_hash_from_name(file_name)
         __file_id_table[id] ||= file_name
@@ -54,11 +77,11 @@ module Vivarium
         ::VivariumUsdt.invoke_stop_probe(method_id, file_id, lineno)
       end
 
-      def raise(error_name, file: nil, lineno: -1)
-        error_id = __helper_get_hash_from_name(error_name)
-        __error_id_table[error_id] ||= error_name
+      def raise(error_name, message, file: nil, lineno: -1)
+        error_id = register_or_resolve_error(error_name)
+        message_id = register_or_resolve_message(message)
         file_id = file ? register_or_resolve_file(file) : -1
-        ::VivariumUsdt.invoke_raise_probe(error_id, file_id, lineno)
+        ::VivariumUsdt.invoke_raise_probe(error_id, message_id, file_id, lineno)
       end
     end
   end

data/lib/vivarium/usdt_version.rb

@@ -2,6 +2,6 @@
 
 module Vivarium
   module Usdt
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/sig/vivarium_usdt.rbs

@@ -1,4 +1,29 @@
 module VivariumUsdt
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  def self.invoke_start_probe: (Integer method_id, Integer file_id, Integer lineno) -> void
+  def self.invoke_stop_probe: (Integer method_id, Integer file_id, Integer lineno) -> void
+  def self.invoke_raise_probe: (Integer error_id, Integer message_id, Integer file_id, Integer lineno) -> void
+end
+
+module Kernel
+  private def __helper_get_hash_from_name: (String name) -> Integer
+end
+
+module Vivarium
+  module Usdt
+    VERSION: String
+
+    def self.get_method_name: (Integer u64) -> String?
+    def self.get_error_name: (Integer u64) -> String?
+    def self.get_message_name: (Integer u64) -> String?
+    def self.get_file_name: (Integer u64) -> String?
+
+    def self.register_or_resolve_method: (String method_signature) -> Integer
+    def self.register_or_resolve_error: (String error_name) -> Integer
+    def self.register_or_resolve_message: (String message) -> Integer
+    def self.register_or_resolve_file: (String file_name) -> Integer
+
+    def self.start: ((String | Symbol | Module) defined_class, (String | Symbol) method_name, ?file: String?, ?lineno: Integer) -> void
+    def self.stop: ((String | Symbol | Module) defined_class, (String | Symbol) method_name, ?file: String?, ?lineno: Integer) -> void
+    def self.raise: (String error_name, String message, ?file: String?, ?lineno: Integer) -> void
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vivarium_usdt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Uchio Kondo