Changeset 441 for trunk/kernel/syscalls

Timestamp:

May 9, 2018, 3:13:56 PM (7 years ago)

Author:

alain

Message:

Fix a bug in rpc_vmm_get_pte_client() function (bad RPC index).

Location:

trunk/kernel/syscalls

Files:

• sys_exec.c (modified) (6 diffs)
• sys_exit.c (modified) (2 diffs)
• sys_read.c (modified) (3 diffs)
• sys_write.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_exec.c

@@ -150 +150 @@
 // Implementation note:
 // This function must be called by the main thread (thread 0 in owner cluster).
-// IT build an exec_info_t structure containing all informations
+// It build an exec_info_t structure containing all informations
 // required to initialize the new process descriptor and the associated thread.
 // It includes the process main() arguments, the environment variables, 
@@ -208 +208 @@
 tm_start = hal_get_cycles();
 if( DEBUG_SYS_EXEC < tm_start )
-printk("\n[DBG] %s : thread %x enter / process %x / path %s / cycle = %d\n",
+printk("\n[DBG] %s : thread %x in process %x enter for path <%s> / cycle = %d\n",
 __FUNCTION__, this, pid, exec_info.path, (uint32_t)tm_start );
 #endif
@@ -219 +219 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot access args\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : thread %x in process %x cannot access args\n",
+__FUNCTION__ , this, pid );
 #endif
             this->errno = EINVAL;
@@ -233 +234 @@
 
 #if DEBUG_SYCALLS_ERROR
-printk("\n[ERROR] in %s : cannot access envs\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : thread %x in process %x cannot access envs\n",
+__FUNCTION__ , this, pid );
 #endif
             this->errno = EINVAL;
@@ -247 +249 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot create process %x in cluster %x\n",
-__FUNCTION__, pid, CXY_FROM_PID(pid) );
+printk("\n[ERROR] in %s : thread %x in process %x cannot create process for <%s>\n",
+__FUNCTION__, this, pid, exec_info.path );
 #endif
         this->errno = error;
@@ -257 +259 @@
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_EXEC < tm_end )
-printk("\n[DBG] %s : thread %x exit / process %x / cost = %d / cycle %d\n",
+printk("\n[DBG] %s : thread %x in process %x exit / cost = %d / cycle %d\n",
 __FUNCTION__, this, pid, (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
 #endif
 
-    // deschedule <=> old thread suicide because the BLOCKED_GLOBAL
-    // and the FLAG_REQ_DELETE have been set by process_make_exec()
+    // In case of success, this calling thread deschedules, causing suicide,
+    // because a new process descriptor and its associated main thread 
+    // have been created by the process_make_exec() function, and the
+    // BLOCKED_GLOBAL & FLAG_REQ_DELETE bits have been set for the calling thread. 
     sched_yield( "old process suicide in sys_exec()" );
 
-    assert( false , __FUNCTION__ , "This code should not be executed\n" );
-
     return 0;  
 

trunk/kernel/syscalls/sys_exit.c

@@ -51 +51 @@
 #endif
 
-    // get owner process descriptor pointers an cluster
+    // get owner process descriptor pointers and cluster
     xptr_t      owner_xp  = cluster_get_owner_process_from_pid( pid );
     cxy_t       owner_cxy = GET_CXY( owner_xp );
@@ -128 +128 @@
     sched_yield( "process exit" );
 
-    // this code should never be executed
-    assert( false , __FUNCTION__ , "this code should not be executed...\n" );
         return 0;
 

trunk/kernel/syscalls/sys_read.c

@@ -223 +223 @@
 if( DEBUG_SYS_READ < tm_end )
 printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n"
-"nbytes = %d / first byte = %c / file_id = %d / cost = %d\n",
+"nbytes = %d / file_id = %d / cost = %d\n",
 __FUNCTION__ , this, process->pid,
-(uint32_t)tm_start , nbytes , *((char *)(intptr_t)paddr) , file_id ,
-(uint32_t)(tm_end - tm_start) );
+(uint32_t)tm_start , nbytes , file_id , (uint32_t)(tm_end - tm_start) );
 #endif
 
@@ -232 +231 @@
 exit_sys_read = (uint32_t)tm_end;
 
-printk("\n@@@@@@@@@@@@ timing to read character %c\n"
+printk("\n@@@@@@@@@@@@ timing to read character\n"
 " - enter_sys_read          = %d / delta %d\n"
 " - enter_devfs_read        = %d / delta %d\n"
@@ -247 +246 @@
 " - exit_devfs_read         = %d / delta %d\n"
 " - exit_sys_read           = %d / delta %d\n",
-*((char *)(intptr_t)paddr) ,
 enter_sys_read          , 0 ,
 enter_devfs_read        , enter_devfs_read        - enter_sys_read          ,

trunk/kernel/syscalls/sys_write.c

@@ -184 +184 @@
 if( DEBUG_SYS_WRITE < tm_end )
 printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n"
-"nbytes = %d / first byte = %c / file_id = %d / cost = %d\n",
+"nbytes = %d / file_id = %d / cost = %d\n",
 __FUNCTION__, this, process->pid, (uint32_t)tm_start,
-nbytes, *((char *)(intptr_t)paddr) , file_id , (uint32_t)(tm_end - tm_start) );
+nbytes, file_id , (uint32_t)(tm_end - tm_start) );
 #endif
  
@@ -192 +192 @@
 exit_sys_write = (uint32_t)tm_end;
 
-printk("\n@@@@@@@@@@@@ timing to write string %c\n"
+printk("\n@@@@@@@@@@@@ timing to write\n"
 " - enter_sys_write          = %d / delta %d\n"
 " - enter_devfs_write        = %d / delta %d\n"
@@ -207 +207 @@
 " - exit_devfs_write         = %d / delta %d\n"
 " - exit_sys_write           = %d / delta %d\n",
-*((char *)(intptr_t)paddr) ,
 enter_sys_write          , 0 ,
 enter_devfs_write        , enter_devfs_write        - enter_sys_write          ,