Optimize native code

native/jni/src/lib.rs

@@ -4,68 +4,63 @@ use jni::objects::{JClass, JObject, JValue};
 use jni::sys::{jdouble, jint};
 use jni::JNIEnv;
 
-pub trait JNI<'local> {
- fn set_double_field(&mut self, obj: &JObject, name: &str, val: jdouble) -> Result<()>;
- fn throw_illegal_decimal(self, decimal: f64) -> JObject<'local>;
- fn new_mf_object(self, m: &MagneticField) -> JObject<'local>;
+macro_rules! set_double_field {
+ ($self:expr, $obj:expr, $name:expr, $val:expr) => {
+  $self.set_field($obj, $name, "D", JValue::from($val))
+ };
 }
 
-impl<'a> JNI<'a> for JNIEnv<'a> {
- #[inline]
- fn set_double_field(&mut self, obj: &JObject, name: &str, val: jdouble) -> Result<()> {
- self.set_field(obj, name, "D", JValue::from(val))
- }
-
- fn throw_illegal_decimal(mut self, decimal: f64) -> JObject<'a> {
- self.throw_new(
- "java/lang/IllegalArgumentException",
- format!("decimal = {decimal}"),
- )
- .unwrap_or_else(|e| {
- eprintln!("{e}");
- });
-
- JObject::null()
- }
-
- fn new_mf_object(mut self, m: &MagneticField) -> JObject<'a> {
- match build_mf_object(&mut self, &m) {
- Ok(obj) => obj,
- Err(err) => {
- self.throw_new("java/lang/IllegalArgumentException", err.to_string())
- .unwrap_or_else(|e| {
- eprintln!("{e}");
- });
+#[inline]
+fn throw_illegal_decimal<'local>(env: &mut JNIEnv<'local>, decimal: f64) -> JObject<'local> {
+ env.throw_new(
+ "java/lang/IllegalArgumentException",
+ format!("decimal = {decimal}"),
+ )
+ .unwrap_or_else(|e| {
+ eprintln!("{e}");
+ });
 
- JObject::null()
- }
- }
- }
+ JObject::null()
 }
 
 #[inline]
 fn build_mf_object<'local>(env: &mut JNIEnv<'local>, m: &MagneticField) -> Result<JObject<'local>> {
  let class = env.find_class("dev/sanmer/geomag/MagneticField")?;
  let obj = env.alloc_object(class)?;
 
- env.set_double_field(&obj, "x", m.x)?;
- env.set_double_field(&obj, "xDot", m.x_dot)?;
- env.set_double_field(&obj, "y", m.y)?;
- env.set_double_field(&obj, "yDot", m.y_dot)?;
- env.set_double_field(&obj, "z", m.z)?;
- env.set_double_field(&obj, "zDot", m.z_dot)?;
- env.set_double_field(&obj, "h", m.h)?;
- env.set_double_field(&obj, "hDot", m.h_dot)?;
- env.set_double_field(&obj, "f", m.f)?;
- env.set_double_field(&obj, "fDot", m.f_dot)?;
- env.set_double_field(&obj, "d", m.d)?;
- env.set_double_field(&obj, "dDot", m.d_dot)?;
- env.set_double_field(&obj, "i", m.i)?;
- env.set_double_field(&obj, "iDot", m.i_dot)?;
+ set_double_field!(env, &obj, "x", m.x)?;
+ set_double_field!(env, &obj, "xDot", m.x_dot)?;
+ set_double_field!(env, &obj, "y", m.y)?;
+ set_double_field!(env, &obj, "yDot", m.y_dot)?;
+ set_double_field!(env, &obj, "z", m.z)?;
+ set_double_field!(env, &obj, "zDot", m.z_dot)?;
+ set_double_field!(env, &obj, "h", m.h)?;
+ set_double_field!(env, &obj, "hDot", m.h_dot)?;
+ set_double_field!(env, &obj, "f", m.f)?;
+ set_double_field!(env, &obj, "fDot", m.f_dot)?;
+ set_double_field!(env, &obj, "d", m.d)?;
+ set_double_field!(env, &obj, "dDot", m.d_dot)?;
+ set_double_field!(env, &obj, "i", m.i)?;
+ set_double_field!(env, &obj, "iDot", m.i_dot)?;
 
  Ok(obj)
 }
 
+#[inline]
+fn new_mf_object<'local>(env: &mut JNIEnv<'local>, m: &MagneticField) -> JObject<'local> {
+ match build_mf_object(env, &m) {
+ Ok(obj) => obj,
+ Err(err) => {
+ env.throw_new("java/lang/IllegalArgumentException", err.to_string())
+ .unwrap_or_else(|e| {
+ eprintln!("{e}");
+ });
+
+ JObject::null()
+ }
+ }
+}
+
 #[no_mangle]
 pub unsafe extern "system" fn Java_dev_sanmer_geomag_Geomag_toDecimalYears(
  _env: JNIEnv,
@@ -92,7 +87,7 @@ pub unsafe extern "system" fn Java_dev_sanmer_geomag_Geomag_toDecimalYears(
 
 #[no_mangle]
 pub unsafe extern "system" fn Java_dev_sanmer_geomag_Geomag_wmm<'local>(
- env: JNIEnv<'local>,
+ mut env: JNIEnv<'local>,
  _class: JClass,
  longitude: jdouble,
  latitude: jdouble,
@@ -103,14 +98,14 @@ pub unsafe extern "system" fn Java_dev_sanmer_geomag_Geomag_wmm<'local>(
  let wmm = WMM::new(decimal);
 
  match wmm {
- None => env.throw_illegal_decimal(decimal),
- Some(m) => env.new_mf_object(&m.at_location(&l)),
+ None => throw_illegal_decimal(&mut env, decimal),
+ Some(m) => new_mf_object(&mut env, &m.at_location(&l)),
  }
 }
 
 #[no_mangle]
 pub unsafe extern "system" fn Java_dev_sanmer_geomag_Geomag_igrf<'local>(
- env: JNIEnv<'local>,
+ mut env: JNIEnv<'local>,
  _class: JClass,
  longitude: jdouble,
  latitude: jdouble,
@@ -121,7 +116,7 @@ pub unsafe extern "system" fn Java_dev_sanmer_geomag_Geomag_igrf<'local>(
  let igrf = IGRF::new(decimal);
 
  match igrf {
- None => env.throw_illegal_decimal(decimal),
- Some(m) => env.new_mf_object(&m.at_location(&l)),
+ None => throw_illegal_decimal(&mut env, decimal),
+ Some(m) => new_mf_object(&mut env, &m.at_location(&l)),
  }
 }