fix: capi call args decode (#1519)

Signed-off-by: peefy <xpf6677@163.com>

kclvm/api/src/capi_test.rs

@@ -1,5 +1,5 @@
-use crate::gpyrpc::*;
 use crate::service::capi::*;
+use crate::{call, gpyrpc::*};
 use once_cell::sync::Lazy;
 use prost::Message;
 use serde::de::DeserializeOwned;
@@ -279,7 +279,6 @@ where
     let src_ptr = kclvm_service_call_with_length(
         serv,
         call.as_ptr(),
-        svc_name.len(),
         args.as_ptr(),
         args_vec.len(),
         &mut result_len,
@@ -328,13 +327,7 @@ where
         let args_vec = serde_json::from_str::<A>(&input).unwrap().encode_to_vec();
         let args = unsafe { CString::from_vec_unchecked(args_vec.clone()) };
         let call = CString::new(svc_name).unwrap();
-        kclvm_service_call(
-            serv,
-            call.as_ptr(),
-            svc_name.len(),
-            args.as_ptr(),
-            args_vec.len(),
-        )
+        kclvm_service_call(serv, call.as_ptr(), args.as_ptr(), args_vec.len())
     });
     std::panic::set_hook(prev_hook);
     match result {
@@ -359,3 +352,23 @@ where
         }
     }
 }
+
+#[test]
+fn test_call_exec_program() {
+    let name = b"KclvmService.ExecProgram";
+    let args = b"\x12\x1a./src/testdata/test_call.k";
+    let result = call(name, args).unwrap();
+    assert!(
+        !result.starts_with(b"ERROR"),
+        "{}",
+        String::from_utf8(result).unwrap()
+    );
+}
+
+#[test]
+fn test_call_get_version() {
+    let name = b"KclvmService.GetVersion";
+    let args = b"";
+    let result = call(name, args).unwrap();
+    assert!(!result.starts_with(b"ERROR"))
+}

kclvm/api/src/lib.rs

@@ -37,7 +37,7 @@ pub use crate::gpyrpc::*;
 use crate::service::capi::{kclvm_service_call_with_length, kclvm_service_new};
 use crate::service::service_impl::KclvmServiceImpl;
 use anyhow::Result;
-use std::ffi::c_char;
+use std::ffi::{c_char, CString};
 
 pub type API = KclvmServiceImpl;
 
@@ -56,12 +56,14 @@ pub fn call_with_plugin_agent<'a>(
     let mut result_len: usize = 0;
     let result_ptr = {
         let serv = kclvm_service_new(plugin_agent);
+        let args_len = args.len();
+        let name = unsafe { CString::from_vec_unchecked(name.to_vec()) };
+        let args = unsafe { CString::from_vec_unchecked(args.to_vec()) };
         kclvm_service_call_with_length(
             serv,
-            name.as_ptr() as *const c_char,
-            name.len(),
+            name.as_ptr(),
             args.as_ptr() as *const c_char,
-            name.len(),
+            args_len,
             &mut result_len,
         )
     };

kclvm/api/src/service/capi.rs

@@ -57,7 +57,8 @@ macro_rules! call {
         unsafe {
             let serv_ref = &mut *$serv;
             let args = c_char_to_vec($args, $args_len);
-            let args = $arg_name::decode(args.as_slice()).unwrap();
+            let args = args.as_slice();
+            let args = $arg_name::decode(args).unwrap();
             let res = serv_ref.$serv_name(&args);
             let result_byte = match res {
                 Ok(res) => res.encode_to_vec(),
@@ -92,12 +93,11 @@ macro_rules! call {
 pub extern "C" fn kclvm_service_call(
     serv: *mut kclvm_service,
     name: *const c_char,
-    name_len: usize,
     args: *const c_char,
     args_len: usize,
 ) -> *const c_char {
     let mut _result_len = 0;
-    kclvm_service_call_with_length(serv, name, name_len, args, args_len, &mut _result_len)
+    kclvm_service_call_with_length(serv, name, args, args_len, &mut _result_len)
 }
 
 /// Call kclvm service by C API. **Note that it is not thread safe.**
@@ -123,14 +123,13 @@ pub extern "C" fn kclvm_service_call(
 pub extern "C" fn kclvm_service_call_with_length(
     serv: *mut kclvm_service,
     name: *const c_char,
-    name_len: usize,
     args: *const c_char,
     args_len: usize,
     result_len: *mut usize,
 ) -> *const c_char {
     let result = std::panic::catch_unwind(|| {
-        let name = String::from_utf8(c_char_to_vec(name, name_len)).unwrap();
-        let call = kclvm_get_service_fn_ptr_by_name(&name);
+        let name = unsafe { std::ffi::CStr::from_ptr(name) }.to_str().unwrap();
+        let call = kclvm_get_service_fn_ptr_by_name(name);
         if call == 0 {
             panic!("null fn ptr");
         }

kclvm/api/src/testdata/test_call.k

@@ -0,0 +1,4 @@
+schema Config:
+    name?: str
+
+config = Config {}