Changeset 683 for trunk/kernel/libk/remote_buf.c

Timestamp:

Jan 13, 2021, 12:36:17 AM (4 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

• trunk/kernel/libk/remote_buf.c (modified) (8 diffs)

trunk/kernel/libk/remote_buf.c

@@ -34 +34 @@
 remote_buf_t * remote_buf_alloc( cxy_t  cxy )
 {
-    kmem_req_t req;
-
-    req.type  = KMEM_KCM;
-    req.order = bits_log2( sizeof(remote_buf_t) );
-    req.flags = AF_ZERO;
-    return kmem_remote_alloc( cxy , &req );
+    return kmem_remote_alloc( cxy,
+                              bits_log2(sizeof(remote_buf_t)),
+                              AF_ZERO );
 }
 
@@ -50 +47 @@
 assert( __FUNCTION__ , (order < 32) , "order cannot be larger than 31" );
 
-    kmem_req_t     req;
     uint8_t      * data;
 
@@ -57 +53 @@
 
     // allocate the data buffer
-    if( order >= CONFIG_PPM_PAGE_SHIFT )  // use KMEM_PPM
-    {
-        req.type  = KMEM_PPM;
-        req.order = order - CONFIG_PPM_PAGE_SHIFT;
-        req.flags = AF_NONE;
-        data = kmem_remote_alloc( buf_cxy , &req );
-
-        if( data == NULL )  return -1;
-    }
-    else                                     // use KMEM_KCM
-    {
-        req.type  = KMEM_KCM;
-        req.order = order;
-        req.flags = AF_NONE;
-        data = kmem_remote_alloc( buf_cxy , &req );
-
-        if( data == NULL )  return -1;
-    }
+    data = kmem_remote_alloc( buf_cxy , order , AF_NONE );
+
+    if( data == NULL )  return -1;
 
     // initialize buffer descriptor
@@ -90 +71 @@
 void remote_buf_release_data( xptr_t  buf_xp )
 {
-    kmem_req_t     req;
 
 assert( __FUNCTION__ , (buf_xp != XPTR_NULL) , "buf_xp cannot be NULL" );
@@ -102 +82 @@
 
     // release memory allocated for data buffer  if required
-    if( data_ptr != NULL )
-    {
-        if( order >= CONFIG_PPM_PAGE_SHIFT )          // use KMEM_PPM
-        {
-            req.type  = KMEM_PPM;
-            req.ptr   = data_ptr;
-            kmem_remote_free( buf_cxy , &req );
-        }
-        else                                          // use KMEM_KCM
-        {
-            req.type  = KMEM_KCM;
-            req.ptr   = data_ptr;
-            kmem_remote_free( buf_cxy , &req );
-        }
-    }
+    if( data_ptr != NULL )  kmem_remote_free( buf_cxy , data_ptr , order );
+ 
 }  // end remote_buf_release_data()
 
@@ -125 +92 @@
 assert( __FUNCTION__ , (buf_xp != XPTR_NULL) , "buf_xp cannot be NULL" );
 
-    kmem_req_t   req;
-
     remote_buf_t * buf_ptr = GET_PTR( buf_xp );
     cxy_t          buf_cxy = GET_CXY( buf_xp );
@@ -134 +99 @@
 
     // release remote_buf descriptor
-    req.type = KMEM_KCM;
-    req.ptr  = buf_ptr;
-    kmem_remote_free( buf_cxy , &req );
+    kmem_remote_free( buf_cxy , buf_ptr , bits_log2(sizeof(remote_buf_t)) );
 
 }  // end remote_buf_destroy()
@@ -404 +367 @@
 }  // end remote_buf_status()
 
-
+///////////////////////////////////////////////
+void remote_buf_display( const char * func_str,
+                         xptr_t       buf_xp,
+                         uint32_t     nbytes,
+                         uint32_t     offset )
+{
+    if( nbytes > 256 )
+    {
+        printk("\n[WARNING] in %s : no more than 256 bytes\n", __FUNCTION__ );
+        nbytes = 256;
+    }
+
+    uint8_t        string[128];          // for header
+    uint8_t        local_data[256];      // local data buffer
+
+    cxy_t          cxy = GET_CXY( buf_xp ); 
+    remote_buf_t * ptr = GET_PTR( buf_xp );
+
+    uint32_t   order = hal_remote_l32( XPTR( cxy , &ptr->order ));
+    uint32_t   rid   = hal_remote_l32( XPTR( cxy , &ptr->rid ));
+    uint32_t   wid   = hal_remote_l32( XPTR( cxy , &ptr->wid ));
+    uint32_t   sts   = hal_remote_l32( XPTR( cxy , &ptr->sts ));
+    uint8_t  * data  = hal_remote_lpt( XPTR( cxy , &ptr->data ));
+
+    // make a local copy of data buffer
+    hal_remote_memcpy( XPTR( local_cxy , local_data ),
+                       XPTR( cxy , data + offset ), 
+                       nbytes );
+
+    // build header
+    snprintk( (char*)string , 128 ,
+    "in %s remote buffer [%x,%x] : size %d / rid %d / wid %d / sts %d ",
+    func_str , cxy , ptr , 1<<order , rid , wid , sts );
+
+    // display buffer on TXT0
+    putb( (char*)string , local_data , nbytes );
+
+}  // end remote_buf_display()