Changeset 188 for trunk/kernel/kern/rpc.c

Timestamp:

Jul 12, 2017, 8:12:41 PM (7 years ago)

Author:

alain

Message:

Redefine the PIC device API.

File:

• trunk/kernel/kern/rpc.c (modified) (10 diffs)

trunk/kernel/kern/rpc.c

@@ -537 +537 @@
                                   uint32_t       fs_type,    // in
                                   uint32_t       inode_type, // in
+                                  void         * extend,     // in
                                   uint32_t       attr,       // in
                                   uint32_t       rights,     // in
@@ -560 +561 @@
     rpc.args[1] = (uint64_t)fs_type;
     rpc.args[2] = (uint64_t)inode_type;
-    rpc.args[3] = (uint64_t)attr;
-    rpc.args[4] = (uint64_t)rights;
-    rpc.args[5] = (uint64_t)uid;
-    rpc.args[6] = (uint64_t)gid;
+    rpc.args[3] = (uint64_t)(intptr_t)extend;
+    rpc.args[4] = (uint64_t)attr;
+    rpc.args[5] = (uint64_t)rights;
+    rpc.args[6] = (uint64_t)uid;
+    rpc.args[7] = (uint64_t)gid;
 
     // register RPC request in remote RPC fifo (blocking function)
@@ -569 +571 @@
 
     // get output values from RPC descriptor
-    *inode_xp = (xptr_t)rpc.args[7];
-    *error    = (error_t)rpc.args[8];
+    *inode_xp = (xptr_t)rpc.args[8];
+    *error    = (error_t)rpc.args[9];
 }
 
@@ -579 +581 @@
     uint32_t         fs_type;
     uint32_t         inode_type;
+    void           * extend;
     uint32_t         attr;
     uint32_t         rights;
@@ -591 +594 @@
 
     // get input arguments from client rpc descriptor
-    dentry_xp  = (xptr_t)  hal_remote_lwd( XPTR( client_cxy , &desc->args[0] ) );
-    fs_type    = (uint32_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[1] ) );
-    inode_type = (uint32_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[2] ) );
-    attr       = (uint32_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[3] ) );
-    rights     = (uint32_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
-    uid        = (uid_t)   hal_remote_lwd( XPTR( client_cxy , &desc->args[5] ) );
-    gid        = (gid_t)   hal_remote_lwd( XPTR( client_cxy , &desc->args[6] ) );
+    dentry_xp  = (xptr_t)          hal_remote_lwd( XPTR( client_cxy , &desc->args[0] ) );
+    fs_type    = (uint32_t)        hal_remote_lwd( XPTR( client_cxy , &desc->args[1] ) );
+    inode_type = (uint32_t)        hal_remote_lwd( XPTR( client_cxy , &desc->args[2] ) );
+    extend     = (void *)(intptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[3] ) );
+    attr       = (uint32_t)        hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
+    rights     = (uint32_t)        hal_remote_lwd( XPTR( client_cxy , &desc->args[5] ) );
+    uid        = (uid_t)           hal_remote_lwd( XPTR( client_cxy , &desc->args[6] ) );
+    gid        = (gid_t)           hal_remote_lwd( XPTR( client_cxy , &desc->args[7] ) );
 
     // call local kernel function
@@ -603 +607 @@
                               fs_type,
                               inode_type,
+                              extend,
                               attr,
                               rights,
@@ -610 +615 @@
 
     // set output arguments
-    hal_remote_swd( XPTR( client_cxy , &desc->args[7] ) , (uint64_t)inode_xp );
-    hal_remote_swd( XPTR( client_cxy , &desc->args[8] ) , (uint64_t)error );
+    hal_remote_swd( XPTR( client_cxy , &desc->args[8] ) , (uint64_t)inode_xp );
+    hal_remote_swd( XPTR( client_cxy , &desc->args[9] ) , (uint64_t)error );
 }
 
@@ -1290 +1295 @@
                 if( cores == 0 ) // no core in kernel mode in server
                 {
-                    dev_icu_send_ipi( server_cxy , client_lid );
+                    dev_pic_send_ipi( server_cxy , client_lid );
 
                     rpc_dmsg("\n[INFO] %s : core %d in cluster %x send IPI to core %d in cluster %x\n",
@@ -1454 +1459 @@
 
         // update core descriptor counter  
-            core->rpc_threads++;
+            hal_atomic_add( &core->rpc_threads , 1 );
     }
 
@@ -1549 +1554 @@
 
             // update core descriptor counter
-                        this->core->rpc_threads--;
+                hal_atomic_add( &this->core->rpc_threads , -1 );
 
             // suicide