Changeset 197

Timestamp:

Aug 8, 2012, 12:06:38 PM (12 years ago)

Author:

alain

Message:

Activating the distributed scheduler in the memo Makefile.
Fixing a bug in the boot_init.c file (initialisation of "tasks" variable in the schedulers)

Location:

soft/giet_vm

Files:

• Makefile (modified) (3 diffs)
• boot/boot_init.c (modified) (9 diffs)
• giet_config.h (modified) (1 diff)
• memo/Makefile (modified) (1 diff)

soft/giet_vm/Makefile

@@ -66 +66 @@
         $(DU) -D $@ > $@.txt
 
-build/sys/%.o: sys/%.c 
+build/sys/%.o: sys/%.c giet_config.h
         $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
 
-build/sys/%.o: sys/%.s
+build/sys/%.o: sys/%.s giet_config.h
         $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
 
@@ -77 +77 @@
         $(DU) -D $@ > $@.txt
 
-build/boot/%.o: boot/%.c 
+build/boot/%.o: boot/%.c giet_config.h
         $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
 
-build/boot/%.o: boot/%.S
+build/boot/%.o: boot/%.S giet_config.h
         $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
 
@@ -116 +116 @@
 
 ### libs compilation
-build/libs/utils.o: libs/utils.c
+build/libs/utils.o: libs/utils.c giet_config.h
         $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
 
-build/libs/stdio.o: libs/stdio.c
+build/libs/stdio.o: libs/stdio.c giet_config.h  
         $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
 

soft/giet_vm/boot/boot_init.c

@@ -835 +835 @@
     }
 
-    if ( header->clusters != NB_CLUSTERS )
-    {
-        boot_puts("\n[BOOT ERROR] Incoherent NB_CLUSTERS");
-        boot_puts("\n             - In giet_config,  value = ");
-        boot_putw ( NB_CLUSTERS );
-        boot_puts("\n             - In mapping_info, value = ");
-        boot_putw ( header->clusters );
-        boot_puts("\n");
-        boot_exit();
-    }
-
-
-
     // checking number of virtual spaces
     if ( header->vspaces > GIET_NB_VSPACE_MAX )
@@ -1375 +1362 @@
 boot_puts("\n");
 #endif
+            // initialise the "tasks" variable in scheduler
+            boot_scheduler_set_tasks( proc_id , 0 );
+            
             // initialise the interrupt_vector with ISR_DEFAULT
             unsigned int slot;
@@ -1424 +1414 @@
         boot_set_mmu_ptpr( (unsigned int)boot_ptabs_paddr[vspace_id] >> 13 );
 
-        // loop on the tasks (task_id is the global index)
+        // loop on the tasks in vspace (task_id is the global index)
         for ( task_id = vspace[vspace_id].task_offset ; 
               task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks) ; 
@@ -1435 +1425 @@
             unsigned int sr = 0x0000FF13; 
 
-            // ptpr : page table physical base address (shifted by 13 bits for ptpr)
+            // ptpr : page table physical base address (shifted by 13 bit)
             unsigned int ptpr = (unsigned int)boot_ptabs_paddr[vspace_id] >> 13;
 
@@ -1441 +1431 @@
             unsigned int ptab = (unsigned int)boot_ptabs_vaddr[vspace_id];
 
-            // tty : terminal global index  
+            // tty : terminal global index provided by a global allocator
             unsigned int tty = 0xFFFFFFFF;
             if ( task[task_id].use_tty ) 
@@ -1458 +1448 @@
             }
 
-            // nic : NIC channel global index  
+            // nic : NIC channel global index provided by a global allocator
             unsigned int nic = 0xFFFFFFFF;
             if ( task[task_id].use_nic ) 
@@ -1475 +1465 @@
             }
 
-            // timer : user TIMER local index 
+            // timer : user TIMER global index provided by a cluster allocator 
             unsigned int timer = 0xFFFFFFFF;
             if ( task[task_id].use_timer ) 
@@ -1493 +1483 @@
             }
 
-            // fbdma : DMA local index  
+            // fbdma : DMA global index provided by a cluster allocator  
             unsigned int fbdma = 0xFFFFFFFF;
             if ( task[task_id].use_fbdma ) 
@@ -1538 +1528 @@
             if ( ltid >= 15 )
             {
-                boot_puts("\n[BOOT ERROR] : too much tasks allocated to processor ");
+                boot_puts("\n[BOOT ERROR] : ");
+                boot_putw( ltid );
+                boot_puts(" tasks allocated to processor ");
                 boot_putw( gpid );
-                boot_puts("\n");
+                boot_puts(" / max is 15\n");
                 boot_exit();
             }

soft/giet_vm/giet_config.h

@@ -12 +12 @@
 /* Debug parameters */
 
-#define BOOT_DEBUG_PT           0           /* display page tables initialisation on TTY0 */
+#define BOOT_DEBUG_PERI     0       /* display peripherals initialisation on TTY0 */
+#define BOOT_DEBUG_PT           1           /* display page tables initialisation on TTY0 */
 #define BOOT_DEBUG_VOBJS        0               /* display vobjs initialisation on TTY0 */
-#define BOOT_DEBUG_SCHED        0               /* display schedulers initialisation on TTY0 */
-#define BOOT_DEBUG_PERI     0       /* display peripherals initialisation on TTY0 */
+#define BOOT_DEBUG_SCHED        1               /* display schedulers initialisation on TTY0 */
 
 #define GIET_DEBUG_INIT         0               /* display parallel kernel initialisation on TTY0 */

soft/giet_vm/memo/Makefile

@@ -9 +9 @@
 INCLUDES = -Iinclude/libelfpp -Iinclude/libelfpp/elfpp -Iinclude/ -I../xml
 memo.x: $(SRCS) $(HDRS)
-        #g++ -Wall -g -DDISTRIBUTED_SCHEDULERS   $(SRCS) $(INCLUDES) -o memo.x
-        g++ -Wall -g  $(SRCS) $(INCLUDES) -o memo.x
+        #g++ -Wall -g  $(SRCS) $(INCLUDES) -o memo.x
+        g++ -Wall -g -DDISTRIBUTED_SCHEDULERS   $(SRCS) $(INCLUDES) -o memo.x
 
 debug: $(SRCS) $(HDRS)