Changeset 661 for trunk/libs

Timestamp:

Oct 10, 2020, 4:41:37 PM (4 years ago)

Author:

alain

Message:

Introduce the non-standatd display_socket() syscall.
Improve the non-standard get_string() syscall.

Location:

trunk/libs

Files:

• libalmosmkh/almosmkh.c (modified) (7 diffs)
• libalmosmkh/almosmkh.h (modified) (3 diffs)
• mini-libc/Makefile (modified) (2 diffs)

trunk/libs/libalmosmkh/almosmkh.c

@@ -57 +57 @@
 }
 
-//////////////////////////////////////
-int get_config( unsigned int * x_size,
-                unsigned int * y_size,
-                unsigned int * ncores )
+///////////////////////////////////////////////
+int get_config( struct hard_config_s * config )
 {
     return hal_user_syscall( SYS_GET_CONFIG,
-                             (reg_t)x_size,
-                             (reg_t)y_size,
-                             (reg_t)ncores, 0 );
+                             (reg_t)config, 0, 0, 0);
 }
 
@@ -242 +238 @@
         if( length >= maxlen-1 )
         {
-            return -1;                      // return failure   
+            // cancel all echo characters
+            while( length )
+            {
+               printf("\b \b");             // cancel one echo character
+               length--;                    
+            }
         }
 
@@ -257 +258 @@
         else if (c == 0x0A)                 // LF character marks end of string
         {
+            putchar( c );
             done = 1;
         }
@@ -264 +266 @@
             if ( length > 0 ) 
             {
+                printf("\b \b");            // cancel one echo character
                 length--;          
-                printf("\b \b");            // BS /  / BS 
             }
         }
         else if ( c == 0 )                  // EOF character
         {
+            // cancel all echo characters
+            while( length )
+            {
+               printf("\b \b");             // cancel one echo character
+               length--;                    
+            }
             return -1;                      // return failure
         }
@@ -276 +284 @@
     // set NUL character in string and return success
     string[length] = 0;
-    return 0;
+    return length + 1;
 
 }  // end get_string()
@@ -399 +407 @@
                              (reg_t)nb_slots, 0 );
 } 
+
+/////////////////////////////////////
+int display_socket( unsigned int pid,
+                    unsigned int fdid )
+{
+    return hal_user_syscall( SYS_DISPLAY,
+                             DISPLAY_SOCKET,
+                             (reg_t)pid,
+                             (reg_t)fdid, 0 );
+}
 
 ///////////////////////////////
@@ -1495 +1513 @@
 
     // get platform parameters
-    unsigned int   x_size;
-    unsigned int   y_size;
-    unsigned int   ncores;
-    get_config( &x_size , &y_size , &ncores );
+    hard_config_t  config;
+    get_config( &config );
+    unsigned int   x_size = config.x_size;
+    unsigned int   y_size = config.y_size;
+    unsigned int   ncores = config.ncores;
 
     // get calling thread cluster identifier

trunk/libs/libalmosmkh/almosmkh.h

@@ -63 +63 @@
 
 /*************************************************************************************** 
- * This syscall returns the hardware platform parameters.
- ***************************************************************************************
- * @ x_size   : [out] number of clusters in a row.
- * @ y_size   : [out] number of clusters in a column.
- * @ ncores   : [out] number of cores per cluster.
- * @ return always 0.
- **************************************************************************************/
-int get_config( unsigned int * x_size,
-                unsigned int * y_size,
-                unsigned int * ncores );
+ * This syscall returns the hardware platform parameters in the hard_config_t pointed
+ * by the <config> argument. This structure is defined in the shared_almos.h file.
+ * The available configuration parameters are :
+ * - cores       : x_size / y_size / ncores
+ * - peripherals : nb_txt_channels / nb_nic_channels / nb_ioc_channels / nb_fbf_channels
+ ***************************************************************************************
+ * @ config   : [out] pointer on hard_config_t structure in user space.
+ * @ return 0 if success / return -1 if illegal argument.
+ **************************************************************************************/
+int get_config( struct hard_config_s * config );
 
 /*************************************************************************************** 
@@ -153 +153 @@
  * This syscall returns a character string from the standard "stdin" stream.
  * The string is copied in buffer pointed by the <string> argument. 
- * The string length (including the NUL terminating character) cannot be larger
- * than the size defined by the <size> argument.
+ * If the number of characters exceed the buffer length, all character are canceled
+ * in both the buffer & the echoed string, and a new string capture start. 
+ * - Only printable characters c such as (0x20 <= c) and (c < 0x7f) are echoed
+ *   and copied in the target buffer. 
+ * - The LF (0x0A) character signaling the end of string is replaced by an extra
+ *   NUL (0x00) character in the target buffer.
+ * - the DEL (0x7F), BS (0x08) control characters are taken into account, and can be
+ *   used to correct both the buffer content and the echoed string.
  ***************************************************************************************
  * @ string   : pointer on the string buffer.
- * @ maxlen   : max number of bytes in string buffer.
- * @ returns 0 if success / returns -1 if failure.
+ * @ maxlen   : max number of bytes in string buffer, including the terminating NUL.
+ * @ returns string length (including NUL) if success / returns -1 if failure.
  **************************************************************************************/
 int get_string( char * string,
@@ -308 +314 @@
 int display_fat( unsigned int min_slot,
                  unsigned int nb_slots );
+
+/*************************************************************************************** 
+ * This debug syscall displays on the kernel terminal the current state of
+ * a socket identified by the <pid> and <fdid> arguments.
+ * It can be called by any thread running in any cluster.
+ ***************************************************************************************
+ * @ pid        : target process identifier.
+ * @ fdid       : file descriptor identifying the target socket.
+ * @ return 0 if success / return -1 if socket not found.
+ **************************************************************************************/
+int display_socket( unsigned int pid,
+                    unsigned int fdid );
 
 /***************************************************************************************** 

trunk/libs/mini-libc/Makefile

@@ -14 +14 @@
        mman.c    \
        signal.c  \
+       socket.c  \
        stat.c    \
        stdio.c   \
@@ -55 +56 @@
         cp mman.h    build/include/sys/.
         cp signal.h  build/include/.
+        cp socket.h  build/include/sys/.
         cp stat.h    build/include/sys/.
         cp stdio.h   build/include/.