vivarium_usdt 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0011c748448f6875e94c69e9c6c8f9278c8336772ab1755469f64a017279b225
-  data.tar.gz: d64f94363f10b94463e9e5de1441dd215bcae31296c3dc4f57949e5c5081687d
+  metadata.gz: '039e9979c37827b5da754ff8374271504fadd703e2b6675f9f362d840e930bfc'
+  data.tar.gz: 169e40666e700b76e63b3306ff70c8c1981ff25fc9069b550224f14a6c72964c
 SHA512:
-  metadata.gz: 5b3cb49e9103c52bc3447dc92770975ce3a6c078fd8e2d49608284d155440345c6575ba84f3a22a28c1092a1dcb70e7c9befacf68141c304e010817852d81462
-  data.tar.gz: bec8e1cab4cce013e59c969e9f56e3857c33575568d3d4a11d4a70079d395e8af2c255935d0f8ef8e5ef067dccbc5e2e8f3d592fef32cd6dd65cc42808a60ef1
+  metadata.gz: af717d63fdf635b8b1904d45540eea1d8ad58eb24190ff0e0a8d45b2c9b04b08cc3204a7f89e5a3a89e24d4e40e869b7678b6d479e1ffc8926608520d6250a18
+  data.tar.gz: 9d70c8c830f898a91588799d2b4cac0a37f70ccfa0fb7069b5ddf33e57f3dc5b9f3c9b6efcb39202e6a686f06b920c62c53802192e334d5cf1d3c940e0d9d2d0

data/ext/vivarium_usdt/src/lib.rs

@@ -7,64 +7,56 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
     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, 4))?;
-
-    let kernel = ruby.module_kernel();
-    kernel.define_method(
-        "__helper_get_hash_from_name",
-        function!(__helper_get_hash_from_name, 1),
-    )?;
     Ok(())
 }
 
-pub(crate) fn invoke_start_probe(method_id: i64, file_id: i64, lineno: i64) -> Result<(), Error> {
+fn to_fixed_cstr(s: &str) -> [u8; 128] {
+    let mut buf = [0u8; 128];
+    let bytes = s.as_bytes();
+    let len = bytes.len().min(127);
+    buf[..len].copy_from_slice(&bytes[..len]);
+    buf
+}
+
+pub(crate) fn invoke_start_probe(method_name: String, file: String, lineno: i64) -> Result<(), Error> {
     #[cfg(target_os = "linux")]
     {
         use probe::probe;
-        probe::probe!(vivarium_usdt, start_probe, method_id, file_id, lineno);
+        let m = to_fixed_cstr(&method_name);
+        let f = to_fixed_cstr(&file);
+        probe::probe!(vivarium_usdt, start_probe, m.as_ptr(), f.as_ptr(), lineno);
     }
     Ok(())
 }
 
-pub(crate) fn invoke_stop_probe(method_id: i64, file_id: i64, lineno: i64) -> Result<(), Error> {
+pub(crate) fn invoke_stop_probe(method_name: String, file: String, lineno: i64) -> Result<(), Error> {
     #[cfg(target_os = "linux")]
     {
         use probe::probe;
-        probe::probe!(vivarium_usdt, stop_probe, method_id, file_id, lineno);
+        let m = to_fixed_cstr(&method_name);
+        let f = to_fixed_cstr(&file);
+        probe::probe!(vivarium_usdt, stop_probe, m.as_ptr(), f.as_ptr(), lineno);
     }
     Ok(())
 }
 
 pub(crate) fn invoke_raise_probe(
-    error_id: i64,
-    message_id: i64,
-    file_id: i64,
+    error_name: String,
+    message: String,
+    file: String,
     lineno: i64,
 ) -> Result<(), Error> {
     #[cfg(target_os = "linux")]
     {
         use probe::probe;
-        probe::probe!(
-            vivarium_usdt,
-            raise_probe,
-            error_id,
-            message_id,
-            file_id,
-            lineno
-        );
+        let e = to_fixed_cstr(&error_name);
+        let msg = to_fixed_cstr(&message);
+        let f = to_fixed_cstr(&file);
+        probe::probe!(vivarium_usdt, raise_probe, e.as_ptr(), msg.as_ptr(), f.as_ptr(), lineno);
     }
     Ok(())
 }
 
-pub(crate) fn __helper_get_hash_from_name(name: String) -> Result<i64, Error> {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::{Hash, Hasher};
-
-    let mut hasher = DefaultHasher::new();
-    name.hash(&mut hasher);
-    let hash = hasher.finish() as i64;
-    Ok(hash)
-}
-
 #[cfg(test)]
 mod tests {
     use rb_sys_test_helpers::ruby_test;

data/lib/vivarium/usdt.rb

@@ -3,85 +3,18 @@ require "vivarium_usdt/vivarium_usdt"
 module Vivarium
   module Usdt
     class << self
-      def __method_id_table
-        @__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
-      private :__file_id_table
-
-      def get_method_name(u64)
-        __method_id_table[u64]
-      end
-
-      def get_error_name(u64)
-        __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
-
-      def register_or_resolve_method(method_signature)
-        id = __helper_get_hash_from_name(method_signature)
-        __method_id_table[id] ||= method_signature
-        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
-        id
-      end
-
       def start(defined_class, method_name, file: nil, lineno: -1)
         method_signature = "#{defined_class}##{method_name}"
-        method_id = register_or_resolve_method(method_signature)
-        file_id = file ? register_or_resolve_file(file) : -1
-        ::VivariumUsdt.invoke_start_probe(method_id, file_id, lineno)
+        ::VivariumUsdt.invoke_start_probe(method_signature, file || "", lineno)
       end
 
       def stop(defined_class, method_name, file: nil, lineno: -1)
         method_signature = "#{defined_class}##{method_name}"
-        method_id = register_or_resolve_method(method_signature)
-        file_id = file ? register_or_resolve_file(file) : -1
-        ::VivariumUsdt.invoke_stop_probe(method_id, file_id, lineno)
+        ::VivariumUsdt.invoke_stop_probe(method_signature, file || "", lineno)
       end
 
       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, message_id, file_id, lineno)
+        ::VivariumUsdt.invoke_raise_probe(error_name, message, file || "", lineno)
       end
     end
   end

data/lib/vivarium/usdt_version.rb

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

metadata

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