PRD: added HBRT makefiles

Change-Id: I83ce97b47c9a4723277df1e18a04a6b02b0378c6
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14337
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14583

8 files changed, 129 insertions, 6 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
index cd9c0e3be..5bf4855c3 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C
@@ -99,6 +99,8 @@ namespace Prdr
                 strncat( filePath, ext,    sz_ext  );
 
                 #ifdef __HOSTBOOT_MODULE
+                // TODO: RTC 119022 remove after UtilFile is supported in HBRT
+                #ifndef __HOSTBOOT_RUNTIME
 
                 UtilFile l_ruleFile( filePath );
                 if ( !l_ruleFile.exists() )
@@ -111,6 +113,7 @@ namespace Prdr
                     l_ruleFile.Open("r");
                 }
 
+                #endif
                 #else // not __HOSTBOOT_MODULE
 
                 // Read the correct directory path for flash.
@@ -151,8 +154,11 @@ namespace Prdr
 
                 #endif // end __HOSTBOOT_MODULE
 
+                // TODO: RTC 119022 remove after UtilFile is supported in HBRT
+                #ifndef __HOSTBOOT_RUNTIME
                 // Load chip object.
                 l_errl = LoadChip(l_ruleFile, *(*o_chip));
+                #endif
 
             } while (0);
 
diff --git a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C
index f9739e1ca..e7c047314 100755
--- a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C
+++ b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2009,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -120,8 +122,11 @@ void MfgThresholdMgr::setupFile()
 {
     if(NULL == iv_file)
     {
+// TODO: RTC 118150 Will be refactored.
+#ifndef __HOSTBOOT_RUNTIME
         iv_file = new MfgThresholdFile();
         iv_file->setup();
+#endif
     }
 }
 
diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H b/src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H
index a1be09bf9..2d595d8ba 100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H
+++ b/src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H
@@ -39,7 +39,13 @@
 
 // Other includes
 #include <algorithm>
+// TODO: RTC 119023 remove after deque is supported in HBRT
+#ifdef __HOSTBOOT_RUNTIME
+// deque currently not supported in Hostboot.
+#include <vector>
+#else
 #include <queue>
+#endif
 
 namespace PRDF
 {
@@ -73,8 +79,15 @@ class TdQueue
 {
   public: // typedefs
 
+// TODO: RTC 119023 remove after deque is supported in HBRT
+#ifdef __HOSTBOOT_RUNTIME
+    // deque currently not supported in Hostboot.
+    typedef std::vector<TdQueueEntry>           Queue;
+    typedef std::vector<TdQueueEntry>::iterator QueueItr;
+#else
     typedef std::deque<TdQueueEntry>           Queue;
     typedef std::deque<TdQueueEntry>::iterator QueueItr;
+#endif
 
   public:
 
@@ -133,7 +146,13 @@ class TdQueue
     /**
      * @brief Removes the entry at the beginning of the queue.
      */
+// TODO: RTC 119023 remove after deque is supported in HBRT
+#ifdef __HOSTBOOT_RUNTIME
+    // deque currently not supported in Hostboot.
+    void pop() {}
+#else
     void pop() { iv_queue.pop_front(); }
+#endif
 
     /**
      * @return A constant reference to the queue.
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 23fd6d19e..050773497 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -64,6 +64,8 @@ namespace PlatServices
 
 void getCurrentTime( Timer & o_timer )
 {
+// TODO: RTC 119024 remove after clock_gettime() is supported in HBRT
+#ifndef __HOSTBOOT_RUNTIME
     timespec_t curTime;
     PRDF_ASSERT(0 == clock_gettime(CLOCK_MONOTONIC, &curTime))
 
@@ -72,6 +74,7 @@ void getCurrentTime( Timer & o_timer )
 
     // Since Hostboot doesn't have any system checkstop, we don't have to worry
     // about the detailed time struct for system checkstop timestamp.
+#endif
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index d1eea5634..1ed358a7a 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -26,7 +26,13 @@
 ROOTPATH = ../../../..
 MODULE = prdf
 
-SUBDIRS += framework.d
+SUBDIRS += framework.d  # This will eventually compile the rule code. This only
+                        # needs to be done once and not for both IPL and RT
+						# compiles. This is because compiling the rule code only
+						# generates .prf files, which are compiler independent,
+						# and a few .C files needed for the error log parser,
+						# which is compiled elsewhere.
+SUBDIRS += runtime.d
 SUBDIRS += test.d
 
 ################################################################################
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index 88189613c..142a93a91 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -77,10 +77,6 @@ prd_obj += prdfDumpResolution.o
 prd_obj += prdfPlatServices.o
 prd_obj += prdfRasServices.o
 
-# mnfgtools/
-prd_obj += prdfMfgSync.o
-prd_obj += prdfMfgThresholdFile.o
-
 # plat/pegasus/ (non-rule plugin related)
 prd_obj += prdfPllUtils.o
 
@@ -106,6 +102,10 @@ prd_obj += prdfMbaDomain.o
 # framework/service/
 prd_obj += prdfPlatServices_ipl.o
 
+# mnfgtools/
+prd_obj += prdfMfgSync.o          # TODO: RTC 118150 Will be refactored.
+prd_obj += prdfMfgThresholdFile.o # TODO: RTC 118150 Will be refactored.
+
 # plat/pegasus/ (non-rule plugin related)
 prd_obj += prdfCenMbaIplCeStats.o
 prd_obj += prdfCenMbaTdCtlr_ipl.o
diff --git a/src/usr/diag/prdf/runtime/makefile b/src/usr/diag/prdf/runtime/makefile
new file mode 100644
index 000000000..9cee88060
--- /dev/null
+++ b/src/usr/diag/prdf/runtime/makefile
@@ -0,0 +1,51 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/runtime/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2014
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+HOSTBOOT_RUNTIME = 1
+ROOTPATH = ../../../../..
+MODULE = prdf_rt
+
+SUBDIRS += test.d
+
+################################################################################
+
+# ROOTPATH must be defined before including this file.
+include ../prdf_hb_only.mk  # Will define PRD_SRC_PATH and PRD_INC_PATH
+
+# PRD_SRC_PATH and PRD_INC_PATH must be defined before including this file.
+include ../common/prdf_common_fsp_and_hb.mk
+
+VPATH += ${prd_vpath}
+
+EXTRAINCDIR += ${prd_incpath}
+
+OBJS += ${prd_obj}
+OBJS += ${prd_obj_no_sim}
+OBJS += ${prd_rule_plugin}
+
+################################################################################
+
+include $(ROOTPATH)/config.mk
+
diff --git a/src/usr/diag/prdf/runtime/test/makefile b/src/usr/diag/prdf/runtime/test/makefile
new file mode 100644
index 000000000..182d20ee1
--- /dev/null
+++ b/src/usr/diag/prdf/runtime/test/makefile
@@ -0,0 +1,33 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/runtime/test/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2014
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+HOSTBOOT_RUNTIME = 1
+ROOTPATH = ../../../../../..
+MODULE = testprdf_rt
+
+#TESTS = *.H
+
+include $(ROOTPATH)/config.mk
+