Changeset 566 for trunk/kernel/syscalls/sys_thread_create.c

Timestamp:

Oct 4, 2018, 11:50:21 PM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

• trunk/kernel/syscalls/sys_thread_create.c (modified) (16 diffs)

trunk/kernel/syscalls/sys_thread_create.c

@@ -35 +35 @@
 #include <kmem.h>
 #include <process.h>
-#include <spinlock.h>
 #include <dqdt.h>
 #include <rpc.h>
@@ -41 +40 @@
 #include <syscalls.h>
 
-///////////////////////////////////////////////////
-int sys_thread_create(
-  struct thread_s             * new_thread,
-  const struct pthread_attr_s * user_attr,
-  const void                  * start_func,
-  const void                  * start_args )
+/////////////////////////////////////////////////////////
+int sys_thread_create( trdid_t               * trdid_ptr,
+                       struct pthread_attr_s * user_attr,
+                       void                  * start_func,
+                       void                  * start_args )
 {
         pthread_attr_t   kern_attr;        // copy of pthread attributes in kernel space
         thread_t       * parent;           // pointer on thread executing the pthread_create
-        xptr_t           parent_xp;        // extended pointer on created thread
+        xptr_t           parent_xp;        // extended pointer on calling thread
+    cxy_t            child_cxy;        // created child thread cluster identifier
         thread_t       * child_ptr;        // pointer on created child thread
         xptr_t           child_xp;         // extended pointer on created thread
@@ -56 +55 @@
         process_t      * process;          // pointer on local process descriptor
         vseg_t         * vseg;             // required for user space checking
-    cxy_t            target_cxy;       // target cluster identifier
         error_t          error;
 
@@ -69 +67 @@
 tm_start = hal_get_cycles();
 if( DEBUG_SYS_THREAD_CREATE < tm_start )
-printk("\n[DBG] %s : thread %x (cxy %x) enter / process %x / cycle %d\n",
-__FUNCTION__, parent, local_cxy, process->pid, (uint32_t)tm_start );
+printk("\n[DBG] %s : thread %x in process %x enter / cycle %d\n",
+__FUNCTION__, parent->trdid, process->pid, (uint32_t)tm_start );
 #endif
 
     // check trdid buffer in user space
-    error = vmm_get_vseg( process , (intptr_t)new_thread , &vseg );
+    error = vmm_get_vseg( process , (intptr_t)trdid_ptr , &vseg );
 
     if ( error )
@@ -80 +78 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : trdid buffer unmapped %x / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)new_thread, parent->trdid, process->pid );
+printk("\n[ERROR] in %s : thread %x in process %x / trdid buffer %x unmapped %x\n",
+__FUNCTION__, parent->trdid, process->pid, (intptr_t)trdid_ptr );
 vmm_display( process , false );
 #endif
@@ -97 +95 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : user_attr buffer unmapped %x / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)user_attr , parent->trdid , process->pid );
+printk("\n[ERROR] in %s : thread %x in process %x / user_attr buffer unmapped %x\n",
+__FUNCTION__, parent->trdid, process->pid, (intptr_t)user_attr );
 vmm_display( process , false );
 #endif
@@ -115 +113 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : start_func unmapped %x / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)start_func , parent->trdid , process->pid );
+printk("\n[ERROR] in %s : thread %x in process %x / start_func unmapped %x\n",
+__FUNCTION__, parent->trdid, process->pid, (intptr_t)start_func );
 vmm_display( process , false );
 #endif
@@ -132 +130 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : start_args buffer unmapped %x / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)start_args , parent->trdid , process->pid );
+printk("\n[ERROR] in %s : thread %x in process %x / start_args buffer unmapped %x\n",
+__FUNCTION__, parent->trdid, process->pid, (intptr_t)start_args );
 vmm_display( process , false );
 #endif
@@ -141 +139 @@
         }
 
-    // define attributes and target_cxy
+    // define attributes and child_cxy
     if( user_attr != NULL )                      // user defined attributes
     {
-            // check / get target_cxy
+            // check / get child_cxy
             if( kern_attr.attributes & PT_ATTR_CLUSTER_DEFINED )
             {
@@ -151 +149 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : illegal target cluster = %x / thread %x / process %x\n",
-__FUNCTION__ , kern_attr.cxy, parent->trdid, process->pid );
+printk("\n[ERROR] in %s : thread %x in process %x / illegal target cluster %x\n",
+__FUNCTION__, parent->trdid, process->pid, kern_attr.cxy );
 #endif
                             parent->errno = EINVAL;
                             return -1;
             }
-            target_cxy = kern_attr.cxy;
+            child_cxy = kern_attr.cxy;
                 }
         else
         {
-            target_cxy = dqdt_get_cluster_for_process();
+            child_cxy = dqdt_get_cluster_for_process();
         }
         }
@@ -167 +165 @@
         {
         kern_attr.attributes = PT_ATTR_DETACH | PT_ATTR_CLUSTER_DEFINED;
-        target_cxy           = dqdt_get_cluster_for_process();
+        child_cxy           = dqdt_get_cluster_for_process();
         }
 
@@ -173 +171 @@
         // this returns "error", "child_ptr", and "child_xp"
 
-        if( target_cxy == local_cxy )                         // target cluster is local
+        if( child_cxy == local_cxy )                         // target cluster is local
         {
                 // create thread in local cluster
@@ -186 +184 @@
         else                                                 // target cluster is remote
         {
-                rpc_thread_user_create_client( target_cxy,
+                rpc_thread_user_create_client( child_cxy,
                                                process->pid,
                                                start_func,
@@ -202 +200 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot create new thread / thread %x / process %x\n",
+printk("\n[ERROR] in %s : thread %x in process %x cannot create new thread\n",
 __FUNCTION__ , parent->trdid, process->pid );
 #endif
@@ -210 +208 @@
 
         // returns trdid to user space
-        trdid = hal_remote_lw( XPTR( target_cxy , &child_ptr->trdid ) );
-        hal_copy_to_uspace( new_thread , &trdid , sizeof(pthread_t) );
+        trdid = hal_remote_l32( XPTR( child_cxy , &child_ptr->trdid ) );
+        hal_copy_to_uspace( trdid_ptr , &trdid , sizeof(pthread_t) );
 
     // activate new thread
@@ -221 +219 @@
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_THREAD_CREATE < tm_end )
-printk("\n[DBG] %s : thread %x (cxy %x) created thread %x (cxy %x) / process %x / cycle %d\n",
-__FUNCTION__, parent, local_cxy, child_ptr, target_cxy, process->pid, (uint32_t)tm_end );
+printk("\n[DBG] %s : thread %x in process %x created thread %x / cycle %d\n",
+__FUNCTION__, parent->trdid, process->pid, child_ptr->trdid, (uint32_t)tm_end );
 #endif