Changeset 197


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • soft/giet_vm/Makefile

    r196 r197  
    6666        $(DU) -D $@ > $@.txt
    6767
    68 build/sys/%.o: sys/%.c
     68build/sys/%.o: sys/%.c giet_config.h
    6969        $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
    7070
    71 build/sys/%.o: sys/%.s
     71build/sys/%.o: sys/%.s giet_config.h
    7272        $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
    7373
     
    7777        $(DU) -D $@ > $@.txt
    7878
    79 build/boot/%.o: boot/%.c
     79build/boot/%.o: boot/%.c giet_config.h
    8080        $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
    8181
    82 build/boot/%.o: boot/%.S
     82build/boot/%.o: boot/%.S giet_config.h
    8383        $(CC) $(INCLUDE) $(CFLAGS)  -c -o $@ $<
    8484
     
    116116
    117117### libs compilation
    118 build/libs/utils.o: libs/utils.c
     118build/libs/utils.o: libs/utils.c giet_config.h
    119119        $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
    120120
    121 build/libs/stdio.o: libs/stdio.c
     121build/libs/stdio.o: libs/stdio.c giet_config.h 
    122122        $(CC) $(CFLAGS) $(INCLUDE)  -c -o $@ $<
    123123
  • soft/giet_vm/boot/boot_init.c

    r189 r197  
    835835    }
    836836
    837     if ( header->clusters != NB_CLUSTERS )
    838     {
    839         boot_puts("\n[BOOT ERROR] Incoherent NB_CLUSTERS");
    840         boot_puts("\n             - In giet_config,  value = ");
    841         boot_putw ( NB_CLUSTERS );
    842         boot_puts("\n             - In mapping_info, value = ");
    843         boot_putw ( header->clusters );
    844         boot_puts("\n");
    845         boot_exit();
    846     }
    847 
    848 
    849 
    850837    // checking number of virtual spaces
    851838    if ( header->vspaces > GIET_NB_VSPACE_MAX )
     
    13751362boot_puts("\n");
    13761363#endif
     1364            // initialise the "tasks" variable in scheduler
     1365            boot_scheduler_set_tasks( proc_id , 0 );
     1366           
    13771367            // initialise the interrupt_vector with ISR_DEFAULT
    13781368            unsigned int slot;
     
    14241414        boot_set_mmu_ptpr( (unsigned int)boot_ptabs_paddr[vspace_id] >> 13 );
    14251415
    1426         // loop on the tasks (task_id is the global index)
     1416        // loop on the tasks in vspace (task_id is the global index)
    14271417        for ( task_id = vspace[vspace_id].task_offset ;
    14281418              task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks) ;
     
    14351425            unsigned int sr = 0x0000FF13;
    14361426
    1437             // ptpr : page table physical base address (shifted by 13 bits for ptpr)
     1427            // ptpr : page table physical base address (shifted by 13 bit)
    14381428            unsigned int ptpr = (unsigned int)boot_ptabs_paddr[vspace_id] >> 13;
    14391429
     
    14411431            unsigned int ptab = (unsigned int)boot_ptabs_vaddr[vspace_id];
    14421432
    1443             // tty : terminal global index  
     1433            // tty : terminal global index provided by a global allocator
    14441434            unsigned int tty = 0xFFFFFFFF;
    14451435            if ( task[task_id].use_tty )
     
    14581448            }
    14591449
    1460             // nic : NIC channel global index  
     1450            // nic : NIC channel global index provided by a global allocator
    14611451            unsigned int nic = 0xFFFFFFFF;
    14621452            if ( task[task_id].use_nic )
     
    14751465            }
    14761466
    1477             // timer : user TIMER local index
     1467            // timer : user TIMER global index provided by a cluster allocator
    14781468            unsigned int timer = 0xFFFFFFFF;
    14791469            if ( task[task_id].use_timer )
     
    14931483            }
    14941484
    1495             // fbdma : DMA local index 
     1485            // fbdma : DMA global index provided by a cluster allocator 
    14961486            unsigned int fbdma = 0xFFFFFFFF;
    14971487            if ( task[task_id].use_fbdma )
     
    15381528            if ( ltid >= 15 )
    15391529            {
    1540                 boot_puts("\n[BOOT ERROR] : too much tasks allocated to processor ");
     1530                boot_puts("\n[BOOT ERROR] : ");
     1531                boot_putw( ltid );
     1532                boot_puts(" tasks allocated to processor ");
    15411533                boot_putw( gpid );
    1542                 boot_puts("\n");
     1534                boot_puts(" / max is 15\n");
    15431535                boot_exit();
    15441536            }
  • soft/giet_vm/giet_config.h

    r189 r197  
    1212/* Debug parameters */
    1313
    14 #define BOOT_DEBUG_PT           0           /* display page tables initialisation on TTY0 */
     14#define BOOT_DEBUG_PERI     0       /* display peripherals initialisation on TTY0 */
     15#define BOOT_DEBUG_PT           1           /* display page tables initialisation on TTY0 */
    1516#define BOOT_DEBUG_VOBJS        0               /* display vobjs initialisation on TTY0 */
    16 #define BOOT_DEBUG_SCHED        0               /* display schedulers initialisation on TTY0 */
    17 #define BOOT_DEBUG_PERI     0       /* display peripherals initialisation on TTY0 */
     17#define BOOT_DEBUG_SCHED        1               /* display schedulers initialisation on TTY0 */
    1818
    1919#define GIET_DEBUG_INIT         0               /* display parallel kernel initialisation on TTY0 */
  • soft/giet_vm/memo/Makefile

    r188 r197  
    99INCLUDES = -Iinclude/libelfpp -Iinclude/libelfpp/elfpp -Iinclude/ -I../xml
    1010memo.x: $(SRCS) $(HDRS)
    11         #g++ -Wall -g -DDISTRIBUTED_SCHEDULERS  $(SRCS) $(INCLUDES) -o memo.x
    12         g++ -Wall -g $(SRCS) $(INCLUDES) -o memo.x
     11        #g++ -Wall -g $(SRCS) $(INCLUDES) -o memo.x
     12        g++ -Wall -g -DDISTRIBUTED_SCHEDULERS  $(SRCS) $(INCLUDES) -o memo.x
    1313
    1414debug: $(SRCS) $(HDRS)
Note: See TracChangeset for help on using the changeset viewer.