Changeset 428 for trunk/kernel/kern/cluster.c

Timestamp:

Jan 29, 2018, 6:08:07 PM (6 years ago)

Author:

alain

Message:

blip

File:

• trunk/kernel/kern/cluster.c (modified) (5 diffs)

trunk/kernel/kern/cluster.c

@@ -55 +55 @@
 error_t cluster_init( struct boot_info_s * info )
 {
-    error_t     error;
-    lpid_t      lpid;     // local process_index
-    lid_t       lid;      // local core index
+    error_t         error;
+    lpid_t          lpid;     // local process_index
+    lid_t           lid;      // local core index
+    uint32_t        i;        // index in loop on external peripherals
+    boot_device_t * dev;      // pointer on external peripheral
+    uint32_t        func;     // external peripheral functionnal type
 
         cluster_t * cluster = LOCAL_CLUSTER;
@@ -69 +72 @@
         cluster->io_cxy          = info->io_cxy;
 
+    // initialize external peripherals channels
+    for( i = 0 ; i < info->ext_dev_nr ; i++ )
+    {
+        dev  = &info->ext_dev[i];
+        func = FUNC_FROM_TYPE( dev->type );   
+        if( func == DEV_FUNC_TXT ) cluster->nb_txt_channels = dev->channels;
+        if( func == DEV_FUNC_NIC ) cluster->nb_nic_channels = dev->channels;
+        if( func == DEV_FUNC_IOC ) cluster->nb_ioc_channels = dev->channels;
+        if( func == DEV_FUNC_FBF ) cluster->nb_fbf_channels = dev->channels;
+    }
+
     // initialize cluster local parameters
         cluster->cores_nr        = info->cores_nr;
@@ -199 +213 @@
 
 ////////////////////////////////////////////////////////////////////////////////////
-//  Process management related functions
+//  Process related functions
 ////////////////////////////////////////////////////////////////////////////////////
 
@@ -336 +350 @@
     remote_spinlock_lock_busy( XPTR( local_cxy , &pm->local_lock ) , & irq_state );
 
-    xlist_add_first( XPTR( local_cxy , &pm->local_root ),
-                     XPTR( local_cxy , &process->local_list ) );
+    xlist_add_last( XPTR( local_cxy , &pm->local_root ),
+                    XPTR( local_cxy , &process->local_list ) );
     pm->local_nr++;
 
@@ -417 +431 @@
 }
 
-////////////////////////////////////////////////////////////////////////////////////////
-// TODO Il me semble que la seule chose que fait ce kernel thread à chaque réveil
-// est de mettre à jour la DQDT, et de se rendormir... A-t-on besoin d'un thread ? [AG]
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if 0
-void * cluster_manager_thread( void * arg )
-{
-        register struct dqdt_cluster_s * root;
-        register struct cluster_s      * root_home;
-
-        register uint32_t                tm_start;
-        register uint32_t                tm_end;
-        register uint32_t                cpu_id;
-        struct cluster_s               * cluster;
-        struct thread_s                * this;
-        struct event_s                   event;
-        struct alarm_info_s              info;
-        register uint32_t                cntr;
-        register bool_t                  isRootMgr;
-        register uint32_t                period;
-
-        cpu_enable_all_irq( NULL );
-
-        cluster   = arg;
-        this      = CURRENT_THREAD;
-        cpu_id    = cpu_get_id();
-        root      = dqdt_root;
-        root_home = dqdt_root->home;
-        isRootMgr = (cluster == root_home) ? true : false;
-        cntr      = 0;
-        period    = (isRootMgr) ?
-                CONFIG_DQDT_ROOTMGR_PERIOD * MSEC_PER_TICK :
-                CONFIG_DQDT_MGR_PERIOD * MSEC_PER_TICK;
-
-        event_set_senderId(&event, this);
-        event_set_priority(&event, E_CHR);
-        event_set_handler(&event, &manager_alarm_event_handler);
-
-        info.event = &event;
-        thread_preempt_disable(CURRENT_THREAD);
-
-    // infinite loop
-        while(1)
-        {
-                tm_start = cpu_time_stamp();
-                dqdt_update();
-                tm_end   = cpu_time_stamp();
-
-                if(isRootMgr)
-                {
-                        if((cntr % 10) == 0)
-                        {
-                                printk(INFO, "INFO: cpu %d, DQDT update ended [ %u - %u ]\n",
-                                       cpu_id,
-                                       tm_end,
-                                       tm_end - tm_start);
-
-                                dqdt_print_summary(root);
-                        }
-                }
-
-                alarm_wait( &info , period );
-                sched_sleep(this);
-                cntr ++;
-        }
-
-        return NULL;
-} // end cluster_manager_thread()
-
-//////////////////////////////////////////
-EVENT_HANDLER(manager_alarm_event_handler)
-{
-        struct thread_s *manager;
-
-        manager = event_get_senderId(event);
-
-        thread_preempt_disable(CURRENT_THREAD);
-
-        //printk(INFO, "%s: cpu %d [%u]\n", __FUNCTION__, cpu_get_id(), cpu_time_stamp());
-
-        sched_wakeup(manager);
-
-        thread_preempt_enable(CURRENT_THREAD);
-
-        return 0;
-}
-
-///////////////////////////////////////////////
-EVENT_HANDLER(cluster_key_create_event_handler)
-{
-        struct cluster_s *cluster;
-        struct thread_s *sender;
-        ckey_t *ckey;
-        uint32_t key;
-
-        sender  = event_get_senderId(event);
-        ckey    = event_get_argument(event);
-        cluster = current_cluster;
-        key     = cluster->next_key;
-
-        while((key < CLUSTER_TOTAL_KEYS_NR) && (cluster->keys_tbl[key] != NULL))
-                key ++;
-
-        if(key < CLUSTER_TOTAL_KEYS_NR)
-        {
-                ckey->val = key;
-                cluster->keys_tbl[key] = (void *) 0x1; // Reserved
-                cluster->next_key = key;
-                event_set_error(event, 0);
-        }
-        else
-                event_set_error(event, ENOSPC);
-
-        sched_wakeup(sender);
-        return 0;
-}
-
-///////////////////////////////////////////////
-EVENT_HANDLER(cluster_key_delete_event_handler)
-{
-        struct cluster_s *cluster;
-        struct thread_s *sender;
-        ckey_t *ckey;
-        uint32_t key;
-
-        sender  = event_get_senderId(event);
-        ckey    = event_get_argument(event);
-        cluster = current_cluster;
-        key     = ckey->val;
-
-        if(key < cluster->next_key)
-                cluster->next_key = key;
-
-        cluster->keys_tbl[key] = NULL;
-        event_set_error(event, 0);
-
-        sched_wakeup(sender);
-        return 0;
-}
-
-#define _CKEY_CREATE  0x0
-#define _CKEY_DELETE  0x1
-
-error_t cluster_do_key_op(ckey_t *key, uint32_t op)
-{
-        struct event_s event;
-        struct thread_s *this;
-        struct cluster_s *cluster;
-        struct cpu_s *cpu;
-
-        this = CURRENT_THREAD;
-
-        event_set_priority(&event, E_FUNC);
-        event_set_senderId(&event, this);
-        event_set_argument(&event, key);
-
-        if(op == _CKEY_CREATE)
-                event_set_handler(&event, cluster_key_create_event_handler);
-        else
-                event_set_handler(&event, cluster_key_delete_event_handler);
-
-        cluster = current_cluster;
-        cpu     = cluster->bscluster->bscpu;
-        event_send(&event, &cpu->re_listner);
-
-        sched_sleep(this);
-
-        return event_get_error(&event);
-}
-
-error_t cluster_key_create(ckey_t *key)
-{
-        return cluster_do_key_op(key, _CKEY_CREATE);
-}
-
-error_t cluster_key_delete(ckey_t *key)
-{
-        return cluster_do_key_op(key, _CKEY_DELETE);
-}
-
-void* cluster_getspecific(ckey_t *key)
-{
-        struct cluster_s *cluster;
-
-        cluster = current_cluster;
-        return cluster->keys_tbl[key->val];
-}
-
-void  cluster_setspecific(ckey_t *key, void *val)
-{
-        struct cluster_s *cluster;
-
-        cluster = current_cluster;
-        cluster->keys_tbl[key->val] = val;
-}
-#endif
+///////////////////////////////////////////
+void cluster_processes_display( cxy_t cxy )
+{
+    xptr_t        root_xp;
+    xptr_t        iter_xp;
+    xptr_t        process_xp;     
+
+    // get extended pointer on root of process in cluster cxy
+    root_xp = XPTR( cxy , &LOCAL_CLUSTER->pmgr.local_root );
+
+    // skip one line
+    printk("\n");
+
+    // loop on all reference processes in cluster cxy 
+    XLIST_FOREACH( root_xp , iter_xp )
+    {
+        process_xp = XLIST_ELEMENT( iter_xp , process_t , local_list );
+        process_display( process_xp );
+    }
+}  // end cluster_processes_display() 
+
+