Changeset 712 for soft/giet_vm/applications/shell

Timestamp:

Oct 7, 2015, 11:56:33 AM (9 years ago)

Author:

alain

Message:

Introduce the giet_fbf_size() and giet_fbf_alloc() system calls.

Location:

soft/giet_vm/applications/shell

Files:

• shell.c (modified) (5 diffs)
• shell.py (modified) (5 diffs)

soft/giet_vm/applications/shell/shell.c

@@ -14 +14 @@
 #define MAX_ARGS    (32)
 
+
 struct command_t
 {
@@ -260 +261 @@
 static void cmd_ps(int argc, char** argv)
 {
-    giet_applications_status();
+    if (argc == 1)
+    {
+        giet_applications_status( NULL );
+    }
+    else
+    {
+        giet_applications_status( argv[1] );
+    }
 }
 
@@ -272 +280 @@
     }
 
-    int ret = giet_pthread_pause( argv[1] , argv[2] );
-
-    if ( ret == -1 )
-    {
-        giet_tty_printf("  error : vspace %s not found\n", argv[1] );
-    }
-    if ( ret == -2 )
-    {
-        giet_tty_printf("  error : thread %s not found\n", argv[2] );
-    }
+    giet_pthread_control( THREAD_CMD_PAUSE , argv[1] , argv[2] );
 }
 
@@ -293 +292 @@
     }
 
-    int ret = giet_pthread_resume( argv[1] , argv[2] );
-
-    if ( ret == -1 )
-    {
-        giet_tty_printf("  error : vspace %s not found\n", argv[1] );
-    }
-    if ( ret == -2 )
-    {
-        giet_tty_printf("  error : thread %s not found\n", argv[2] );
-    }
+    giet_pthread_control( THREAD_CMD_RESUME , argv[1] , argv[2] );
 }
 
@@ -314 +304 @@
     }
 
-    int ret = giet_pthread_context( argv[1] , argv[2] );
-
-    if ( ret == -1 )
-    {
-        giet_tty_printf("  error : vspace %s not found\n", argv[1] );
-    }
-    if ( ret == -2 )
-    {
-        giet_tty_printf("  error : thread %s not found\n", argv[2] );
-    }
+    giet_pthread_control( THREAD_CMD_CONTEXT , argv[1] , argv[2] );
 }
 

soft/giet_vm/applications/shell/shell.py

@@ -8 +8 @@
 #   author : Alain Greiner
 #######################################################################################
-#  This file describes the mapping of the single thread "shell" application 
-#  on processor[0][0][0] of a multi-clusters, multi-processors architecture.
+#  This file describes the mapping of the single thread "shell" application. 
+#  It is mapped on processor[xmap][ymap][pmap] of the target
+#  multi-clusters, multi-processors architecture.
 ####################################################################################
 
@@ -15 +16 @@
 def extend( mapping ):
 
-    nprocs    = mapping.nprocs
-    x_width   = mapping.x_width
-    y_width   = mapping.y_width
+    # define mapping 
+    xmap  = mapping.x_size - 1
+    ymap  = mapping.y_size - 1
+    pmap  = mapping.nprocs - 1
 
     # define vsegs base & size
@@ -37 +39 @@
     # data vseg
     mapping.addVseg( vspace, 'shell_data', data_base , data_size, 
-                     'C_WU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
+                     'C_WU', vtype = 'ELF', x = xmap, y = ymap, pseg = 'RAM', 
                      binpath = 'bin/shell/appli.elf',
                      local = False )
@@ -43 +45 @@
     # code vseg
     mapping.addVseg( vspace, 'shell_code', code_base , code_size,
-                     'CXWU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
+                     'CXWU', vtype = 'ELF', x = xmap, y = ymap, pseg = 'RAM', 
                      binpath = 'bin/shell/appli.elf',
                      local = False )
@@ -49 +51 @@
     # stack vseg             
     mapping.addVseg( vspace, 'shell_stack', stack_base, stack_size,
-                     'C_WU', vtype = 'BUFFER', x = 0 , y = 0 , pseg = 'RAM',
+                     'C_WU', vtype = 'BUFFER', x = xmap , y = ymap , pseg = 'RAM',
                      local = False, big = True )
 
     # heap vseg (unused)            
     mapping.addVseg( vspace, 'shell_heap', heap_base, heap_size,
-                     'C_WU', vtype = 'BUFFER', x = 0 , y = 0 , pseg = 'RAM',
+                     'C_WU', vtype = 'BUFFER', x = xmap , y = ymap , pseg = 'RAM',
                      local = False )
 
     # task 
-    mapping.addThread( vspace, 'shell', True, 0, 0, 0, 'shell_stack', 'shell_heap', 0 )
+    mapping.addThread( vspace, 
+                       'shell', 
+                       True,              # is_main
+                       xmap, ymap, pmap,
+                       'shell_stack',
+                       'shell_heap',
+                       0 )                # startid
 
     # extend mapping name