"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/base/ncs_main_pub.c" between
opensaf-5.21.06.tar.gz and opensaf-5.21.09.tar.gz

About: OpenSAF is a project focused on Service Availability (SA) that develops middleware based on open and industry standard interfaces for applications requiring uninterrupted 24x7 service.

ncs_main_pub.c  (opensaf-5.21.06):ncs_main_pub.c  (opensaf-5.21.09)
skipping to change at line 136 skipping to change at line 136
} }
/***************************************************************************\ /***************************************************************************\
PROCEDURE : ncs_leap_startup PROCEDURE : ncs_leap_startup
\***************************************************************************/ \***************************************************************************/
unsigned int ncs_leap_startup(void) unsigned int ncs_leap_startup(void)
{ {
NCS_LIB_REQ_INFO lib_create; NCS_LIB_REQ_INFO lib_create;
NCS_LIB_REQ_INFO lib_destroy;
osaf_mutex_lock_ordie(&s_agent_startup_mutex); osaf_mutex_lock_ordie(&s_agent_startup_mutex);
if (gl_ncs_main_pub_cb.leap_use_count > 0) { if (gl_ncs_main_pub_cb.leap_use_count > 0) {
gl_ncs_main_pub_cb.leap_use_count++; gl_ncs_main_pub_cb.leap_use_count++;
osaf_mutex_unlock_ordie(&s_agent_startup_mutex); osaf_mutex_unlock_ordie(&s_agent_startup_mutex);
return NCSCC_RC_SUCCESS; return NCSCC_RC_SUCCESS;
} }
/* Print the process-id for information sakes */ /* Print the process-id for information sakes */
skipping to change at line 162 skipping to change at line 163
lib_create.info.create.argv = NULL; lib_create.info.create.argv = NULL;
/* Initalize basic services */ /* Initalize basic services */
if (leap_env_init() != NCSCC_RC_SUCCESS) { if (leap_env_init() != NCSCC_RC_SUCCESS) {
TRACE_4("\nERROR: Couldn't initialised LEAP basic services \n"); TRACE_4("\nERROR: Couldn't initialised LEAP basic services \n");
osaf_mutex_unlock_ordie(&s_agent_startup_mutex); osaf_mutex_unlock_ordie(&s_agent_startup_mutex);
return NCSCC_RC_FAILURE; return NCSCC_RC_FAILURE;
} }
if (sprr_lib_req(&lib_create) != NCSCC_RC_SUCCESS) { if (sprr_lib_req(&lib_create) != NCSCC_RC_SUCCESS) {
TRACE_4("\nERROR: SPRR lib_req failed \n"); TRACE_4("\nERROR: SPRR lib_req NCS_LIB_REQ_CREATE failed \n");
osaf_mutex_unlock_ordie(&s_agent_startup_mutex); goto lib_req_fail;
return NCSCC_RC_FAILURE;
} }
/* Get & Update system specific arguments */ /* Get & Update system specific arguments */
if (mainget_node_id(&gl_ncs_main_pub_cb.my_nodeid) != if (mainget_node_id(&gl_ncs_main_pub_cb.my_nodeid) !=
NCSCC_RC_SUCCESS) { NCSCC_RC_SUCCESS) {
TRACE_4("Not able to get the NODE ID\n"); TRACE_4("Not able to get the NODE ID\n");
osaf_mutex_unlock_ordie(&s_agent_startup_mutex); goto get_node_fail;
return NCSCC_RC_FAILURE;
} }
TRACE("NCS:NODE_ID=0x%08X\n", gl_ncs_main_pub_cb.my_nodeid); TRACE("NCS:NODE_ID=0x%08X\n", gl_ncs_main_pub_cb.my_nodeid);
gl_ncs_main_pub_cb.leap_use_count = 1; gl_ncs_main_pub_cb.leap_use_count = 1;
osaf_mutex_unlock_ordie(&s_agent_startup_mutex); osaf_mutex_unlock_ordie(&s_agent_startup_mutex);
/* start initializing all the required agents */ /* start initializing all the required agents */
gl_ncs_main_pub_cb.lib_hdl = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL); gl_ncs_main_pub_cb.lib_hdl = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
return NCSCC_RC_SUCCESS; return NCSCC_RC_SUCCESS;
get_node_fail:
memset(&lib_destroy, 0, sizeof(lib_destroy));
lib_destroy.i_op = NCS_LIB_REQ_DESTROY;
lib_destroy.info.destroy.dummy = 0;
if (sprr_lib_req(&lib_destroy) != NCSCC_RC_SUCCESS)
TRACE_4("\nERROR: SPRR lib_req NCS_LIB_REQ_DESTROY failed\n");
lib_req_fail:
leap_env_destroy();
osaf_mutex_unlock_ordie(&s_agent_startup_mutex);
return NCSCC_RC_FAILURE;
} }
/***************************************************************************\ /***************************************************************************\
PROCEDURE : ncs_mds_startup PROCEDURE : ncs_mds_startup
\***************************************************************************/ \***************************************************************************/
unsigned int ncs_mds_startup(void) unsigned int ncs_mds_startup(void)
{ {
NCS_LIB_REQ_INFO lib_create; NCS_LIB_REQ_INFO lib_create;
 End of changes. 4 change blocks. 
5 lines changed or deleted 16 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)