Changeset 626 for trunk/user/ksh

Timestamp:

Apr 29, 2019, 7:25:09 PM (6 years ago)

Author:

alain

Message:

This version has been tested on the sort multithreaded application
for TSAR_IOB architectures ranging from 1 to 8 clusters.
It fixes three bigs bugs:
1) the dev_ioc device API has been modified: the dev_ioc_sync_read()
and dev_ioc_sync_write() function use now extended pointers on the
kernel buffer to access a mapper stored in any cluster.
2) the hal_uspace API has been modified: the hal_copy_to_uspace()
and hal_copy_from_uspace() functions use now a (cxy,ptr) couple
to identify the target buffer (equivalent to an extended pointer.
3) an implementation bug has been fixed in the assembly code contained
in the hal_copy_to_uspace() and hal_copy_from_uspace() functions.

File:

• trunk/user/ksh/ksh.c (modified) (8 diffs)

trunk/user/ksh/ksh.c

@@ -15 +15 @@
 // The children processes are created by the <load> command, and are
 // attached to the same TXT terminal as the parent KSH process.
-// A child process can be lauched in foreground or in background: 
+// A child process can be launched in foreground or in background: 
 // . when the child process is launched in foreground, the KSH process loses
 //   the TXT terminal ownership, that is transfered to the child process.
@@ -391 +391 @@
     if( argc < 2 )
     {
-        printf("  usage: display  vmm      cxy    pid\n"
-               "         display  sched    cxy    lid\n"              
+        printf("  usage: display  vmm      cxy      pid\n"
+               "         display  sched    cxy      lid\n"              
                "         display  process  cxy\n"              
                "         display  txt      txtid\n"              
@@ -398 +398 @@
                "         display  chdev\n"              
                "         display  dqdt\n"              
-               "         display  locks    pid    trdid\n"
+               "         display  locks    pid      trdid\n"
                "         display  barrier  pid\n"
-               "         display  mapper   path   page_id  nbytes\n");
+               "         display  mapper   path     page     nbytes\n"
+               "         display  fat      page     entries\n"
+               "         display  fat      cxy      0\n");
     }
     ////////////////////////////////////
@@ -558 +560 @@
             {
                 printf("  error: cannot display page %d of mapper %s\n", page_id, argv[2] );
+            }
+        }
+    }
+    ///////////////////////////////////////////
+    else if( strcmp( argv[1] , "fat" ) == 0 )
+    {
+        if( argc != 4 )
+        {
+                    printf("  usage: display fat page_id nb_entries\n");
+            }
+        else
+        {
+                unsigned int page_id    = atoi(argv[2]);
+            unsigned int nb_entries = atoi(argv[3]);
+
+            if( display_fat( page_id, nb_entries ) )
+            {
+                printf("  error: cannot display page %d of fat\n", page_id );
             }
         }
@@ -1141 +1161 @@
 }  // end execute()
 
+
+
 ///////////////////////////////
 static void interactive( void )
@@ -1156 +1178 @@
 #endif
 
-/* 
-// To lauch one or several commands without interactive mode 
+/*
+// Lauch one or several commands without interactive mode 
 
 // 1. first command
@@ -1167 +1189 @@
 else
 {
-    printf("\n[ksh] load bin/user/pgcd.elf\n");
+    printf("\n[ksh] display fat 0 32\n");
 }
 
-strcpy( cmd , "load bin/user/pgcd.elf" );
+strcpy( cmd , "display fat 0 32" );
 execute( cmd );
 
@@ -1181 +1203 @@
 else
 {
-    printf("\n[ksh] ls home\n");
+    printf("\n[ksh] load bin/user/pgcd.elf\n");
 }
 
-strcpy( cmd , "ls home" );
+strcpy( cmd , "load bin/user/pgcd.elf" );
 execute( cmd );