osaf/libs/agents/saf/cpa/cpa_api.c | 18 +++++-------------
osaf/libs/agents/saf/cpa/cpa_mds.c | 2 +-
osaf/libs/agents/saf/cpa/cpa_tmr.c | 6 +++---
osaf/libs/common/cpsv/include/cpa_mds.h | 2 +-
osaf/libs/common/cpsv/include/cpa_tmr.h | 2 +-
osaf/libs/common/cpsv/include/cpd_mds.h | 2 +-
osaf/libs/common/cpsv/include/cpd_tmr.h | 2 +-
osaf/libs/common/cpsv/include/cpnd_init.h | 4 ++--
osaf/services/saf/cpsv/cpd/cpd_mds.c | 2 +-
osaf/services/saf/cpsv/cpd/cpd_tmr.c | 6 +++---
osaf/services/saf/cpsv/cpnd/cpnd_mds.c | 4 ++--
osaf/services/saf/cpsv/cpnd/cpnd_proc.c | 2 +-
osaf/services/saf/cpsv/cpnd/cpnd_tmr.c | 4 ++--
13 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/osaf/libs/agents/saf/cpa/cpa_api.c
b/osaf/libs/agents/saf/cpa/cpa_api.c
--- a/osaf/libs/agents/saf/cpa/cpa_api.c
+++ b/osaf/libs/agents/saf/cpa/cpa_api.c
@@ -868,7 +868,7 @@ SaAisErrorT saCkptCheckpointOpen(SaCkptH
CPA_CLIENT_NODE *cl_node = NULL;
uint32_t proc_rc = NCSCC_RC_SUCCESS;
bool locked = false;
- uint32_t time_out=0;
+ SaTimeT time_out=0;
CPA_GLOBAL_CKPT_NODE *gc_node = NULL;
TRACE_ENTER2("SaCkptCheckpointHandleT passed is %llx",ckptHandle);
@@ -894,15 +894,7 @@ SaAisErrorT saCkptCheckpointOpen(SaCkptH
TRACE_LEAVE2("API return code = %u", rc);
return SA_AIS_ERR_INVALID_PARAM;
} else if (timeout > ( SA_TIME_ONE_MILLISECOND *
MDS_MAX_TIMEOUT_MILLISECOND)) {
- /* Unfortunately the current MDS transport support only
uint32_t type variable (232-1) for timeout parameter ,
- even though SAF APIS supports SaTimeT (SaInt64T) type
(263-1).
- So as work around currently if SAF API receives the higher
value then uint32_t (232-1) that it can hold , form now
- implicitly set to max MDS supported value (4294967295 *
10000000) , which is already very large impractical value.
-
- In Future solution : `[ticket:#1658] mds : Opensf transport
should adopt the size of the
- timeout parameter from 32 bits to 64 bits` will resolve the
issue by matching both MDS transport and SAF API's
- */
- TRACE_4("Cpa CkptOpen: timeout > MDS_MAX_TIMEOUT setting to MDS
max timeout value:%llu,ckptHandle:%llx",
+ TRACE_4("Cpa CkptOpen: timeout > MDS_MAX_TIMEOUT setting to MDS
max timeout value:%lld,ckptHandle:%llx",
(SA_TIME_ONE_MILLISECOND *
MDS_MAX_TIMEOUT_MILLISECOND) , ckptHandle);
timeout = (SA_TIME_ONE_MILLISECOND *
MDS_MAX_TIMEOUT_MILLISECOND);
}
@@ -2201,7 +2193,7 @@ SaAisErrorT saCkptSectionCreate(SaCkptCh
bool gen_sec_flag = false;
SaCkptSectionIdT app_ptr;
CPA_CLIENT_NODE *cl_node = NULL;
- uint32_t time_out;
+ SaTimeT time_out;
TRACE_ENTER2("SaCkptCheckpointHandleT passed is %llx",checkpointHandle);
/* Validate the Input Parameters */
@@ -3402,7 +3394,7 @@ SaAisErrorT saCkptCheckpointWrite(SaCkpt
CPA_CLIENT_NODE *cl_node = NULL;
SaSizeT all_ioVector_size = 0;
uint32_t err_flag = 0;
- uint32_t time_out;
+ SaTimeT time_out;
TRACE_ENTER2("SaCkptCheckpointHandleT passed is %llx",checkpointHandle);
@@ -3623,7 +3615,7 @@ SaAisErrorT saCkptSectionOverwrite(SaCkp
CPA_GLOBAL_CKPT_NODE *gc_node = NULL;
bool add_flag = false;
CPA_CLIENT_NODE *cl_node = NULL;
- uint32_t time_out;
+ SaTimeT time_out;
TRACE_ENTER2("SaCkptCheckpointHandleT passed is %llx",checkpointHandle);
memset(&ckpt_data, '\0', sizeof(CPSV_CKPT_DATA));
diff --git a/osaf/libs/agents/saf/cpa/cpa_mds.c
b/osaf/libs/agents/saf/cpa/cpa_mds.c
--- a/osaf/libs/agents/saf/cpa/cpa_mds.c
+++ b/osaf/libs/agents/saf/cpa/cpa_mds.c
@@ -738,7 +738,7 @@ static uint32_t cpa_mds_dec(CPA_CB *cb,
Notes : None.
******************************************************************************/
-uint32_t cpa_mds_msg_sync_send(uint32_t cpa_mds_hdl, MDS_DEST *destination,
CPSV_EVT *i_evt, CPSV_EVT **o_evt, uint32_t timeout)
+uint32_t cpa_mds_msg_sync_send(uint32_t cpa_mds_hdl, MDS_DEST *destination,
CPSV_EVT *i_evt, CPSV_EVT **o_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
uint32_t rc;
diff --git a/osaf/libs/agents/saf/cpa/cpa_tmr.c
b/osaf/libs/agents/saf/cpa/cpa_tmr.c
--- a/osaf/libs/agents/saf/cpa/cpa_tmr.c
+++ b/osaf/libs/agents/saf/cpa/cpa_tmr.c
@@ -76,18 +76,18 @@ void cpa_timer_expiry(NCSCONTEXT uarg)
* Description : This function which is used to start the CPA Timer
*
*****************************************************************************/
-uint32_t cpa_tmr_start(CPA_TMR *tmr, uint32_t duration)
+uint32_t cpa_tmr_start(CPA_TMR *tmr, SaTimeT duration)
{
if (tmr->tmr_id == TMR_T_NULL) {
m_NCS_TMR_CREATE(tmr->tmr_id, duration, cpa_timer_expiry, (void
*)tmr);
}
if (tmr->is_active == false) {
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
cpa_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, cpa_timer_expiry, (void
*)tmr);
tmr->is_active = true;
} else {
m_NCS_TMR_STOP(tmr->tmr_id);
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
cpa_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, cpa_timer_expiry, (void
*)tmr);
}
return (NCSCC_RC_SUCCESS);
diff --git a/osaf/libs/common/cpsv/include/cpa_mds.h
b/osaf/libs/common/cpsv/include/cpa_mds.h
--- a/osaf/libs/common/cpsv/include/cpa_mds.h
+++ b/osaf/libs/common/cpsv/include/cpa_mds.h
@@ -37,7 +37,7 @@ uint32_t cpa_mds_callback(struct ncsmds_
uint32_t cpa_mds_register(CPA_CB *cb);
void cpa_mds_unregister(CPA_CB *cb);
uint32_t cpa_mds_msg_sync_send(uint32_t cpa_mds_hdl,
- MDS_DEST *destination, CPSV_EVT *i_evt,
CPSV_EVT **o_evt, uint32_t timeout);
+ MDS_DEST *destination, CPSV_EVT *i_evt,
CPSV_EVT **o_evt, SaTimeT timeout);
uint32_t cpa_mds_msg_send(uint32_t cpa_mds_hdl, MDS_DEST *destination,
CPSV_EVT *i_evt, uint32_t to_svc);
#endif /* CPA_DL_API_H */
diff --git a/osaf/libs/common/cpsv/include/cpa_tmr.h
b/osaf/libs/common/cpsv/include/cpa_tmr.h
--- a/osaf/libs/common/cpsv/include/cpa_tmr.h
+++ b/osaf/libs/common/cpsv/include/cpa_tmr.h
@@ -47,7 +47,7 @@ typedef struct cpa_tmr {
} info;
} CPA_TMR;
-uint32_t cpa_tmr_start(CPA_TMR *tmr, uint32_t duration);
+uint32_t cpa_tmr_start(CPA_TMR *tmr, SaTimeT duration);
void cpa_tmr_stop(CPA_TMR *tmr);
void cpa_cb_dump(void);
void cpa_timer_expiry(NCSCONTEXT uarg);
diff --git a/osaf/libs/common/cpsv/include/cpd_mds.h
b/osaf/libs/common/cpsv/include/cpd_mds.h
--- a/osaf/libs/common/cpsv/include/cpd_mds.h
+++ b/osaf/libs/common/cpsv/include/cpd_mds.h
@@ -38,7 +38,7 @@ uint32_t cpd_mds_register(CPD_CB *cb);
void cpd_mds_unregister(CPD_CB *cb);
uint32_t cpd_mds_callback(struct ncsmds_callback_info *info);
uint32_t cpd_mds_msg_sync_send(CPD_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
- CPSV_EVT *i_evt, CPSV_EVT **o_evt,
uint32_t timeout);
+ CPSV_EVT *i_evt, CPSV_EVT **o_evt, SaTimeT
timeout);
uint32_t cpd_mds_msg_send(CPD_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
CPSV_EVT *evt);
diff --git a/osaf/libs/common/cpsv/include/cpd_tmr.h
b/osaf/libs/common/cpsv/include/cpd_tmr.h
--- a/osaf/libs/common/cpsv/include/cpd_tmr.h
+++ b/osaf/libs/common/cpsv/include/cpd_tmr.h
@@ -36,7 +36,7 @@ typedef struct cpd_tmr {
} info;
} CPD_TMR;
-uint32_t cpd_tmr_start(CPD_TMR *tmr, uint32_t duration);
+uint32_t cpd_tmr_start(CPD_TMR *tmr, SaTimeT duration);
void cpd_timer_expiry(NCSCONTEXT uarg);
void cpd_tmr_stop(CPD_TMR *tmr);
diff --git a/osaf/libs/common/cpsv/include/cpnd_init.h
b/osaf/libs/common/cpsv/include/cpnd_init.h
--- a/osaf/libs/common/cpsv/include/cpnd_init.h
+++ b/osaf/libs/common/cpsv/include/cpnd_init.h
@@ -195,9 +195,9 @@ void cpnd_tmr_stop(CPND_TMR *tmr);
/* File : --- cpnd_mds.c */
uint32_t cpnd_mds_send_rsp(CPND_CB *cb, CPSV_SEND_INFO *s_info, CPSV_EVT *evt);
uint32_t cpnd_mds_msg_sync_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
- CPSV_EVT *i_evt, CPSV_EVT **o_evt, uint32_t
timeout);
+ CPSV_EVT *i_evt, CPSV_EVT **o_evt, SaTimeT
timeout);
uint32_t cpnd_mds_msg_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
CPSV_EVT *evt);
-uint32_t cpnd_mds_msg_sync_ack_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST
to_dest, CPSV_EVT *evt, uint32_t timeout);
+uint32_t cpnd_mds_msg_sync_ack_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST
to_dest, CPSV_EVT *evt, SaTimeT timeout);
uint32_t cpnd_mds_register(CPND_CB *cb);
void cpnd_mds_unregister(CPND_CB *cb);
uint32_t cpnd_mds_get_handle(CPND_CB *cb);
diff --git a/osaf/services/saf/cpsv/cpd/cpd_mds.c
b/osaf/services/saf/cpsv/cpd/cpd_mds.c
--- a/osaf/services/saf/cpsv/cpd/cpd_mds.c
+++ b/osaf/services/saf/cpsv/cpd/cpd_mds.c
@@ -684,7 +684,7 @@ uint32_t cpd_mds_send_rsp(CPD_CB *cb, CP
Notes : None.
******************************************************************************/
uint32_t cpd_mds_msg_sync_send(CPD_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
- CPSV_EVT *i_evt, CPSV_EVT **o_evt, uint32_t timeout)
+ CPSV_EVT *i_evt, CPSV_EVT **o_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
diff --git a/osaf/services/saf/cpsv/cpd/cpd_tmr.c
b/osaf/services/saf/cpsv/cpd/cpd_tmr.c
--- a/osaf/services/saf/cpsv/cpd/cpd_tmr.c
+++ b/osaf/services/saf/cpsv/cpd/cpd_tmr.c
@@ -88,18 +88,18 @@ void cpd_timer_expiry(NCSCONTEXT uarg)
* Description : This function which is used to start the CPD Timer
*
*****************************************************************************/
-uint32_t cpd_tmr_start(CPD_TMR *tmr, uint32_t duration)
+uint32_t cpd_tmr_start(CPD_TMR *tmr, SaTimeT duration)
{
if (tmr->tmr_id == TMR_T_NULL) {
m_NCS_TMR_CREATE(tmr->tmr_id, duration, cpd_timer_expiry, (void
*)tmr);
}
if (tmr->is_active == false) {
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
cpd_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, cpd_timer_expiry, (void
*)tmr);
tmr->is_active = true;
} else {
m_NCS_TMR_STOP(tmr->tmr_id);
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
cpd_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, cpd_timer_expiry, (void
*)tmr);
}
return (NCSCC_RC_SUCCESS);
diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
b/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
--- a/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
+++ b/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
@@ -1044,7 +1044,7 @@ uint32_t cpnd_mds_send_rsp(CPND_CB *cb,
Notes : None.
******************************************************************************/
uint32_t cpnd_mds_msg_sync_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST to_dest,
- CPSV_EVT *i_evt, CPSV_EVT **o_evt, uint32_t
timeout)
+ CPSV_EVT *i_evt, CPSV_EVT **o_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
uint32_t rc;
@@ -1203,7 +1203,7 @@ uint32_t cpnd_mds_msg_send(CPND_CB *cb,
*
* Notes : None.
*****************************************************************************/
-uint32_t cpnd_mds_msg_sync_ack_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST
to_dest, CPSV_EVT *i_evt, uint32_t timeout)
+uint32_t cpnd_mds_msg_sync_ack_send(CPND_CB *cb, uint32_t to_svc, MDS_DEST
to_dest, CPSV_EVT *i_evt, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
uint32_t rc;
diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_proc.c
b/osaf/services/saf/cpsv/cpnd/cpnd_proc.c
--- a/osaf/services/saf/cpsv/cpnd/cpnd_proc.c
+++ b/osaf/services/saf/cpsv/cpnd/cpnd_proc.c
@@ -1302,7 +1302,7 @@ cpnd_proc_update_remote(CPND_CB *cb, CPN
CPSV_CPND_ALL_REPL_EVT_NODE *all_repl_evt = NULL;
CPSV_CPND_UPDATE_DEST *new = NULL, *head = NULL;
uint32_t rc = NCSCC_RC_SUCCESS;
- uint32_t timeout = 0;
+ SaTimeT timeout = 0;
SaSizeT datasize = 0;
TRACE_ENTER();
diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_tmr.c
b/osaf/services/saf/cpsv/cpnd/cpnd_tmr.c
--- a/osaf/services/saf/cpsv/cpnd/cpnd_tmr.c
+++ b/osaf/services/saf/cpsv/cpnd/cpnd_tmr.c
@@ -130,11 +130,11 @@ uint32_t cpnd_tmr_start(CPND_TMR *tmr, S
}
if (tmr->is_active == false) {
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
cpnd_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, cpnd_timer_expiry, (void
*)tmr);
tmr->is_active = true;
} else if (tmr->is_active == true) {
m_NCS_TMR_STOP(tmr->tmr_id);
- m_NCS_TMR_START(tmr->tmr_id, (uint32_t)duration,
cpnd_timer_expiry, (void *)tmr);
+ m_NCS_TMR_START(tmr->tmr_id, duration, cpnd_timer_expiry, (void
*)tmr);
}
return (NCSCC_RC_SUCCESS);
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. http://sdm.link/zohodev2dev
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
