Changeset 566 for trunk/kernel/syscalls/sys_mutex.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_mutex.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_mutex.c

@@ -32 +32 @@
 
 
+#if DEBUG_SYS_MUTEX
+////////////////////////////////////////////////////
+static char * sys_mutex_op_str( uint32_t operation )
+{
+        if     ( operation == MUTEX_INIT     ) return "INIT";
+        else if( operation == MUTEX_LOCK     ) return "LOCK";
+        else if( operation == MUTEX_UNLOCK   ) return "UNLOCK";
+        else if( operation == MUTEX_TRYLOCK  ) return "TRYLOCK";
+        else if( operation == MUTEX_DESTROY  ) return "DESTROY";
+        else                                   return "undefined";
+}
+#endif
+
 /////////////////////////////////
 int sys_mutex( void     * vaddr,
@@ -38 +51 @@
 {
         error_t     error;
-    vseg_t    * vseg;
+    vseg_t    * vseg;      // for vaddr check
 
     thread_t  * this    = CURRENT_THREAD;
     process_t * process = this->process;
+
+#if DEBUG_SYS_MUTEX
+uint64_t    tm_start;
+uint64_t    tm_end;
+tm_start = hal_get_cycles();
+if( DEBUG_SYS_MUTEX < tm_start )
+printk("\n[DBG] %s : thread %x in process %x enter for %s / cycle %d\n",
+__FUNCTION__, this->trdid, process->pid, sys_mutex_op_str( operation ), (uint32_t)tm_start );
+#endif
 
     // check vaddr in user vspace
@@ -148 +170 @@
             else                          // success
             {
-                remote_mutex_unlock( mutex_xp ); 
+                error = remote_mutex_unlock( mutex_xp ); 
+
+                if( error )
+                {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : mutex %x not owned in UNLOCK / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)vaddr , this->trdid , process->pid );
+#endif
+                    this->errno = EINVAL;
+                    return -1;
+                }
+            }
+            break;
+        }
+        ///////////////////
+            case MUTEX_TRYLOCK:
+        {
+            xptr_t mutex_xp = remote_mutex_from_ident( (intptr_t)vaddr );
+
+            if( mutex_xp == XPTR_NULL )     // user error
+            {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : mutex %x not registered / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)vaddr , this->trdid , process->pid );
+#endif
+                this->errno = EINVAL;
+                return -1;
+            }
+            else                          // success
+            {
+                error = remote_mutex_trylock( mutex_xp ); 
+
+                if( error ) // non fatal : mutex already taken
+                {
+                    this->errno = EBUSY;
+                    return -1; 
+                }
             }
             break;
         }
         ////////
-        default: {
+        default: 
+        {
             assert ( false, "illegal operation type <%x>", operation );
         }
         }
 
+    hal_fence();
+
+#if DEBUG_SYS_MUTEX
+tm_end = hal_get_cycles();
+if( DEBUG_SYS_MUTEX < tm_start )
+printk("\n[DBG] %s : thread %x in process %x exit for %s / cost %d / cycle %d\n",
+__FUNCTION__, this->trdid, process->pid, sys_mutex_op_str( operation ),
+(uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
+#endif
+
         return 0;