Changeset 659 for trunk/user/ksh

Timestamp:

Oct 10, 2020, 3:58:01 PM (4 years ago)

Author:

alain

Message:

euh...

File:

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

trunk/user/ksh/ksh.c

@@ -50 +50 @@
 #include <sys/mman.h>
 #include <fcntl.h>
-
-#define CMD_MAX_SIZE   (256)    // max number of characters in one command
-#define LOG_DEPTH      (32)     // max number of registered commands 
-#define MAX_ARGS           (32)     // max number of arguments in a command
-#define PATH_MAX_SIZE  (256)    // max number of characters in a pathname 
+#include <shared_syscalls.h>
+
+#define CMD_MAX_SIZE       (256)    // max number of characters in one command
+#define LOG_DEPTH          (32)     // max number of registered commands 
+#define MAX_ARGS               (32)     // max number of arguments in a command
+#define PATH_MAX_SIZE      (256)    // max number of characters in a pathname 
 
 #define DEBUG_MAIN          0
@@ -414 +415 @@
                "         display  mapper   path     page     nbytes\n"
                "         display  fat      min      nslots\n"
-               "         display  fat      cxy      0\n" );
+               "         display  fat      cxy      0\n"
+               "         display  socket   pid      fdid\n" );
     }
     ////////////////////////////////////
@@ -594 +596 @@
         }
     }
+    ///////////////////////////////////////////
+    else if( strcmp( argv[1] , "socket" ) == 0 )
+    {
+        if( argc != 4 )
+        {
+                    printf("  usage: display socket pid fdid\n");
+            }
+        else
+        {
+                unsigned int pid   = atoi(argv[2]);
+            unsigned int fdid = atoi(argv[3]);
+
+            if( display_socket( pid , fdid ) )
+            {
+                printf("  error: cannot found socket[%x,%d]\n", pid, fdid );
+            }
+        }
+    }
+    ////
     else
     {
@@ -939 +960 @@
     unsigned int x_size;
     unsigned int y_size;
-    unsigned int ncores;
     unsigned int x;
     unsigned int y;
@@ -955 +975 @@
     {
         // get platform config
-        get_config( &x_size , &y_size , &ncores );
+        hard_config_t  config;
+        get_config( &config );
+        x_size = config.x_size;
+        y_size = config.y_size;
 
         // scan all clusters
@@ -1224 +1247 @@
         char           cmd[CMD_MAX_SIZE];               // buffer for one command
 
-
-
-// 1. first direct command
-if( sem_wait( &semaphore ) )
-{
-    printf("\n[ksh error] cannot found semafore\n" );
-    exit( 1 );
-}
-else
-{
-    strcpy( cmd , "load bin/user/transpose.elf" );
-    printf("[ksh] %s\n", cmd );
-    execute( cmd );
-}
-//
-
-
-
-/* 2. second direct command
-if( sem_wait( &semaphore ) )
-{
-    printf("\n[ksh error] cannot found semafore\n" );
-    exit( 1 );
-}
-else
-{
-    strcpy( cmd , "cat home/p_fft_dqt_16384_1_2" );
-    printf("[ksh] %s\n", cmd );
-    execute( cmd );
-}
+/*  direct command to help debug
+
+    int pid = getpid();
+
+    if( pid == 3 )
+    {
+        if( sem_wait( &semaphore ) )
+        {
+            printf("\n[ksh %d] error : cannot found semafore\n" );
+            exit( 1 );
+        }
+        else
+        {
+            strcpy( cmd , "load bin/user/tcp_server.elf" );
+            printf("[ksh] %s\n", cmd );
+            execute( cmd );
+        }
+    }
+    else if( getpid() == 4 )
+    {
+        if( sem_wait( &semaphore ) )
+        {
+            printf("\n[ksh %d] error : cannot found semafore\n" );
+            exit( 1 );
+        }
+        else
+        {
+            strcpy( cmd , "load bin/user/tcp_client.elf" );
+            printf("[ksh] %s\n", cmd );
+            execute( cmd );
+        }
+    }
+
 */
 
@@ -1294 +1320 @@
 
 #if DEBUG_INTER 
-unsigned int pid = getpid();
 snprintf( string , 128 , "[ksh] %s : request a new command", __FUNCTION__ );
 display_string( string );
@@ -1327 +1352 @@
 snprintf( string , 128 , "[ksh] %s : get command <%s>", __FUNCTION__, cmd );
 display_string( string );
-display_vmm( 0 , 2 );
 #endif
                         // register command in log_entries[] array