Minor comments that can be fixed at the same time:
- in ImmObjCreate::exec TRACE_ENTER2 becomes anonymous just printing
"exec" as the function name, so we should add "Create" in the text and
some suitable args. Just like in delete::exec
- same comment for ImmObjUpdate::exec, it needs an "Update" text
otherwise it will just trace as "exec"
- the TRACE_ENTER macros in avd_saImmOiRtObjectCreate,
avd_saImmOiRtObjectUpdate, avd_saImmOiRtObjectDelete should be
TRACE_ENTER2 with context (DN, inv, etc)
Do you agree?
Thanks,
Hans
On 31 March 2014 06:32, Gary Lee <gary....@dektech.com.au> wrote:
> osaf/services/saf/amf/amfd/imm.cc | 30 ++----------------------------
> osaf/services/saf/amf/amfd/include/imm.h | 2 +-
> 2 files changed, 3 insertions(+), 29 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/imm.cc
> b/osaf/services/saf/amf/amfd/imm.cc
> --- a/osaf/services/saf/amf/amfd/imm.cc
> +++ b/osaf/services/saf/amf/amfd/imm.cc
> @@ -110,8 +110,6 @@ ImmObjCreate::~ImmObjCreate()
> {
> unsigned int i, j;
>
> - TRACE_ENTER();
> -
> for (i = 0; attrValues_[i] != NULL; i++) {
> SaImmAttrValuesT_2 *attrValue =
> (SaImmAttrValuesT_2 *)attrValues_[i];
> @@ -130,8 +128,6 @@ ImmObjCreate::~ImmObjCreate()
>
> delete [] className_;
> delete [] attrValues_;
> -
> - TRACE_LEAVE();
> }
>
> //
> @@ -180,11 +176,8 @@ AvdJobDequeueResultT ImmObjUpdate::exec(
> //
> ImmObjUpdate::~ImmObjUpdate()
> {
> - TRACE_ENTER();
> delete [] attributeName_;
> delete [] static_cast<char*>(value_);
> - TRACE_LEAVE();
> -
> }
>
> //
> @@ -221,13 +214,6 @@ AvdJobDequeueResultT ImmObjDelete::exec(
> }
>
> //
> -ImmObjDelete::~ImmObjDelete()
> -{
> - TRACE_ENTER();
> - TRACE_LEAVE();
> -}
> -
> -//
> AvdJobDequeueResultT ImmAdminResponse::exec(const SaImmOiHandleT handle) {
> SaAisErrorT rc;
> AvdJobDequeueResultT res;
> @@ -261,27 +247,19 @@ Job* Fifo::peek()
> {
> Job* tmp;
>
> - TRACE_ENTER();
> -
> if (imm_job_.empty()) {
> tmp = 0;
> - }
> - else {
> + } else {
> tmp = imm_job_.front();
> }
>
> - TRACE_LEAVE();
> return tmp;
> }
>
> //
> void Fifo::queue(Job* job)
> {
> - TRACE_ENTER();
> -
> imm_job_.push(job);
> -
> - TRACE_LEAVE();
> }
>
> //
> @@ -289,17 +267,13 @@ Job* Fifo::dequeue()
> {
> Job* tmp;
>
> - TRACE_ENTER();
> -
> if (imm_job_.empty()) {
> tmp = 0;
> - }
> - else {
> + } else {
> tmp = imm_job_.front();
> imm_job_.pop();
> }
>
> - TRACE_LEAVE();
> return tmp;
> }
>
> diff --git a/osaf/services/saf/amf/amfd/include/imm.h
> b/osaf/services/saf/amf/amfd/include/imm.h
> --- a/osaf/services/saf/amf/amfd/include/imm.h
> +++ b/osaf/services/saf/amf/amfd/include/imm.h
> @@ -88,7 +88,7 @@ public:
>
> AvdJobDequeueResultT exec(SaImmOiHandleT immOiHandle);
>
> - ~ImmObjDelete();
> + ~ImmObjDelete() {}
> };
>
> class ImmAdminResponse : public Job {
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Opensaf-devel mailing list
> Opensaf-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
