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

Timestamp:

Mar 28, 2018, 2:40:29 PM (6 years ago)

Author:

alain

Message:

Fix various bugs

File:

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

trunk/kernel/kern/cluster.c

@@ -4 +4 @@
  * Author  Ghassan Almaless (2008,2009,2010,2011,2012)
  *         Mohamed Lamine Karaoui (2015)
- *         Alain Greiner (2016,2017)
+ *         Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -92 +92 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s enters for cluster %x / cycle %d\n",
-__FUNCTION__ , local_cxy , cycle );
+printk("\n[DBG] %s : thread %x enters for cluster %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , cycle );
 #endif
 
@@ -113 +113 @@
     }
 
-#if CONFIG_DEBUG_CLUSTER_INIT
+#if( CONFIG_DEBUG_CLUSTER_INIT & 1 )
 cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
-cluster_dmsg("\n[DBG] %s : PPM initialized in cluster %x / cycle %d\n",
+printk("\n[DBG] %s : PPM initialized in cluster %x / cycle %d\n",
 __FUNCTION__ , local_cxy , cycle );
 #endif
@@ -123 +123 @@
         khm_init( &cluster->khm );
 
-    cluster_dmsg("\n[DBG] %s : KHM initialized in cluster %x at cycle %d\n",
-                 __FUNCTION__ , local_cxy , hal_get_cycles() );
+#if( CONFIG_DEBUG_CLUSTER_INIT & 1 )
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
+printk("\n[DBG] %s : KHM initialized in cluster %x at cycle %d\n",
+__FUNCTION__ , local_cxy , hal_get_cycles() );
+#endif
 
     // initialises embedded KCM
         kcm_init( &cluster->kcm , KMEM_KCM );
 
-    cluster_dmsg("\n[DBG] %s : KCM initialized in cluster %x at cycle %d\n",
-                 __FUNCTION__ , local_cxy , hal_get_cycles() );
+#if( CONFIG_DEBUG_CLUSTER_INIT & 1 )
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
+printk("\n[DBG] %s : KCM initialized in cluster %x at cycle %d\n",
+__FUNCTION__ , local_cxy , hal_get_cycles() );
+#endif
 
     // initialises all cores descriptors 
@@ -140 +148 @@
         }
 
-#if CONFIG_DEBUG_CLUSTER_INIT
+#if( CONFIG_DEBUG_CLUSTER_INIT & 1 )
 cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
-cluster_dmsg("\n[DBG] %s : cores initialized in cluster %x / cycle %d\n",
+printk("\n[DBG] %s : cores initialized in cluster %x / cycle %d\n",
 __FUNCTION__ , local_cxy , cycle );
 #endif
@@ -151 +159 @@
     cluster->rpc_threads = 0;
 
-cluster_dmsg("\n[DBG] %s : RPC fifo inialized in cluster %x at cycle %d\n",
+#if( CONFIG_DEBUG_CLUSTER_INIT & 1 )
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
+printk("\n[DBG] %s : RPC fifo inialized in cluster %x at cycle %d\n",
 __FUNCTION__ , local_cxy , hal_get_cycles() );
+#endif
 
     // initialise pref_tbl[] in process manager
@@ -179 +191 @@
 cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_CLUSTER_INIT < cycle )
-cluster_dmsg("\n[DBG] %s Process Manager initialized in cluster %x / cycle %d\n",
-__FUNCTION__ , local_cxy , cycle );
+printk("\n[DBG] %s , thread %x exit for cluster %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , cycle );
 #endif