Changeset 625 for trunk/libs/mini-libc

Timestamp:

Apr 10, 2019, 10:09:39 AM (6 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

Location:

trunk/libs/mini-libc

Files:

• stdio.c (modified) (2 diffs)
• unistd.c (modified) (1 diff)

trunk/libs/mini-libc/stdio.c

@@ -403 +403 @@
     
     // check stream valid
-    if( stream->key != VALID_OPEN_FILE ) return EOF;
+    if( stream->key != VALID_OPEN_FILE )
+    {
+        printf("\n[error in %s] stream %x non registered\n", __FUNCTION__, stream );
+        return -1;
+    }
 
     va_start( args, format );
@@ -409 +413 @@
     va_end( args );
 
+    // check format
     if ( count < 0 ) 
     {
-        display_string( "fprintf : xprintf failure" );
+        printf("\n[error in %s] unsupported format %s\n", __FUNCTION__, format );
         return -1;
     }
-    else 
-    {
-        // get file descriptor from file pointer
-        fd = stream->fd;
-
-        // set terminating NUL
-        string[count] = 0;
-
-printf("\n[%s] fd = %d for string : %s\n", __FUNCTION__, fd, string );
-
-idbg();
-
-        // copy string to file
-        writen = write( fd , &string , count );
-
-        if( writen != count )
-        {
-            display_string( "fprintf : write failure" );
-            return -1;
-        }
-
-idbg();
-
-        return writen;
-    }
+
+    // get file descriptor from file pointer
+    fd = stream->fd;
+
+    // set terminating NUL
+    string[count] = 0;
+
+    // copy string to file
+    writen = write( fd , &string , count );
+
+    // check write
+    if(writen != count )
+    {
+        printf("\n[error in %s] cannot write to stream %s\n", __FUNCTION__, stream );
+        return -1;
+    }
+
+    return writen;
+
 }  // end fprintf()
 

trunk/libs/mini-libc/unistd.c

@@ -2 +2 @@
  * unistd.c - User level <unistd> library implementation.
  * 
- * Author     Alain Greiner (2016,2017,2018)
+ * Author     Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites