osaf/services/saf/smfsv/smfd/smfd_amf.c          |  33 ++++++++-----
 osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc |  57 ++++++++++++-----------
 osaf/services/saf/smfsv/smfd/smfd_main.c         |   6 --
 3 files changed, 48 insertions(+), 48 deletions(-)


The OI handle is initilaized when SA_AMF_HA_ACTIVE is received.
The OI handle is finalized when SA_AMF_HA_QUIESCED is received

diff --git a/osaf/services/saf/smfsv/smfd/smfd_amf.c 
b/osaf/services/saf/smfsv/smfd/smfd_amf.c
--- a/osaf/services/saf/smfsv/smfd/smfd_amf.c
+++ b/osaf/services/saf/smfsv/smfd/smfd_amf.c
@@ -20,6 +20,7 @@
  */
 
 #include "smfd.h"
+#include "immutil.h"
 
 /****************************************************************************
  * Name          : amf_active_state_handler
@@ -37,26 +38,30 @@
 static SaAisErrorT amf_active_state_handler(smfd_cb_t * cb,
                                            SaInvocationT invocation)
 {
-       SaAisErrorT result = SA_AIS_OK;
-
+       SaAisErrorT rc = SA_AIS_OK;
        TRACE_ENTER2("HA ACTIVE request");
-
        cb->mds_role = V_DEST_RL_ACTIVE;
 
-        //Read the SMF config object in case it was changed after SMF start
-        //If changed after start, only the active side was notified
-        read_config_and_set_control_block(smfd_cb);
+        //Initialize the OI handle and get the selection object
+        if (campaign_oi_init(cb) != NCSCC_RC_SUCCESS) {
+                LOG_ER("campaign_oi_init FAIL");
+               rc = SA_AIS_ERR_FAILED_OPERATION;
+        }
 
-       if (campaign_oi_activate(cb) != NCSCC_RC_SUCCESS) {
-               LOG_ER("amf_active_state_handler oi activate FAILED");
-               result = SA_AIS_ERR_FAILED_OPERATION;
+       //Read SMF configuration data and set cb data structure
+       if (read_config_and_set_control_block(cb) != NCSCC_RC_SUCCESS) {
+               LOG_ER("read_config_and_set_control_block FAIL");
+               rc = SA_AIS_ERR_FAILED_OPERATION;
        }
 
-       goto done;
+        //Set class implementers, recreate campaign objects and start 
callbackUtil thread
+       if (campaign_oi_activate(cb) != NCSCC_RC_SUCCESS) {
+               LOG_ER("amf_active_state_handler oi activate FAIL");
+               rc = SA_AIS_ERR_FAILED_OPERATION;
+       }
 
- done:
        TRACE_LEAVE();
-       return result;
+       return rc;
 }
 
 /****************************************************************************
@@ -128,9 +133,9 @@ static SaAisErrorT amf_quiesced_state_ha
        V_DEST_RL mds_role;
        SaAisErrorT rc = SA_AIS_OK;
 
-       /* Give up our IMM OI implementer role */
+       /* Terminate threads and finalize the OI handle */
        if (campaign_oi_deactivate(cb) != NCSCC_RC_SUCCESS) {
-               LOG_ER("amf_quiesced_state_handler oi deactivate FAILED");
+               LOG_NO("amf_quiesced_state_handler oi deactivate FAILED, 
continue");
        }
 
        /*
diff --git a/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc 
b/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc
--- a/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc
+++ b/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc
@@ -650,30 +650,6 @@ uint32_t campaign_oi_deactivate(smfd_cb_
        SaAisErrorT rc = SA_AIS_OK;
        TRACE_ENTER();
 
-       rc = immutil_saImmOiClassImplementerRelease(cb->campaignOiHandle, 
campaignClassName);
-       if (rc != SA_AIS_OK) {
-               TRACE("immutil_saImmOiClassImplementerRelease fail, rc = %d, 
classname=%s", rc, (char*)campaignClassName);
-               return NCSCC_RC_FAILURE;
-       }
-
-       rc = immutil_saImmOiClassImplementerRelease(cb->campaignOiHandle, 
smfConfigClassName);
-       if (rc != SA_AIS_OK) {
-               TRACE("immutil_saImmOiClassImplementerRelease fail, rc = %d, 
classname=%s", rc, (char*)smfConfigClassName);
-               return NCSCC_RC_FAILURE;
-       }
-
-       rc = immutil_saImmOiClassImplementerRelease(cb->campaignOiHandle, 
smfSwBundleClassName);
-       if (rc != SA_AIS_OK) {
-               TRACE("immutil_saImmOiClassImplementerRelease fail, rc = %d, 
classname=%s", rc, (char*)smfSwBundleClassName);
-               return NCSCC_RC_FAILURE;
-       }
-
-       rc = immutil_saImmOiImplementerClear(cb->campaignOiHandle);
-       if (rc != SA_AIS_OK) {
-               TRACE("immutil_saImmOiImplementerClear fail, rc = %d", rc);
-               return NCSCC_RC_FAILURE;
-       }
-
        /* We should terminate all threads (if exists) */
        /* and remove all local Campaign objects */
        SmfCampaignThread::terminate();
@@ -684,6 +660,34 @@ uint32_t campaign_oi_deactivate(smfd_cb_
        /* Stop the callback util thread */
        SmfCbkUtilThread::terminate();
 
+        /* 
+        Release all OI implementer information.
+        Since there may be a campaign ongoing, proceed even if the release 
fail.
+        Do not fail the campaign.
+        */
+       rc = immutil_saImmOiClassImplementerRelease(cb->campaignOiHandle, 
campaignClassName);
+       if (rc != SA_AIS_OK) {
+               LOG_NO("immutil_saImmOiClassImplementerRelease fail, rc = %d, 
classname=%s, continue", rc, (char*)campaignClassName);
+       }
+
+       rc = immutil_saImmOiClassImplementerRelease(cb->campaignOiHandle, 
smfConfigClassName);
+       if (rc != SA_AIS_OK) {
+               LOG_NO("immutil_saImmOiClassImplementerRelease fail, rc = %d, 
classname=%s, continue", rc, (char*)smfConfigClassName);
+       }
+
+       rc = immutil_saImmOiClassImplementerRelease(cb->campaignOiHandle, 
smfSwBundleClassName);
+       if (rc != SA_AIS_OK) {
+               LOG_NO("immutil_saImmOiClassImplementerRelease fail, rc = %d, 
classname=%s, continue", rc, (char*)smfSwBundleClassName);
+       }
+
+        /* Finalize the OI handle. This will also clear the implementer 
(saImmOiImplementerClear)*/
+       rc = immutil_saImmOiFinalize(cb->campaignOiHandle);
+       if (rc != SA_AIS_OK) {
+               LOG_NO("immutil_saImmOmFinalize fail, rc = %d, continue", rc);
+       } else {
+                cb->campaignOiHandle = 0;
+        }
+
        TRACE_LEAVE();
        return NCSCC_RC_SUCCESS;
 }
@@ -695,7 +699,6 @@ uint32_t campaign_oi_deactivate(smfd_cb_
 uint32_t campaign_oi_init(smfd_cb_t * cb)
 {
        SaAisErrorT rc;
-       SmfImmUtils immutil;
 
        TRACE_ENTER();
        rc = immutil_saImmOiInitialize_2(&cb->campaignOiHandle, &callbacks, 
&immVersion);
@@ -710,10 +713,8 @@ uint32_t campaign_oi_init(smfd_cb_t * cb
                return NCSCC_RC_FAILURE;
        }
 
-       /* Read SMF configuration data and set cb data structure */
-       uint32_t ret = read_config_and_set_control_block(cb);
        TRACE_LEAVE();
-       return ret;
+       return NCSCC_RC_SUCCESS;
 }
 
 /**
diff --git a/osaf/services/saf/smfsv/smfd/smfd_main.c 
b/osaf/services/saf/smfsv/smfd/smfd_main.c
--- a/osaf/services/saf/smfsv/smfd/smfd_main.c
+++ b/osaf/services/saf/smfsv/smfd/smfd_main.c
@@ -199,12 +199,6 @@ static uint32_t initialize_smfd(void)
                return rc;
        }
 
-       /* Init campaign OI */
-       if ((rc = campaign_oi_init(smfd_cb)) != NCSCC_RC_SUCCESS) {
-               TRACE("campaign_oi_init FAILED %d", rc);
-               return rc;
-       }
-
        /* Init with AMF */
        if ((rc = smfd_amf_init(smfd_cb)) != NCSCC_RC_SUCCESS) {
                LOG_ER("init amf failed");

------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to