Changeset 619 for trunk/libs

Timestamp:

Feb 12, 2019, 1:15:47 PM (6 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

Location:

trunk/libs

Files:

• libpthread/pthread.c (modified) (3 diffs)
• libsemaphore/semaphore.h (modified) (2 diffs)
• mini-libc/string.c (modified) (1 diff)
• mini-libc/string.h (modified) (2 diffs)

trunk/libs/libpthread/pthread.c

@@ -2 +2 @@
  * pthread.c - User level <pthread> library implementation.
  * 
- * Author     Alain Greiner (2016,2017,2018)
+ * Author     Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -202 +202 @@
                           unsigned int                  count )
 { 
-    if ( attr )
-    {
-        printf("[ERROR] in %s ; <attr> argument must be NULL\n", __FUNCTION__ );
-        return -1;
-    }
-
     return hal_user_syscall( SYS_BARRIER,
                              (reg_t)barrier,
                              BARRIER_INIT,
                              (reg_t)count,
-                             0 );
+                             (reg_t)attr );
 }
 
@@ -362 +356 @@
     }
 
-    // check attributes
+    // check attributes / count
     if( (x_size * y_size * nthreads) != count )
     {

trunk/libs/libsemaphore/semaphore.h

@@ -27 +27 @@
 //////////////////////////////////////////////////////////////////////////////////////////////
 //             POSIX unnamed semaphores related functions
+//
+// This synchonisation object allows several thread in a given process to share one
+// (or several) shared resource(s).
+// - The sem_wait() function allows a thread to take one resource and atomically
+//   decrement the semaphore count. If the count value is zero, the calling thread 
+//   blocks and deschedules. It is unblocked by another thread when it becomes possible
+//   to make the decrement.
+// - the sem_post() functions allows a thread to release a resource and atomicalli
+//   increment the semaphore count. 
 //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -37 +46 @@
  * @ sem         : [in]  pointer on semaphore.
  * @ pshared     : [in]  unsupported => must be zero. 
- * @ value       : [in]  initial semaphore value.
+ * @ count       : [in]  initial semaphore value.
  * @ return 0 if success / return -1 if failure.
  ********************************************************************************************/
 int sem_init( sem_t        * sem,
               int            pshared,
-              unsigned int   value );
+              unsigned int   count );
 
 /********************************************************************************************* 

trunk/libs/mini-libc/string.c

@@ -80 +80 @@
 
 
-///////////////////////////
-char * strcpy (char * dest,
+//////////////////////////
+char * strcpy (char * dst,
                char * src )
 {
-        char *src_ptr = src;
-        char *dst_ptr = dest;
-
-        while(*src_ptr) *(dst_ptr++) = *(src_ptr++);
-
-        *dst_ptr = 0;
-        return dest;
-}
-
-////////////////////////////////////
-char * strncpy( char         * dest,
+        while( *src )
+    {
+        *(dst) = *(src);
+        dst++;
+        src++;
+    }
+        
+    // set NUL terminating character
+        *dst = 0;
+
+        return dst;
+}
+
+///////////////////////////////////
+char * strncpy( char         * dst,
                 char         * src,
-                unsigned int   n )
+                unsigned int   count )
 {
         unsigned int i;
 
-        for (i = 0; (i < n) && (src[i] != '\0') ; i++) dest[i] = src[i];
-
-        for (; i < n; i++) dest[i] = '\0';
-
-        return dest;
+    // copy at most count characters
+        for (i = 0 ; (i < count) && (src[i] != '\0') ; i++) dst[i] = src[i];
+
+    // complete with NUL characters
+        for ( ; i < count ; i++) dst[i] = '\0';
+
+        return dst;
 }
 

trunk/libs/mini-libc/string.h

@@ -70 +70 @@
  * @ return 0 if s1 == s2 / return 1 if s1 > s2 / return -1 if s1 < s2
  *******************************************************************************************/
-int strncmp ( const char * s1,
-              const char * s2,
+int strncmp ( const char     * s1,
+              const char     * s2,
               unsigned int     n );
 
@@ -84 +84 @@
 
 /********************************************************************************************
- * This function copies <n> characters from the <sr> buffer to the <dst> buffer.
+ * This function copies <count> characters from the <src> buffer to the <dst> buffer.
  ********************************************************************************************
  * @ dst   : pointer on destination buffer.
  * @ src   : pointer on source buffer.
- * @ n     : number of characters to be copied.
+ * @ count : number of characters to be copied.
  *******************************************************************************************/
 char * strncpy ( char         * dst,
                  char         * src,
-                 unsigned int   n );
+                 unsigned int   count );
 
 /********************************************************************************************