diff options
-rw-r--r-- | src/usr/diag/mdia/mdiatrace.H | 8 | ||||
-rw-r--r-- | src/usr/diag/mdia/mdiaworkitem.C | 4 | ||||
-rw-r--r-- | src/usr/diag/mdia/mdiaworkitem.H | 6 | ||||
-rw-r--r-- | src/usr/diag/mdia/test/mdiatesttrace.H | 65 | ||||
-rw-r--r-- | src/usr/diag/mdia/test/mdiatestworkitem.H | 10 |
5 files changed, 80 insertions, 13 deletions
diff --git a/src/usr/diag/mdia/mdiatrace.H b/src/usr/diag/mdia/mdiatrace.H index a31ecaace..a46e42bce 100644 --- a/src/usr/diag/mdia/mdiatrace.H +++ b/src/usr/diag/mdia/mdiatrace.H @@ -38,9 +38,9 @@ extern trace_desc_t * slowTd; } -#define MDIA_DBG( _fmt_, _args_...) TRACDCOMP( MDIA::fastTd, INFO_MRK" %s: "_fmt_, ##_args_) -#define MDIA_FAST( _fmt_, _args_...) TRACFCOMP( MDIA::fastTd, INFO_MRK" %s: "_fmt_, ##_args_) -#define MDIA_SLOW( _fmt_, _args_...) TRACFCOMP( MDIA::slowTd, INFO_MRK" %s: "_fmt_, ##_args_) -#define MDIA_ERR( _fmt_, _args_...) TRACFCOMP( MDIA::slowTd, ERR_MRK" %s: "_fmt_, ##_args_) +#define MDIA_DBG( _fmt_, _args_...) TRACDCOMP( MDIA::fastTd, INFO_MRK""_fmt_, ##_args_) +#define MDIA_FAST( _fmt_, _args_...) TRACFCOMP( MDIA::fastTd, INFO_MRK""_fmt_, ##_args_) +#define MDIA_SLOW( _fmt_, _args_...) TRACFCOMP( MDIA::slowTd, INFO_MRK""_fmt_, ##_args_) +#define MDIA_ERR( _fmt_, _args_...) TRACFCOMP( MDIA::slowTd, ERR_MRK""_fmt_, ##_args_) #endif diff --git a/src/usr/diag/mdia/mdiaworkitem.C b/src/usr/diag/mdia/mdiaworkitem.C index d2b59e641..f5a764ae8 100644 --- a/src/usr/diag/mdia/mdiaworkitem.C +++ b/src/usr/diag/mdia/mdiaworkitem.C @@ -41,7 +41,7 @@ void WorkItem::operator()() iv_sm.executeWorkItem(iv_target, iv_workFlowPhase); } -int32_t WorkItem::compare(const WorkItem & i_r) const +int64_t WorkItem::compare(const WorkItem & i_r) const { // schedule based on state machine computed priority @@ -66,7 +66,7 @@ int32_t WorkItem::compare(const WorkItem & i_r) const WorkItem::WorkItem(StateMachine & i_sm, WorkFlowPhase i_workFlowPhase, TargetHandle_t i_target, - uint32_t i_priority) : + uint64_t i_priority) : iv_sm(i_sm), iv_workFlowPhase(i_workFlowPhase), iv_target(i_target), diff --git a/src/usr/diag/mdia/mdiaworkitem.H b/src/usr/diag/mdia/mdiaworkitem.H index 7332ccaf7..655d99850 100644 --- a/src/usr/diag/mdia/mdiaworkitem.H +++ b/src/usr/diag/mdia/mdiaworkitem.H @@ -54,7 +54,7 @@ class WorkItem * @retval 1 i_rhs < this * @retval 0 i_rhs !< this && this !< i_rhs */ - int32_t compare(const WorkItem & i_rhs) const; + int64_t compare(const WorkItem & i_rhs) const; /** * @brief ctor @@ -68,7 +68,7 @@ class WorkItem * @param[in] i_priority work item priority */ WorkItem(StateMachine & i_sm, WorkFlowPhase i_phase, - TARGETING::TargetHandle_t i_target, uint32_t i_priority); + TARGETING::TargetHandle_t i_target, uint64_t i_priority); private: @@ -90,7 +90,7 @@ class WorkItem /** * @brief the scheduling priority for the work item */ - uint32_t iv_priority; + uint64_t iv_priority; /** * @brief copy disabled diff --git a/src/usr/diag/mdia/test/mdiatesttrace.H b/src/usr/diag/mdia/test/mdiatesttrace.H new file mode 100644 index 000000000..7fc6530b7 --- /dev/null +++ b/src/usr/diag/mdia/test/mdiatesttrace.H @@ -0,0 +1,65 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/usr/diag/mdia/test/mdiatesttrace.H $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +#ifndef __TEST_MDIATESTTRACE_H +#define __TEST_MDIATESTTRACE_H + +/** + * @file mdiatesttrace.H + * @brief mdia trace unit test + */ + +#include <builtins.h> +#include <cxxtest/TestSuite.H> +#include <targeting/target.H> +#include "../mdiatrace.H" + +class MdiaTraceTest : public CxxTest::TestSuite +{ + public: + + void testTrace(void) + { + using namespace MDIA; + + TS_TRACE(ENTER_MRK "testTrace"); + + MDIA_FAST("mdia trace unit test"); + MDIA_FAST("mdia trace unit test: %p", 0); + MDIA_FAST("mdia trace unit test: %d", 1234); + + MDIA_DBG("mdia trace unit test"); + MDIA_DBG("mdia trace unit test: %p", 0); + MDIA_DBG("mdia trace unit test: %d", 1234); + + MDIA_ERR("mdia trace unit test"); + MDIA_ERR("mdia trace unit test: %p", 0); + MDIA_ERR("mdia trace unit test: %d", 1234); + + MDIA_SLOW("mdia trace unit test"); + MDIA_SLOW("mdia trace unit test: %p", 0); + MDIA_SLOW("mdia trace unit test: %d", 1234); + + TS_TRACE(EXIT_MRK "testTrace"); + } +}; +#endif diff --git a/src/usr/diag/mdia/test/mdiatestworkitem.H b/src/usr/diag/mdia/test/mdiatestworkitem.H index 6b86dcd67..2fb9a209e 100644 --- a/src/usr/diag/mdia/test/mdiatestworkitem.H +++ b/src/usr/diag/mdia/test/mdiatestworkitem.H @@ -43,7 +43,7 @@ class MdiaWorkItemTest : public CxxTest::TestSuite using namespace MDIA; using namespace TARGETING; - TS_TRACE(ENTER_MRK __FUNCTION__); + TS_TRACE(ENTER_MRK "testWorkItem"); StateMachine s; @@ -52,15 +52,17 @@ class MdiaWorkItemTest : public CxxTest::TestSuite WorkItem wi1(s, START_SCRUB, target, 2222), wi2(s, START_SCRUB, target, 1111); - if(wi2 < wi1) { + if(wi2 < wi1) + { TS_FAIL("wi2 < wi1"); } - if(!(wi1 < wi2)) { + if(!(wi1 < wi2)) + { TS_FAIL("wi1 !< wi2"); } - TS_TRACE(EXIT_MRK __FUNCTION__); + TS_TRACE(EXIT_MRK "testWorkItem"); } }; #endif |