Changeset 625 for trunk/hal/tsar_mips32/drivers

Timestamp:

Apr 10, 2019, 10:09:39 AM (6 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

• trunk/hal/tsar_mips32/drivers/soclib_tty.c (modified) (3 diffs)

trunk/hal/tsar_mips32/drivers/soclib_tty.c

@@ -346 +346 @@
                 owner_pid = hal_remote_l32( XPTR( owner_cxy , &owner_ptr->pid ) );
 
-                // block TXT owner process only if it is not the INIT process 
-                if( owner_pid != 1 )
-                {
-                    // get parent process descriptor pointers
-                    parent_xp  = hal_remote_l64( XPTR( owner_cxy , &owner_ptr->parent_xp ) );
-                    parent_cxy = GET_CXY( parent_xp );
-                    parent_ptr = GET_PTR( parent_xp );
-
-                    // get pointers on the parent process main thread
-                    parent_main_ptr = hal_remote_lpt(XPTR(parent_cxy,&parent_ptr->th_tbl[0])); 
-                    parent_main_xp  = XPTR( parent_cxy , parent_main_ptr );
-
-                    // transfer TXT ownership 
-                    process_txt_transfer_ownership( owner_xp );
-
-                    // block all threads in all clusters, but the main thread
-                    process_sigaction( owner_pid , BLOCK_ALL_THREADS );
-
-                    // block the main thread
-                    xptr_t main_xp = XPTR( owner_cxy , &owner_ptr->th_tbl[0] );
-                    thread_block( main_xp , THREAD_BLOCKED_GLOBAL );
-
-                    // atomically update owner process termination state
-                    hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) ,
-                                          PROCESS_TERM_STOP );
-
-                    // unblock the parent process main thread 
-                    thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
-
-                    return;
-                }
+// TXT owner cannot be the INIT process 
+assert( (owner_pid != 1) , "INIT process cannot be the TXT owner" );
+
+                // get parent process descriptor pointers
+                parent_xp  = hal_remote_l64( XPTR( owner_cxy , &owner_ptr->parent_xp ) );
+                parent_cxy = GET_CXY( parent_xp );
+                parent_ptr = GET_PTR( parent_xp );
+
+                // get pointers on the parent process main thread
+                parent_main_ptr = hal_remote_lpt(XPTR(parent_cxy,&parent_ptr->th_tbl[0])); 
+                parent_main_xp  = XPTR( parent_cxy , parent_main_ptr );
+
+                // transfer TXT ownership 
+                process_txt_transfer_ownership( owner_xp );
+
+                // mark for block all threads in all clusters, but the main
+                process_sigaction( owner_pid , BLOCK_ALL_THREADS );
+
+                // block the main thread
+                xptr_t main_xp = XPTR( owner_cxy , &owner_ptr->th_tbl[0] );
+                thread_block( main_xp , THREAD_BLOCKED_GLOBAL );
+
+                // atomically update owner process termination state
+                hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) ,
+                                      PROCESS_TERM_STOP );
+
+                // unblock the parent process main thread 
+                thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
+
+                return;
             }
 
@@ -390 +389 @@
                 owner_xp  = process_txt_get_owner( channel );
 
-                // check process exist
-                assert( (owner_xp != XPTR_NULL) ,
-                "TXT owner process not found\n" );
+// check process exist
+assert( (owner_xp != XPTR_NULL) , "TXT owner process not found\n" );
 
                 // get relevant infos on TXT owner process
@@ -399 +397 @@
                 owner_pid = hal_remote_l32( XPTR( owner_cxy , &owner_ptr->pid ) );
 
-                // kill TXT owner process only if it is not the INIT process
-                if( owner_pid != 1 )
-                {
-                    // get parent process descriptor pointers
-                    parent_xp  = hal_remote_l64( XPTR( owner_cxy , &owner_ptr->parent_xp ) );
-                    parent_cxy = GET_CXY( parent_xp );
-                    parent_ptr = GET_PTR( parent_xp );
-
-                    // get pointers on the parent process main thread
-                    parent_main_ptr = hal_remote_lpt(XPTR(parent_cxy,&parent_ptr->th_tbl[0])); 
-                    parent_main_xp  = XPTR( parent_cxy , parent_main_ptr );
-
-                    // remove process from TXT list
-                    process_txt_detach( owner_xp );
-
-                    // mark for delete all thread in all clusters, but the main
-                    process_sigaction( owner_pid , DELETE_ALL_THREADS );
+// TXT owner cannot be the INIT process 
+assert( (owner_pid != 1) , "INIT process cannot be the TXT owner" );
+
+#if DEBUG_HAL_TXT_RX
+if( DEBUG_HAL_TXT_RX < rx_cycle )
+printk("\n[%s] TXT%d owner is process %x\n",
+__FUNCTION__, channel, owner_pid );
+#endif
+                // get parent process descriptor pointers
+                parent_xp  = hal_remote_l64( XPTR( owner_cxy , &owner_ptr->parent_xp ) );
+                parent_cxy = GET_CXY( parent_xp );
+                parent_ptr = GET_PTR( parent_xp );
+
+                // get pointers on the parent process main thread
+                parent_main_ptr = hal_remote_lpt(XPTR(parent_cxy,&parent_ptr->th_tbl[0])); 
+                parent_main_xp  = XPTR( parent_cxy , parent_main_ptr );
+
+                // transfer TXT ownership 
+                process_txt_transfer_ownership( owner_xp );
+
+                // remove process from TXT list
+                // process_txt_detach( owner_xp );
+
+                // mark for delete all thread in all clusters, but the main
+                process_sigaction( owner_pid , DELETE_ALL_THREADS );
                 
-                    // block main thread
-                    xptr_t main_xp = XPTR( owner_cxy , &owner_ptr->th_tbl[0] );
-                    thread_block( main_xp , THREAD_BLOCKED_GLOBAL );
-
-                    // atomically update owner process termination state
-                    hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) ,
-                                          PROCESS_TERM_KILL );
-
-                    // unblock the parent process main thread 
-                    thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
-
-                    return;
-                }
+#if DEBUG_HAL_TXT_RX
+if( DEBUG_HAL_TXT_RX < rx_cycle )
+printk("\n[%s] marked for delete all threads of process but main\n",
+__FUNCTION__, owner_pid );
+#endif
+                // block main thread
+                xptr_t main_xp = XPTR( owner_cxy , &owner_ptr->th_tbl[0] );
+                thread_block( main_xp , THREAD_BLOCKED_GLOBAL );
+
+#if DEBUG_HAL_TXT_RX
+if( DEBUG_HAL_TXT_RX < rx_cycle )
+printk("\n[%s] blocked process %x main thread\n",
+__FUNCTION__, owner_pid );
+#endif
+
+                // atomically update owner process termination state
+                hal_remote_atomic_or( XPTR( owner_cxy , &owner_ptr->term_state ) ,
+                                      PROCESS_TERM_KILL );
+
+                // unblock the parent process main thread 
+                thread_unblock( parent_main_xp , THREAD_BLOCKED_WAIT );
+
+#if DEBUG_HAL_TXT_RX
+if( DEBUG_HAL_TXT_RX < rx_cycle )
+printk("\n[%s] unblocked parent process %x main thread\n",
+__FUNCTION__, hal_remote_l32( XPTR( parent_cxy , &parent_ptr->pid) ) );
+#endif
+                return;
             }