Changeset 623 for trunk/libs/mini-libc

Timestamp:

Mar 6, 2019, 4:37:15 PM (5 years ago)

Author:

alain

Message:

Introduce three new types of vsegs (KCODE,KDATA,KDEV)
to map the kernel vsegs in the process VSL and GPT.
This now used by both the TSAR and the I86 architectures.

Location:

trunk/libs/mini-libc

Files:

• mman.h (modified) (1 diff)
• stdio.c (modified) (6 diffs)
• stdio.h (modified) (1 diff)

trunk/libs/mini-libc/mman.h

@@ -38 +38 @@
  * virtual space, as defined by the arguments.
  *****************************************************************************************
- * @ addr    : requested address in virtual space / unused : should be NULL.
+ * @ addr    : requested address in virtual space / unsupported : should be NULL.
  * @ length  : requested number of bytes.
  * @ prot    : access mode bit vector (PROT_EXEC / PROT_READ / PROT_WRITE)
- * @ flags   : bit_vector (MAP_FILE / MAP_ANON / MAPREMOTE / MAP_PRIVATE / MAP_SHARED)
+ * @ flags   : bit_vector (MAP_FILE / MAP_ANON / MAP_REMOTE / MAP_PRIVATE / MAP_SHARED)
  * @ fdid    : file descriptor index (if MAP_FILE).
  * @ offset  : offset in file (if MAP_FILE).

trunk/libs/mini-libc/stdio.c

@@ -35 +35 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
+// This user space array registers all FILE descriptors open by a given process
 FILE open_file_array[MAX_OPEN_FILE_PER_PROCESS];  // array of open files structures
 
@@ -340 +341 @@
     if( mode != NULL )
     {
-        printf("\n[ERROR] in %s : the mode argument must be NULL\n", __FUNCTION__ );
+        printf("\n[%s] error : the mode argument must be NULL\n", __FUNCTION__ );
         return NULL;
     }
@@ -351 +352 @@
     if( fd < 0 )
     {
-        printf("\n[ERROR] in %s : file %s not found\n", __FUNCTION__ , pathname );
+        printf("\n[%s] error : file <%s> not found\n", __FUNCTION__ , pathname );
         return NULL;
     }
     if( fd > MAX_OPEN_FILE_PER_PROCESS )
     {
-        printf("\n[ERROR] in %s : not enough space for file %s\n", __FUNCTION__ , pathname );
+        printf("\n[%s] error : not enough space for file <%s>\n", __FUNCTION__ , pathname );
         return NULL;
     }
@@ -365 +366 @@
 
     return &open_file_array[fd];
+
 }  // end fopen()
 
@@ -376 +378 @@
     int fd = stream->fd;
 
-    // remove stream from open_file_array[]
+    // remove stream from user open_file_array[]
     open_file_array[fd].key = 0;
     
-    return close( fd );
+    // close the kernel file descriptor
+    if( close( fd ) )
+    {
+        printf("\n[%s] error : cannot close file %d\n", __FUNCTION__ , fd );
+        return -1;
+    }
+
+    return 0;
+
 }  // end fclose()
 
@@ -407 +417 @@
         // get file descriptor from file pointer
         fd = stream->fd;
-        
+
+        // set terminating NUL
         string[count] = 0;
 
+printf("\n[%s] fd = %d for string :\n", __FUNCTION__, fd, string );
+
         return write( fd , &string , count );
     }

trunk/libs/mini-libc/stdio.h

@@ -40 +40 @@
  ********************************************************************************************/
 
-typedef struct file_s
+typedef struct stream_s
 {
-    int fd;
-    int key;
+    int fd;          // index in both kernel fd_array[], and user open_file_array[]
+    int key;         // entry valid in open_file_array[] when (key == VALID_OPEN_FILE)
 }
 FILE;