Queue optimizations (#17)

Author: RainerZ

README.md

@@ -46,7 +46,6 @@ fn main() {
         .allowlist_function("XcpPrint")
         .allowlist_function("XcpSetEpk")
         .allowlist_function("XcpSendTerminateSessionEvent")
-        //
         //.allowlist_function("ApplXcpGetAddr")
         .allowlist_function("ApplXcpSetA2lName")
         .allowlist_function("ApplXcpRegisterCallbacks")

build.rs

@@ -440,7 +440,7 @@ impl Xcp {
             // Initialize the XCP server and ETH transport layer in xcplib
             unsafe {
                 // @@@@ UNSAFE - C library call
-                if !xcplib::XcpEthServerInit(&ipv4_addr.octets() as *const u8, port, tl == XcpTransportLayer::Tcp, std::ptr::null_mut(), queue_size) {
+                if !xcplib::XcpEthServerInit(&ipv4_addr.octets() as *const u8, port, tl == XcpTransportLayer::Tcp, queue_size) {
                     return Err(XcpError::XcpLib("Error: XcpEthServerInit() failed"));
                 }
             }

src/xcp/mod.rs

@@ -27,6 +27,21 @@ unsafe extern "C" {
 unsafe extern "C" {
     pub fn ApplXcpGetClock64() -> u64;
 }
+unsafe extern "C" {
+    pub fn XcpEthTlGetInfo(isTCP: *mut bool, mac: *mut u8, addr: *mut u8, port: *mut u16);
+}
+unsafe extern "C" {
+    #[doc = " Initialize the XCP on Ethernet server instance.\n @pre User has called XcpInit.\n @param address Address to bind to.\n @param port Port to bind to.\n @param use_tcp Use TCP if true, otherwise UDP.\n @param measurement_queue Optional external memory to place the measurement queue.\n Pass NULL if server should allocate it.\n @param measurement_queue_size Measurement queue size in bytes. Includes the bytes occupied by the queue header.\n @return True on success, otherwise false."]
+    pub fn XcpEthServerInit(address: *const u8, port: u16, use_tcp: bool, measurement_queue_size: u32) -> bool;
+}
+unsafe extern "C" {
+    #[doc = " Shutdown the XCP on Ethernet server instance."]
+    pub fn XcpEthServerShutdown() -> bool;
+}
+unsafe extern "C" {
+    #[doc = " Get the XCP on Ethernet server instance status.\n @return True if the server is running, otherwise false."]
+    pub fn XcpEthServerStatus() -> bool;
+}
 unsafe extern "C" {
     pub fn ApplXcpRegisterCallbacks(
         cb_connect: ::std::option::Option<unsafe extern "C" fn() -> bool>,
@@ -46,18 +61,3 @@ unsafe extern "C" {
 unsafe extern "C" {
     pub fn ApplXcpSetA2lName(name: *const ::std::os::raw::c_char);
 }
-unsafe extern "C" {
-    #[doc = " Initialize the XCP on Ethernet server instance.\n @pre User has called XcpInit.\n @param address Address to bind to.\n @param port Port to bind to.\n @param use_tcp Use TCP if true, otherwise UDP.\n @param measurement_queue Optional external memory to place the measurement queue.\n Pass NULL if server should allocate it.\n @param measurement_queue_size Measurement queue size in bytes. Includes the bytes occupied by the queue header.\n @return True on success, otherwise false."]
-    pub fn XcpEthServerInit(address: *const u8, port: u16, use_tcp: bool, measurement_queue: *mut ::std::os::raw::c_void, measurement_queue_size: u32) -> bool;
-}
-unsafe extern "C" {
-    #[doc = " Shutdown the XCP on Ethernet server instance."]
-    pub fn XcpEthServerShutdown() -> bool;
-}
-unsafe extern "C" {
-    #[doc = " Get the XCP on Ethernet server instance status.\n @return True if the server is running, otherwise false."]
-    pub fn XcpEthServerStatus() -> bool;
-}
-unsafe extern "C" {
-    pub fn XcpEthTlGetInfo(isTCP: *mut bool, mac: *mut u8, addr: *mut u8, port: *mut u16);
-}

src/xcp/xcplib.rs

@@ -173,7 +173,6 @@ fn task(cal_seg: CalSeg<CalPage1>) {
     }
 
     debug!("Task terminated, loop counter = {}, {} changes observed", loop_counter, changes);
-    xcp_println!("Task terminated, loop counter = {}, {} changes observed", loop_counter, changes);
     Xcp::disconnect_client(Xcp::get());
 }
 

tests/test_single_thread.rs

@@ -54,7 +54,7 @@ target_compile_options(xcplib
         -Wconversion
         -Werror
         -pedantic
-        -Wshadow
+#        -Wshadow
 )
 
 # Example hello_xcp