Add status printk's to Initialization service tasks

- branch add_printks

Change-Id: I7bebb7da8d3774df6dab655a567f863757cb2198
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/726
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 43 insertions, 13 deletions

diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C
index fce383372..0dc75b45c 100644
--- a/src/usr/initservice/baseinitsvc/initservice.C
+++ b/src/usr/initservice/baseinitsvc/initservice.C
@@ -30,7 +30,8 @@
  */
 #define __HIDDEN_SYSCALL_SHUTDOWN
 
-#include    <kernel/console.H>
+#include    <kernel/console.H>                  // printk status
+
 #include    <sys/vfs.h>
 #include    <vfs/vfs.H>
 #include    <sys/task.h>
@@ -251,8 +252,10 @@ void InitService::init( void *io_ptr )
     TaskArgs::TaskArgs  l_args;
     uint64_t            l_childrc   =   0;
 
+    printk( "InitService entry.\n" );
+
     TRACFCOMP( g_trac_initsvc,
-               ENTER_MRK "Initialization Service is starting." );
+               ENTER_MRK "Initialization Service is starting %p.", io_ptr );
 
     //  loop through the task list and start up any tasks necessary
     for ( l_task=0;
@@ -352,6 +355,8 @@ void InitService::init( void *io_ptr )
     TRACFCOMP( g_trac_initsvc,
             EXIT_MRK "Initilization Service finished.");
 
+    printk( "InitService exit.\n" );
+
     // return to _start()
 }
 
diff --git a/src/usr/initservice/baseinitsvc/initservicetaskentry.C b/src/usr/initservice/baseinitsvc/initservicetaskentry.C
index 68e5dfcae..eec6eef96 100644
--- a/src/usr/initservice/baseinitsvc/initservicetaskentry.C
+++ b/src/usr/initservice/baseinitsvc/initservicetaskentry.C
@@ -61,8 +61,6 @@ void _start(void *ptr)
     TRACFCOMP( g_trac_initsvc,
             EXIT_MRK "return from Initialization Service module." );
 
-    printk( "Initialization Service terminated.\n" );
-
     task_end();
 }
 
diff --git a/src/usr/initservice/extinitsvc/extinitsvc.C b/src/usr/initservice/extinitsvc/extinitsvc.C
index 9e6402ff1..2db1c44b6 100644
--- a/src/usr/initservice/extinitsvc/extinitsvc.C
+++ b/src/usr/initservice/extinitsvc/extinitsvc.C
@@ -29,7 +29,8 @@
  *
  */
 
-#include    <kernel/console.H>
+#include    <kernel/console.H>              //  printk status
+
 #include    <vfs/vfs.H>
 #include    <sys/task.h>
 #include    <sys/sync.h>
@@ -68,8 +69,12 @@ void ExtInitSvc::init( void *io_ptr )
     INITSERVICE::TaskArgs *pTaskArgs =
             static_cast<INITSERVICE::TaskArgs *>( io_ptr );
 
+    printk( "ExtInitSvc entry.\n" );
+
     TRACFCOMP( g_trac_initsvc,
-            "Extended Initialization Service is starting." );
+            "Extended Initialization Service is starting %p.", io_ptr );
+
+
 
     //  ----------------------------------------------------------------
     //  loop through the task list and start up any tasks necessary
@@ -196,6 +201,8 @@ void ExtInitSvc::init( void *io_ptr )
          *
          */
 
+        printk( "start CxxTest.\n" );
+
         //  add a do-while loop so there is only one return at the bottom....
         do
         {
@@ -279,12 +286,15 @@ void ExtInitSvc::init( void *io_ptr )
 
         }   while(0);   //  end do-while
 
+        printk( "finish CxxTest.\n" );
+
     }
 
 
     //  =====================================================================
     //  -----   Shutdown all CPUs   -----------------------------------------
     //  =====================================================================
+
     TRACFCOMP( g_trac_initsvc,
             EXIT_MRK "CxxTests finished.");
 
@@ -298,8 +308,10 @@ void ExtInitSvc::init( void *io_ptr )
     //Tell initservice to perform shutdown sequence
     InitService::getTheInstance().doShutdown(l_shutdownStatus);
 
-    // return to _start(), which may end the task or die.
-    return;
+    printk( "ExtInitSvc exit.\n" );
+
+
+    // return to _start()
 }
 
 
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index db92142c1..685c314b6 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -38,6 +38,8 @@
 #include    <stdio.h>
 #include    <string.h>
 
+#include    <kernel/console.H>              // printk status
+
 #include    <vfs/vfs.H>                     //  load_module
 #include    <sys/task.h>                    //  tid_t, task_create, etc
 #include    <sys/time.h>                    //  nanosleep
@@ -254,23 +256,32 @@ void IStepDispatcher::init( void * io_ptr )
 
     // initialize (and declare) ISTEPS_TRACE here, the rest of the isteps will use it.
     ISTEPS_TRACE::g_trac_isteps_trace = NULL;
+
+    printk( "IstepDispatcher entry.\n" );
+
     TRAC_INIT(&ISTEPS_TRACE::g_trac_isteps_trace, "ISTEPS_TRACE", 2048 );
 
-    TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "ISTEPS_TRACE buffer %p created.",
-                ISTEPS_TRACE::g_trac_isteps_trace );
+    TRACFCOMP( g_trac_initsvc,
+            "IStep Dispatcher is starting %p.", io_ptr );
+
 
     if ( getIStepMode() )
     {
+        printk( "IStep single-step\n" );
+
         TRACFCOMP( g_trac_initsvc,
                    "IStep single-step enable" );
+
         // IStep single-step
         singleStepISteps( io_ptr );
     }
     else
     {
+        printk( "IStep run-all\n" );
+
         TRACFCOMP( g_trac_initsvc,
                    "IStep run all" );
+
         //  Run all the ISteps sequentially
         runAllISteps( io_ptr );
     }   // endelse
@@ -278,6 +289,10 @@ void IStepDispatcher::init( void * io_ptr )
 
     TRACFCOMP( g_trac_initsvc,
                EXIT_MRK "IStepDispatcher finished.");
+
+    printk( "IStepDispatcher exit.\n" );
+
+    //  return to _start()
 }
 
 
@@ -379,7 +394,7 @@ void    IStepDispatcher::processSingleIStepCmd(
         writeSts( iv_sts );
 
         // handleBreakPoint will need sequence number
-        iv_sts.hdr.seqnum = l_cmd.hdr.seqnum; 
+        iv_sts.hdr.seqnum = l_cmd.hdr.seqnum;
 
 
         /**
@@ -852,7 +867,7 @@ void IStepDispatcher::handleBreakPoint( uint32_t i_info )
 
     iv_sts = l_sts;
     writeSts( iv_sts );
-    
+
     // Poll for cmd to resume
     while(1)
     {