"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/imm/agent/imma_oi_api.cc" 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.

imma_oi_api.cc  (opensaf-5.21.06):imma_oi_api.cc  (opensaf-5.21.09)
skipping to change at line 189 skipping to change at line 189
cl_node->isImmA2x12 = true; cl_node->isImmA2x12 = true;
} }
} }
} }
} }
} }
} }
} }
} }
if ((timeout_env_value = getenv("IMMA_SYNCR_TIMEOUT")) != NULL) { cl_node->syncr_timeout = imma_getSyncrTimeout();
cl_node->syncr_timeout = atoi(timeout_env_value); TRACE_2("IMMA library syncronous timeout set to:%lld",
TRACE_2("IMMA library syncronous timeout set to:%lld", cl_node->syncr_timeout);
cl_node->syncr_timeout);
}
if (cl_node->syncr_timeout < NCS_SAF_MIN_ACCEPT_TIME) {
cl_node->syncr_timeout = IMMSV_WAIT_TIME; /* Default */
}
if (cl_node->isImmA2e && if (cl_node->isImmA2e &&
(timeout_env_value = getenv("IMMA_OI_CALLBACK_TIMEOUT")) != NULL) { (timeout_env_value = getenv("IMMA_OI_CALLBACK_TIMEOUT")) != NULL) {
char *endp = NULL; char *endp = NULL;
cl_node->oiTimeout = strtol(timeout_env_value, &endp, 10); cl_node->oiTimeout = strtol(timeout_env_value, &endp, 10);
if (!endp || *endp) { if (!endp || *endp) {
TRACE_2( TRACE_2(
"Failed to parse IMMA_OI_CALLBACK_TIMEOUT. " "Failed to parse IMMA_OI_CALLBACK_TIMEOUT. "
"OI timeout will be set to the default value"); "OI timeout will be set to the default value");
cl_node->oiTimeout = 0; cl_node->oiTimeout = 0;
skipping to change at line 311 skipping to change at line 305
locked = true; locked = true;
if (false == cb->is_immnd_up) { if (false == cb->is_immnd_up) {
/*IMMND went down during THIS call! */ /*IMMND went down during THIS call! */
rc = SA_AIS_ERR_TRY_AGAIN; rc = SA_AIS_ERR_TRY_AGAIN;
TRACE_2("ERR_TRY_AGAIN: IMMND is DOWN"); TRACE_2("ERR_TRY_AGAIN: IMMND is DOWN");
goto rsp_not_ok; goto rsp_not_ok;
} }
cl_node->handle = out_evt->info.imma.info.initRsp.immHandle; cl_node->handle = out_evt->info.imma.info.initRsp.immHandle;
SaTimeT timeout = out_evt->info.imma.info.initRsp.syncrTimeout;
if (timeout >= NCS_SAF_MIN_ACCEPT_TIME) {
cl_node->syncr_timeout = timeout;
TRACE_2("IMMA library syncronous timeout set to:%lld",
cl_node->syncr_timeout);
}
TRACE_1("Trying to add OI client id:%u node:%x handle:%llx", TRACE_1("Trying to add OI client id:%u node:%x handle:%llx",
m_IMMSV_UNPACK_HANDLE_HIGH(cl_node->handle), m_IMMSV_UNPACK_HANDLE_HIGH(cl_node->handle),
m_IMMSV_UNPACK_HANDLE_LOW(cl_node->handle), cl_node->handle); m_IMMSV_UNPACK_HANDLE_LOW(cl_node->handle), cl_node->handle);
proc_rc = imma_client_node_add(&cb->client_tree, cl_node); proc_rc = imma_client_node_add(&cb->client_tree, cl_node);
if (proc_rc != NCSCC_RC_SUCCESS) { if (proc_rc != NCSCC_RC_SUCCESS) {
IMMA_CLIENT_NODE *stale_node = NULL; IMMA_CLIENT_NODE *stale_node = NULL;
imma_client_node_get(&cb->client_tree, &(cl_node->handle), &stale_node); imma_client_node_get(&cb->client_tree, &(cl_node->handle), &stale_node);
if ((stale_node != NULL) && stale_node->stale) { if ((stale_node != NULL) && stale_node->stale) {
 End of changes. 2 change blocks. 
9 lines changed or deleted 9 lines changed or added

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