Changeset 473 for trunk/kernel/kern

Timestamp:

Aug 21, 2018, 6:01:01 PM (6 years ago)

Author:

alain

Message:

Fix several GCC warning related to the -Wextra compilation option.

Location:

trunk/kernel/kern

Files:

• do_interrupt.c (deleted)
• do_interrupt.h (deleted)
• do_syscall.c (modified) (2 diffs)
• rpc.c (modified) (3 diffs)
• thread.c (modified) (3 diffs)
• thread.h (modified) (2 diffs)

trunk/kernel/kern/do_syscall.c

@@ -180 +180 @@
 
     // update user time 
-        thread_user_time_update( this );
+        thread_time_update( this , 1 );  
 
     // check syscall index
@@ -204 +204 @@
 
     // update kernel time
-        thread_kernel_time_update( this );
+        thread_time_update( this , 0 );
 
         return error;

trunk/kernel/kern/rpc.c

@@ -1108 +1108 @@
     rpc_send( cxy , &rpc );
 
+    // get output argument from RPC descriptor
+    *error = (error_t)rpc.args[1];
+
 #if DEBUG_RPC_VFS_INODE_DESTROY
 uint32_t cycle = (uint32_t)hal_get_cycles();
@@ -1248 +1251 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 
-
 ///////////////////////////////////////////////////////
 void rpc_vfs_dentry_destroy_client( cxy_t          cxy,
@@ -1274 +1276 @@
     // register RPC request in remote RPC fifo
     rpc_send( cxy , &rpc );
+
+    // get output argument from RPC descriptor
+    *error = (error_t)rpc.args[1];
 
 #if DEBUG_RPC_VFS_DENTRY_DESTROY

trunk/kernel/kern/thread.c

@@ -528 +528 @@
         if( error )
         {
-            vseg_detach( &child_process->vmm , vseg );
+            vseg_detach( vseg );
             vseg_free( vseg );
             thread_release( child_ptr );
@@ -549 +549 @@
             // increment the forks counter
             remote_spinlock_lock( lock_xp );  
-            hal_remote_atomic_add( XPTR( page_cxy , &page_ptr->forks ) , 1 );
+            hal_remote_atomic_add( forks_xp , 1 );
             remote_spinlock_unlock( lock_xp );  
 
@@ -1130 +1130 @@
 
 
-/////////////////////////////////////////////////
-void thread_user_time_update( thread_t * thread )
-{
-    // TODO
-    // printk("\n[WARNING] function %s not implemented\n", __FUNCTION__ );
-}
-
-///////////////////////////////////////////////////
-void thread_kernel_time_update( thread_t * thread )
-{
-    // TODO
-    // printk("\n[WARNING] function %s not implemented\n", __FUNCTION__ );
+///////////////////////////////////////////
+void thread_time_update( thread_t * thread,
+                         uint32_t   is_user )
+{
+    cycle_t current_cycle;   // current cycle counter value
+    cycle_t last_cycle;      // last cycle counter value
+
+    // get pointer on thread_info structure
+    thread_info_t * info = &thread->info;
+
+    // get last cycle counter value
+    last_cycle = info->last_cycle;
+
+    // get current cycle counter value
+    current_cycle = hal_get_cycles();
+
+    // update thread_info structure
+    info->last_cycle = current_cycle;
+
+    // update time in thread_info
+    if( is_user ) info->usr_cycles += (current_cycle - last_cycle);
+    else          info->sys_cycles += (current_cycle - last_cycle);
 }
 

trunk/kernel/kern/thread.h

@@ -103 +103 @@
         uint32_t              u_err_nr;      /*! TODO ???  [AG]                           */
         uint32_t              m_err_nr;      /*! TODO ???  [AG]                           */
-        uint32_t              tm_tmp;        /*! temp date to compute execution duration  */
-        uint32_t              tm_exec;       /*! TODO ???  [AG]                           */
-        uint32_t              tm_create;     /*! date of the creation                     */
-        uint32_t              tm_born;       /*! date of the thread loading               */
-        uint32_t              tm_dead;       /*! date of the death                        */
-        cycle_t               tm_sleep;      /*! TODO ???  [AG]                           */
-        cycle_t               tm_wait;       /*! TODO ???  [AG]                           */
-        cycle_t               tm_usr;        /*! user execution duration                  */
-        cycle_t               tm_sys;        /*! system execution duration                */
+        cycle_t               last_cycle;    /*! last cycle counter value (date)          */
+        cycle_t               usr_cycles;    /*! user execution duration (cycles)         */
+        cycle_t               sys_cycles;    /*! system execution duration (cycles)       */
 }
 thread_info_t;
@@ -435 +429 @@
 
 /***************************************************************************************
- * This function updates the calling thread user_time counter, and resets the thread
- * cycles counter.
- * TODO This function is not implemented.
+ * This function updates the calling thread user_time or kernel_time counters. 
  ***************************************************************************************
  * @ thread   : local pointer on target thread.
- **************************************************************************************/
-void thread_user_time_update( thread_t * thread );
-
-/**************************************************************************************n
- * This function updates the calling thread kernel_time counter, and resets the thread
- * cycles counter.
- * TODO This function is not implemented.
- ***************************************************************************************
- * @ thread   : local pointer on target thread.
- **************************************************************************************/
-void thread_kernel_time_update( thread_t * thread );
+ * @ is_user  : update user time if non zero / update kernel time if zero
+ **************************************************************************************/
+void thread_time_update( thread_t * thread,
+                         uint32_t   is_user );
 
 /***************************************************************************************