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

Timestamp:

Nov 10, 2018, 2:16:38 PM (6 years ago)

Author:

alain

Message:

Cosmetic: improve debug.

File:

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

trunk/kernel/kern/cluster.c

@@ -113 +113 @@
 
 #if DEBUG_CLUSTER_INIT
-uint32_t cycle = (uint32_t)hal_get_cycles();
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : thread %x in process %x enters for cluster %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, local_cxy , cycle );
+printk("\n[%s] thread[%x,%x] enters for cluster %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, local_cxy , cycle );
 #endif
 
@@ -132 +133 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : PPM initialized in cluster %x / cycle %d\n",
+printk("\n[%s] PPM initialized in cluster %x / cycle %d\n",
 __FUNCTION__ , local_cxy , cycle );
 #endif
@@ -142 +143 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : KHM initialized in cluster %x at cycle %d\n",
+printk("\n[%s] KHM initialized in cluster %x at cycle %d\n",
 __FUNCTION__ , local_cxy , hal_get_cycles() );
 #endif
@@ -152 +153 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : KCM initialized in cluster %x at cycle %d\n",
+printk("\n[%s] KCM initialized in cluster %x at cycle %d\n",
 __FUNCTION__ , local_cxy , hal_get_cycles() );
 #endif
@@ -167 +168 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : cores initialized in cluster %x / cycle %d\n",
+printk("\n[%s] cores initialized in cluster %x / cycle %d\n",
 __FUNCTION__ , local_cxy , cycle );
 #endif
@@ -181 +182 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : RPC fifo inialized in cluster %x at cycle %d\n",
+printk("\n[%s] RPC fifo inialized in cluster %x at cycle %d\n",
 __FUNCTION__ , local_cxy , hal_get_cycles() );
 #endif
@@ -212 +213 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_INIT < cycle )
-printk("\n[DBG] %s : thread %x in process %x exit for cluster %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid , local_cxy , cycle );
+printk("\n[%s] thread[%x,%x] exit for cluster %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, local_cxy, cycle );
 #endif
 
@@ -430 +431 @@
 
 #if DEBUG_CLUSTER_PID_ALLOC
-uint32_t cycle = (uint32_t)hal_get_cycles();
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
 if( DEBUG_CLUSTER_PID_ALLOC < cycle )
-printk("\n[DBG] %s : thread %x enters in cluster %x / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , local_cxy , cycle );
+printk("\n[%s] thread[%x,%x] enters in cluster %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , local_cxy , cycle );
 #endif
 
@@ -477 +479 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_PID_ALLOC < cycle )
-printk("\n[DBG] %s : thread %x exit in cluster %x / pid %x / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , local_cxy , *pid , cycle );
+printk("\n[%s] thread[%x,%x] exit in cluster %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , local_cxy , cycle );
 #endif
 
@@ -488 +490 @@
 
 #if DEBUG_CLUSTER_PID_RELEASE
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_CLUSTER_PID_RELEASE < cycle )
-printk("\n[DBG] %s : thread %x enters in cluster %x / pid %x / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , local_cxy , pid , cycle );
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+if( DEBUG_CLUSTER_PID_ALLOC < cycle )
+printk("\n[%s] thread[%x,%x] enters in cluster %x / pid %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , local_cxy , pid, cycle );
 #endif
 
@@ -519 +522 @@
 #if DEBUG_CLUSTER_PID_RELEASE
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_CLUSTER_PID_RELEASE < cycle )
-printk("\n[DBG] %s : thread %x exit in cluster %x / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , local_cxy , cycle );
+if( DEBUG_CLUSTER_PID_ALLOC < cycle )
+printk("\n[%s] thread[%x,%x] exit in cluster %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , local_cxy , cycle );
 #endif
 
@@ -599 +602 @@
 
 #if DEBUG_CLUSTER_PROCESS_COPIES
-uint32_t cycle = (uint32_t)hal_get_cycles();
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
 if( DEBUG_CLUSTER_PROCESS_COPIES < cycle )
-printk("\n[DBG] %s enters / cluster %x / process %x / cycle %d\n",
-__FUNCTION__ , local_cxy , process , cycle );
+printk("\n[%s] thread[%x,%x] enters for process %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , process->pid , cycle );
 #endif
 
@@ -632 +636 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_PROCESS_COPIES < cycle )
-printk("\n[DBG] %s exit / cluster %x / process %x / cycle %d\n",
-__FUNCTION__ , local_cxy , process , cycle );
+printk("\n[%s] thread[%x,%x] exit for process %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , process->pid , cycle );
 #endif
 
@@ -644 +648 @@
 
 #if DEBUG_CLUSTER_PROCESS_COPIES
-uint32_t cycle = (uint32_t)hal_get_cycles();
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
 if( DEBUG_CLUSTER_PROCESS_COPIES < cycle )
-printk("\n[DBG] %s enters / cluster %x / process %x / cycle %d\n",
-__FUNCTION__ , local_cxy , process , cycle );
+printk("\n[%s] thread[%x,%x] enters for process %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , process->pid , cycle );
 #endif
 
@@ -674 +679 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_CLUSTER_PROCESS_COPIES < cycle )
-printk("\n[DBG] %s exit / cluster %x / process %x / cycle %d\n",
-__FUNCTION__ , local_cxy , process , cycle );
+printk("\n[%s] thread[%x,%x] exit for process %x / cycle %d\n",
+__FUNCTION__ , this->process->pid , this->trdid , process->pid , cycle );
 #endif