Changeset 618 for trunk

Timestamp:

Jan 17, 2019, 5:59:51 PM (6 years ago)

Author:

alain

Message:

fix a bug in process_destroy() : the vmm_destroy() must be called before
the PID release.

Location:

trunk/kernel/kern

Files:

• process.c (modified) (4 diffs)
• process.h (modified) (1 diff)

trunk/kernel/kern/process.c

@@ -4 +4 @@
  * Authors  Ghassan Almaless (2008,2009,2010,2011,2012)
  *          Mohamed Lamine Karaoui (2015)
- *          Alain Greiner (2016,2017,2018)
+ *          Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -412 +412 @@
 
 // check no more threads
-assert( (process->th_nr == 0) , "process %x in cluster %x contains threads", pid , local_cxy );
+assert( (process->th_nr == 0),
+"process %x in cluster %x contains threads", pid , local_cxy );
 
 #if DEBUG_PROCESS_DESTROY
@@ -422 +423 @@
 #endif
 
+    // Destroy VMM
+    vmm_destroy( process );
+
+#if (DEBUG_PROCESS_DESTROY & 1)
+if( DEBUG_PROCESS_DESTROY < cycle )
+printk("\n[%s] thread[%x,%x] destroyed VMM for process %x in cluster %x\n",
+__FUNCTION__, this->process->pid, this->trdid, pid, local_cxy );
+#endif
+
     // remove process from local_list in local cluster manager
     cluster_process_local_unlink( process );
 
+#if (DEBUG_PROCESS_DESTROY & 1)
+if( DEBUG_PROCESS_DESTROY < cycle )
+printk("\n[%s] thread[%x,%x] removed process %x in cluster %x from local list\n",
+__FUNCTION__, this->process->pid, this->trdid, pid, local_cxy );
+#endif
+
     // remove process from copies_list in owner cluster manager
     cluster_process_copies_unlink( process );
+
+#if (DEBUG_PROCESS_DESTROY & 1)
+if( DEBUG_PROCESS_DESTROY < cycle )
+printk("\n[%s] thread[%x,%x] removed process %x in cluster %x from copies list\n",
+__FUNCTION__, this->process->pid, this->trdid, pid, local_cxy );
+#endif
 
     // remove process from children_list 
@@ -447 +469 @@
         remote_queuelock_release( children_lock_xp );
 
+#if (DEBUG_PROCESS_DESTROY & 1)
+if( DEBUG_PROCESS_DESTROY < cycle )
+printk("\n[%s] thread[%x,%x] removed process %x in cluster %x from children list\n",
+__FUNCTION__, this->process->pid, this->trdid, pid, local_cxy );
+#endif
+
         // release the process PID to cluster manager
         cluster_pid_release( pid );
-    }
-
-    // FIXME close all open files and synchronize dirty [AG]
-
-    // decrease refcount for bin file, root file and cwd file
-        if( process->vfs_bin_xp  != XPTR_NULL ) vfs_file_count_down( process->vfs_bin_xp );
-        if( process->vfs_root_xp != XPTR_NULL ) vfs_file_count_down( process->vfs_root_xp );
-        if( process->cwd_xp      != XPTR_NULL ) vfs_file_count_down( process->cwd_xp );
-
-    // Destroy VMM
-    vmm_destroy( process );
+
+#if (DEBUG_PROCESS_DESTROY & 1)
+if( DEBUG_PROCESS_DESTROY < cycle )
+printk("\n[%s] thread[%x,%x] released process PID %x to pmgr in cluster %x\n",
+__FUNCTION__, this->process->pid, this->trdid, pid, local_cxy );
+#endif
+
+    }
+
+    // FIXME decrement the refcount on file pointer by vfs_bin_xp [AG]
+    // FIXME close all open files [AG]
+    // FIXME synchronize dirty files [AG]
 
     // release memory allocated to process descriptor

trunk/kernel/kern/process.h

@@ -115 +115 @@
  *    defined in the reference cluster, and are undefined in other clusters.
  * 6) The <local_list>, <copies_list>, <th_tbl>, <th_nr>, <u_th_lock> or <k_th_lock> fields
- *    are specific n each cluster, and are defined in all process descriptors copies.
+ *    are specific in each cluster, and are defined in all process descriptors copies.
  * 7) The termination <flags> and <exit_status> are only defined in the reference cluster.
  *    (The term_state format is defined in the shared_syscalls.h file ).