Changeset 641 for trunk/user/ksh

Timestamp:

Oct 10, 2019, 1:42:04 PM (5 years ago)

Author:

alain

Message:

• Fix several bugs.
• Introduce the "stat" command in KSH.

This almos-mkh version sucessfully executed the FFT application
(65536 complex points) on the TSAR architecture from 1 to 64 cores.

File:

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

trunk/user/ksh/ksh.c

@@ -123 +123 @@
 
 #if DEBUG_CMD_CAT
-snprintf( string , 128 , "[ksh] enter %s" , __FUNCTION__);
+snprintf( string , 128 , "[ksh] %s enters" , __FUNCTION__);
 display_string( string );
 #endif
@@ -138 +138 @@
 
 #if DEBUG_CMD_CAT
-snprintf( string , 128 , "[ksh] in %s : after strcpy" , __FUNCTION__ );
+snprintf( string , 128 , "[ksh] %s : after strcpy" , __FUNCTION__ );
 display_string( string );
 #endif
@@ -180 +180 @@
 
 #if DEBUG_CMD_CAT
-snprintf( string , 128 , "[ksh] %s : size = %d", __FUNCTION__, size );
+snprintf( string , 128 , "[ksh] %s : size = %d",
+__FUNCTION__, size );
 display_string( string );
 #endif
@@ -206 +207 @@
 
 #if DEBUG_CMD_CAT
-snprintf( string , 128 , "[ksh] %s : maped file %d to buffer %x", __FUNCTION__, fd , buf );
+snprintf( string , 128 , "[ksh] %s : mapped file %d to buffer %x",
+__FUNCTION__, fd , buf );
 display_string( string );
 #endif
@@ -213 +215 @@
     write( 1 , buf , size );
 
-    // unmap te file
+    // unmap the file
     if( munmap( buf , size ) )
     {
@@ -220 +222 @@
 
 #if DEBUG_CMD_CAT
-snprintf( string , 128 , "[ksh] %s : unmaped file %d from buffer %x", __FUNCTION__, fd , buf );
+snprintf( string , 128 , "[ksh] %s : unmapped file %d from buffer %x", 
+__FUNCTION__, fd , buf );
 display_string( string );
 #endif
@@ -852 +855 @@
 
 #if DEBUG_CMD_LS
-snprintf( string , 128 , "[ksh] %s : directory <%s> open / DIR %x\n",
+snprintf( string , 128 , "[ksh] %s : directory <%s> open / DIR %x",
 __FUNCTION__, pathname , dir );
 display_string( string );
@@ -875 +878 @@
 
 #if DEBUG_CMD_LS
-snprintf( string , 128 , "[ksh] %s : directory <%s> closed\n",
+snprintf( string , 128 , "[ksh] %s : directory <%s> closed",
 __FUNCTION__, pathname );
 display_string( string );
@@ -1020 +1023 @@
     sem_post( &semaphore );
 
-}  // end_cmd_rm()
+}  // end cmd_rm()
+
+///////////////////////////////////////////////
+static void cmd_stat( int argc , char **argv )
+{
+    struct stat    st;
+    unsigned int   size;
+
+        if (argc != 2)
+    {
+                printf("  usage: %s pathname\n", argv[0]);
+        }
+    else
+    {
+            strcpy( pathname , argv[1] );
+
+        if ( stat( pathname , &st ) )
+        {
+                    printf("  error: cannot stat <%s>\n", argv[2] );
+                }
+        else
+        {
+            // get file size
+            size = st.st_size;
+
+            // print file stat info
+            printf("   <%s> : %d bytes\n", pathname, size );
+        }
+        }
+
+    // release semaphore to get next command
+    sem_post( &semaphore );
+
+}  // end cmd_stat()
 
 ///////////////////////////////////////////////
@@ -1103 +1139 @@
         { "rm",      "remove a file from file system",                  cmd_rm      },
         { "rmdir",   "remove a directory from file system",             cmd_rmdir   },
+        { "stat",    "print infos on a given file",                     cmd_stat    },
         { "trace",   "activate trace for a given core",                 cmd_trace   },
         { "untrace", "desactivate trace for a given core",              cmd_untrace },
@@ -1149 +1186 @@
 
 #if DEBUG_EXECUTE
-snprintf( string , 128 , "\n[ksh] in %s : argc = %d / arg0 = %s / arg1 = %s\n",
+snprintf( string , 128 , "\n[ksh] in %s : argc = %d / arg0 = %s / arg1 = %s",
 __FUNCTION__ , argc , argv[0], argv[1] );
 #endif
@@ -1187 +1224 @@
         char           cmd[CMD_MAX_SIZE];               // buffer for one command
 
-/* 1. first direct command
+
+
+// 1. first direct command
 if( sem_wait( &semaphore ) )
 {
@@ -1195 +1234 @@
 else
 {
-    printf("\n[ksh] load bin/user/sort.elf\n");
+    strcpy( cmd , "load bin/user/fft.elf" );
+    printf("[ksh] %s\n", cmd );
+    execute( cmd );
 }
-
-strcpy( cmd , "load bin/user/sort.elf" );
-execute( cmd );
-*/
-
-
-
-// 2. second direct command
+//
+
+
+
+/* 2. second direct command
 if( sem_wait( &semaphore ) )
 {
@@ -1212 +1250 @@
 else
 {
-    printf("\n[ksh] load bin/user/fft.elf\n");
+    strcpy( cmd , "cat home/p_fft_dqt_16384_1_2" );
+    printf("[ksh] %s\n", cmd );
+    execute( cmd );
 }
-
-strcpy( cmd , "load bin/user/fft.elf" );
-execute( cmd );
-//
-
+*/
 
 
@@ -1253 +1289 @@
         {
             // initialize command buffer
-            // memset( cmd , 0x20 , sizeof(cmd) );   // TODO useful ?
             count       = 0;
             state       = NORMAL;
@@ -1459 +1494 @@
 
 #if DEBUG_MAIN
-snprintf( string , 128 , "\n[ksh] main thread started on core[%x,%d]\n", cxy , lid ); 
+snprintf( string , 128 , "\n[ksh] main thread started on core[%x,%d]", cxy , lid ); 
 display_string( string );
 #endif
@@ -1471 +1506 @@
 
 #if DEBUG_MAIN
-snprintf( string , 128 , "\n[ksh] main initialized semaphore\n" ); 
+snprintf( string , 128 , "\n[ksh] main initialized semaphore" ); 
 display_string( string );
 #endif
@@ -1485 +1520 @@
                     NULL ); 
 #if DEBUG_MAIN
-snprintf( string , 128 , "\n[ksh] main thread launched interactive thread %x\n", trdid ); 
+snprintf( string , 128 , "\n[ksh] main thread launched interactive thread %x", trdid ); 
 display_string( string );
 #endif