Changeset 683 for trunk/kernel/syscalls/sys_barrier.c

Timestamp:

Jan 13, 2021, 12:36:17 AM (4 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

• trunk/kernel/syscalls/sys_barrier.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_barrier.c

@@ -2 +2 @@
  * sys_barrier.c - Access a POSIX barrier.
  * 
- * authors       Alain Greiner (2016,2017,2018,2019)
+ * authors       Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -33 +33 @@
 #include <remote_barrier.h>
 
+/////////////////////////////////////////////////////////////////////////////////
+// This function returns a printable string for the barrier related command type.
+/////////////////////////////////////////////////////////////////////////////////
+
+#if DEBUG_SYS_SOCKET || DEBUG_SYSCALLS_ERROR
+static char* barrier_cmd_str( uint32_t type )
+{
+    if     ( type == BARRIER_INIT     ) return "INIT"; 
+    else if( type == BARRIER_WAIT     ) return "WAIT"; 
+    else if( type == BARRIER_DESTROY  ) return "DESTROY";
+    else                                return "undefined";
+}
+#endif
+
 //////////////////////////////////
 int sys_barrier( intptr_t   vaddr,
@@ -53 +67 @@
 if( DEBUG_SYS_BARRIER < tm_start )
 printk("\n[%s] thread[%x,%x] enters for %s / count %d / cycle %d\n",
-__FUNCTION__, process->pid, this->trdid, sys_barrier_op_str(operation), count,
+__FUNCTION__, process->pid, this->trdid, barrier_cmd_str(operation), count,
 (uint32_t)tm_start );
 #endif
 
     // check vaddr in user vspace
-        error = vmm_get_vseg( process , vaddr , &vseg );
-        if( error )
+        if( vmm_get_vseg( process , vaddr , &vseg ) )
     {
 
@@ -65 +78 @@
 if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start ) 
 printk("\n[ERROR] in %s for %s : unmapped barrier %x / thread[%x,%x]\n",
-__FUNCTION__, sys_barrier_op_str(operation), vaddr, process->pid, this->trdid );
-#endif
-        this->errno = error;
+__FUNCTION__, barrier_cmd_str(operation), vaddr, process->pid, this->trdid );
+#endif
+        this->errno = EINVAL;
         return -1;
     }
@@ -79 +92 @@
             if( attr != 0 )   // QDT barrier required
             {
-                error = vmm_get_vseg( process , attr , &vseg );
-                if( error )
+                if( vmm_get_vseg( process , attr , &vseg ) )
                 {