"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/imm/agent/imma_om_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_om_api.cc  (opensaf-5.21.06):imma_om_api.cc  (opensaf-5.21.09)
skipping to change at line 238 skipping to change at line 238
} }
static SaAisErrorT initialize_common(SaImmHandleT *immHandle, static SaAisErrorT initialize_common(SaImmHandleT *immHandle,
IMMA_CLIENT_NODE *cl_node, IMMA_CLIENT_NODE *cl_node,
SaVersionT *version) { SaVersionT *version) {
IMMA_CB *cb = &imma_cb; IMMA_CB *cb = &imma_cb;
SaAisErrorT rc = SA_AIS_OK; SaAisErrorT rc = SA_AIS_OK;
IMMSV_EVT init_evt; IMMSV_EVT init_evt;
IMMSV_EVT *out_evt = NULL; IMMSV_EVT *out_evt = NULL;
bool locked = true; bool locked = true;
char *timeout_env_value = NULL;
char *value; char *value;
TRACE_ENTER(); TRACE_ENTER();
osafassert(immHandle && cl_node); osafassert(immHandle && cl_node);
uint32_t proc_rc = imma_startup(NCSMDS_SVC_ID_IMMA_OM); uint32_t proc_rc = imma_startup(NCSMDS_SVC_ID_IMMA_OM);
if (NCSCC_RC_SUCCESS != proc_rc) { if (NCSCC_RC_SUCCESS != proc_rc) {
TRACE_4("ERR_LIBRARY: imma startup failed:%u", proc_rc); TRACE_4("ERR_LIBRARY: imma startup failed:%u", proc_rc);
rc = SA_AIS_ERR_LIBRARY; rc = SA_AIS_ERR_LIBRARY;
goto end; goto end;
} }
skipping to change at line 262 skipping to change at line 261
rc = SA_AIS_ERR_TRY_AGAIN; rc = SA_AIS_ERR_TRY_AGAIN;
goto end; goto end;
} }
if (cl_node->isImmA2x12 && !cb->clmMemberNode) { if (cl_node->isImmA2x12 && !cb->clmMemberNode) {
TRACE_2("SA_AIS_ERR_UNAVAILABLE: imma CLM node left the cluster"); TRACE_2("SA_AIS_ERR_UNAVAILABLE: imma CLM node left the cluster");
rc = SA_AIS_ERR_UNAVAILABLE; rc = SA_AIS_ERR_UNAVAILABLE;
goto clm_left; goto clm_left;
} }
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 */
}
*immHandle = 0; *immHandle = 0;
if (m_NCS_LOCK(&cb->cb_lock, NCS_LOCK_WRITE) != NCSCC_RC_SUCCESS) { if (m_NCS_LOCK(&cb->cb_lock, NCS_LOCK_WRITE) != NCSCC_RC_SUCCESS) {
TRACE_4("ERR_LIBRARY: Lock failed"); TRACE_4("ERR_LIBRARY: Lock failed");
rc = SA_AIS_ERR_LIBRARY; rc = SA_AIS_ERR_LIBRARY;
goto end; goto end;
} }
/* locked == true already */ /* locked == true already */
skipping to change at line 362 skipping to change at line 355
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_3("ERR_TRY_AGAIN: IMMND is DOWN"); TRACE_3("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;
cl_node->isOm = true; cl_node->isOm = true;
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);
}
cl_node->maxSearchHandles = 100; cl_node->maxSearchHandles = 100;
if ((value = getenv("IMMA_MAX_OPEN_SEARCHES_PER_HANDLE"))) { if ((value = getenv("IMMA_MAX_OPEN_SEARCHES_PER_HANDLE"))) {
char *endptr; char *endptr;
uint32_t n = (uint32_t)strtol(value, &endptr, 10); uint32_t n = (uint32_t)strtol(value, &endptr, 10);
if (*value && !*endptr) if (*value && !*endptr)
cl_node->maxSearchHandles = n; cl_node->maxSearchHandles = n;
else else
LOG_WA( LOG_WA(
"IMMA_MAX_OPEN_SEARCHES_PER_HANDLE contains non-valid number value. Set default value (100)"); "IMMA_MAX_OPEN_SEARCHES_PER_HANDLE contains non-valid number value. Set default value (100)");
 End of changes. 3 change blocks. 
10 lines changed or deleted 9 lines changed or added

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