osaf/libs/core/include/mds_papi.h | 14 +++++++-------
osaf/libs/core/mds/include/mds_dl_api.h | 4 ++--
osaf/libs/core/mds/mds_c_api.c | 2 +-
osaf/libs/core/mds/mds_c_sndrcv.c | 7 ++++---
osaf/libs/core/mds/mds_main.c | 4 ++--
osaf/services/infrastructure/dtms/dtm/dtm_main.c | 2 +-
osaf/services/infrastructure/dtms/dtm/dtm_read_config.c | 2 +-
osaf/services/infrastructure/dtms/include/dtm_cb.h | 2 +-
tests/mds/mdstipc.h | 14 +++++++-------
tests/mds/mdstipc_conf.c | 14 +++++++-------
10 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/osaf/libs/core/include/mds_papi.h
b/osaf/libs/core/include/mds_papi.h
--- a/osaf/libs/core/include/mds_papi.h
+++ b/osaf/libs/core/include/mds_papi.h
@@ -200,7 +200,7 @@ typedef enum ncsmds_svc_id {
#define MDS_MAX_PROCESS_NAME_LEN (255 + 32) /* Process Name + PID No/Slot
info/Tipc reference */
/*MDS takes timeout in 10 ms value for sync send() timeout */
-#define MDS_MAX_TIMEOUT_MILLISECOND 42949672950 /*((2^32 -1 * 10) */
+#define MDS_MAX_TIMEOUT_MILLISECOND 9223372036854 /*((2^63 -1) / 10) */
/**************************************************************************
* SVC_NAME of Service : A well known name that a service
@@ -261,7 +261,7 @@ typedef struct mds_sendtype_snd_info {
typedef struct mds_sendtype_sndrsp_info {
MDS_DEST i_to_dest; /* A virtual or absolute destination */
- uint32_t i_time_to_wait; /* Timeout duration in 10ms units */
+ int64_t i_time_to_wait; /* Timeout duration in 10ms units */
NCSCONTEXT o_rsp; /* Place for the response for normal message */
MDS_DIRECT_BUFF buff; /* For response of type direct send */
uint16_t len;
@@ -270,13 +270,13 @@ typedef struct mds_sendtype_sndrsp_info
typedef struct mds_sendtype_sndrspack_info { /* Wait for an ack to the
response */
MDS_DEST i_sender_dest; /* Sender's the one who gets this response */
- uint32_t i_time_to_wait; /* Timeout duration in 10ms units */
+ int64_t i_time_to_wait; /* Timeout duration in 10ms units */
MDS_SYNC_SND_CTXT i_msg_ctxt; /* MDS supplied data to identify request */
} MDS_SENDTYPE_SNDRSPACK_INFO;
typedef struct mds_sendtype_sndack_info {
MDS_DEST i_to_dest; /* A virtual or absolute destination */
- uint32_t i_time_to_wait; /* Timeout duration in 10ms units */
+ int64_t i_time_to_wait; /* Timeout duration in 10ms units */
} MDS_SENDTYPE_SNDACK_INFO;
typedef struct mds_sendtype_rsp_info {
@@ -292,7 +292,7 @@ typedef struct mds_sendtype_red_info {
typedef struct mds_sendtype_redrsp_info {
MDS_DEST i_to_vdest; /* A virtual destination */
V_DEST_QA i_to_anc; /* Anchor within virtual destination */
- uint32_t i_time_to_wait; /* in 10ms units */
+ int64_t i_time_to_wait; /* in 10ms units */
NCSCONTEXT o_rsp; /* Place for the message context */
MDS_DIRECT_BUFF buff; /* For response of type direct send */
uint16_t len;
@@ -302,14 +302,14 @@ typedef struct mds_sendtype_redrsp_info
typedef struct mds_sendtype_redrspack_info { /* Wait for an ack to the
response */
MDS_DEST i_to_vdest; /* A virtual destination */
V_DEST_QA i_to_anc; /* Anchor within virtual destination */
- uint32_t i_time_to_wait; /* in 10ms units */
+ int64_t i_time_to_wait; /* in 10ms units */
MDS_SYNC_SND_CTXT i_msg_ctxt; /* MDS supplied data to identify request */
} MDS_SENDTYPE_REDRSPACK_INFO;
typedef struct mds_sendtype_redack_info {
MDS_DEST i_to_vdest; /* A virtual destination */
V_DEST_QA i_to_anc; /* Anchor within virtual destination */
- uint32_t i_time_to_wait; /* in 10ms units */
+ int64_t i_time_to_wait; /* in 10ms units */
} MDS_SENDTYPE_REDACK_INFO;
typedef struct mds_sendtype_rrsp_info {
diff --git a/osaf/libs/core/mds/include/mds_dl_api.h
b/osaf/libs/core/mds/include/mds_dl_api.h
--- a/osaf/libs/core/mds/include/mds_dl_api.h
+++ b/osaf/libs/core/mds/include/mds_dl_api.h
@@ -32,9 +32,9 @@
uint32_t mds_lib_req(NCS_LIB_REQ_INFO *req);
int mds_auth_server_connect(const char *name, MDS_DEST mds_dest,
- int svc_id, int timeout);
+ int svc_id, int64_t timeout);
int mds_auth_server_disconnect(const char *name, MDS_DEST mds_dest,
- int svc_id, int timeout);
+ int svc_id, int64_t timeout);
int mds_auth_server_create(const char *name);
#endif
diff --git a/osaf/libs/core/mds/mds_c_api.c b/osaf/libs/core/mds/mds_c_api.c
--- a/osaf/libs/core/mds/mds_c_api.c
+++ b/osaf/libs/core/mds/mds_c_api.c
@@ -2471,7 +2471,7 @@ static void start_mds_down_tmr(MDS_DEST
uint32_t tmr_hdl = ncshm_create_hdl(NCS_HM_POOL_ID_COMMON,
NCS_SERVICE_ID_COMMON, (NCSCONTEXT)(tmr_req_info));
- tmr_id = ncs_tmr_start(tmr_id, (uint32_t)(1000), // 10ms unit
+ tmr_id = ncs_tmr_start(tmr_id, 1000, // 10ms unit
(TMR_CALLBACK) mds_tmr_callback, (void *)(long)(tmr_hdl),
__FILE__, __LINE__);
assert(tmr_id != NULL);
}
diff --git a/osaf/libs/core/mds/mds_c_sndrcv.c
b/osaf/libs/core/mds/mds_c_sndrcv.c
--- a/osaf/libs/core/mds/mds_c_sndrcv.c
+++ b/osaf/libs/core/mds/mds_c_sndrcv.c
@@ -315,7 +315,7 @@ static uint32_t mcm_pvt_process_sndrack_
MDS_SVC_ID to_svc_id, MDS_SEND_INFO
*req,
MDS_SEND_PRIORITY_TYPE pri,
V_DEST_QA anchor);
-static uint32_t mds_mcm_time_wait(NCS_SEL_OBJ *sel_obj, uint32_t time);
+static uint32_t mds_mcm_time_wait(NCS_SEL_OBJ *sel_obj, int64_t time);
static uint32_t mcm_pvt_get_sync_send_entry(MDS_SVC_INFO *svc_cb,
MDS_DATA_RECV *recv,
MDS_MCM_SYNC_SEND_QUEUE **sync_queue);
@@ -1756,7 +1756,8 @@ static uint32_t mds_subtn_tbl_add_disc_q
MDS_SVC_ID fr_svc_id, bool time_wait)
{
MDS_AWAIT_DISC_QUEUE *add_ptr = NULL, *mov_ptr = NULL;
- uint32_t rc = NCSCC_RC_SUCCESS, status = 0, timeout_val = 0;
+ uint32_t rc = NCSCC_RC_SUCCESS, status = 0;
+ int64_t timeout_val = 0;
if (true == time_wait) {
timeout_val = 150; /* This may need a tuning */
@@ -2562,7 +2563,7 @@ static uint32_t mds_await_active_tbl_del
* NCSCC_RC_FAILURE
***************************************************************************/
-static uint32_t mds_mcm_time_wait(NCS_SEL_OBJ *sel_obj, uint32_t time_val)
+static uint32_t mds_mcm_time_wait(NCS_SEL_OBJ *sel_obj, int64_t time_val)
{
osaf_mutex_unlock_ordie(&gl_mds_library_mutex);
/* Now wait for the response to come */
diff --git a/osaf/libs/core/mds/mds_main.c b/osaf/libs/core/mds/mds_main.c
--- a/osaf/libs/core/mds/mds_main.c
+++ b/osaf/libs/core/mds/mds_main.c
@@ -240,7 +240,7 @@ int mds_auth_server_create(const char *n
* @param timeout max time to wait for a response in ms unit
* @return 0 - OK, negated errno otherwise
*/
-int mds_auth_server_connect(const char *name, MDS_DEST mds_dest, int svc_id,
int timeout)
+int mds_auth_server_connect(const char *name, MDS_DEST mds_dest, int svc_id,
int64_t timeout)
{
uint32_t rc;
uint8_t msg[32];
@@ -292,7 +292,7 @@ fail:
* @param timeout max time to wait for a response in ms unit
* @return 0 - OK, negated errno otherwise
*/
-int mds_auth_server_disconnect(const char *name, MDS_DEST mds_dest, int
svc_id, int timeout)
+int mds_auth_server_disconnect(const char *name, MDS_DEST mds_dest, int
svc_id, int64_t timeout)
{
uint32_t rc;
uint8_t msg[32];
diff --git a/osaf/services/infrastructure/dtms/dtm/dtm_main.c
b/osaf/services/infrastructure/dtms/dtm/dtm_main.c
--- a/osaf/services/infrastructure/dtms/dtm/dtm_main.c
+++ b/osaf/services/infrastructure/dtms/dtm/dtm_main.c
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
uint8_t send_bcast_buffer[255];
int bcast_buf_len = 0;
long int dis_time_out_usec = 0;
- long int dis_elapsed_time_usec = 0;
+ int64_t dis_elapsed_time_usec = 0;
DTM_INTERNODE_CB *dtms_cb = dtms_gl_cb;
TRACE_ENTER();
diff --git a/osaf/services/infrastructure/dtms/dtm/dtm_read_config.c
b/osaf/services/infrastructure/dtms/dtm/dtm_read_config.c
--- a/osaf/services/infrastructure/dtms/dtm/dtm_read_config.c
+++ b/osaf/services/infrastructure/dtms/dtm/dtm_read_config.c
@@ -97,7 +97,7 @@ void dtm_print_config(DTM_INTERNODE_CB *
TRACE(" DTM_INI_DIS_TIMEOUT_SECS: ");
TRACE(" %d", config->initial_dis_timeout);
TRACE(" DTM_BCAST_FRE_MSECS: ");
- TRACE(" %d", config->bcast_msg_freq);
+ TRACE(" %" PRId64 "", config->bcast_msg_freq);
TRACE(" DTM_SOCK_SND_BUF_SIZE: ");
TRACE(" %d", config->sock_sndbuf_size);
TRACE(" DTM_SOCK_RCV_BUF_SIZE: ");
diff --git a/osaf/services/infrastructure/dtms/include/dtm_cb.h
b/osaf/services/infrastructure/dtms/include/dtm_cb.h
--- a/osaf/services/infrastructure/dtms/include/dtm_cb.h
+++ b/osaf/services/infrastructure/dtms/include/dtm_cb.h
@@ -80,7 +80,7 @@ typedef struct dtm_internode_cb {
DTM_IP_ADDR_TYPE i_addr_family; /* Indicates V4 or V6 */
uint8_t mcast_flag; /* Indicates mcast */
int32_t initial_dis_timeout;
- int32_t bcast_msg_freq;
+ int64_t bcast_msg_freq;
NCS_PATRICIA_TREE nodeid_tree; /* NODE_DB information of Nodes */
NCS_PATRICIA_TREE comm_sock_tree; /* NODE_DB information of Nodes */
NCS_PATRICIA_TREE ip_addr_tree; /* NODE_DB information of Nodes */
diff --git a/tests/mds/mdstipc.h b/tests/mds/mdstipc.h
--- a/tests/mds/mdstipc.h
+++ b/tests/mds/mdstipc.h
@@ -228,12 +228,12 @@ uint32_t mds_send_message(MDS_HDL ,MDS_S
/* Non Redundant */
uint32_t mds_just_send(MDS_HDL ,MDS_SVC_ID ,MDS_SVC_ID ,MDS_DEST,
MDS_SEND_PRIORITY_TYPE,TET_MDS_MSG * );
-uint32_t mds_send_get_ack(MDS_HDL ,MDS_SVC_ID ,MDS_SVC_ID ,MDS_DEST ,uint32_t ,
+uint32_t mds_send_get_ack(MDS_HDL ,MDS_SVC_ID ,MDS_SVC_ID ,MDS_DEST ,int64_t ,
MDS_SEND_PRIORITY_TYPE,TET_MDS_MSG *);
uint32_t mds_send_get_response(MDS_HDL ,MDS_SVC_ID ,MDS_SVC_ID ,MDS_DEST ,
- uint32_t ,MDS_SEND_PRIORITY_TYPE,TET_MDS_MSG *);
+ int64_t ,MDS_SEND_PRIORITY_TYPE,TET_MDS_MSG *);
uint32_t mds_send_response(MDS_HDL ,MDS_SVC_ID ,TET_MDS_MSG *);
-uint32_t mds_sendrsp_getack(MDS_HDL,MDS_SVC_ID ,uint32_t,TET_MDS_MSG *);
+uint32_t mds_sendrsp_getack(MDS_HDL,MDS_SVC_ID ,int64_t,TET_MDS_MSG *);
uint32_t mds_broadcast_to_svc(MDS_HDL ,MDS_SVC_ID ,MDS_SVC_ID ,
NCSMDS_SCOPE_TYPE ,MDS_SEND_PRIORITY_TYPE,
TET_MDS_MSG *);
@@ -242,12 +242,12 @@ uint32_t mds_broadcast_to_svc(MDS_HDL ,M
/*Direct Send*/
uint32_t mds_direct_send_message(MDS_HDL,MDS_SVC_ID,MDS_SVC_ID,
MDS_CLIENT_MSG_FORMAT_VER,MDS_SENDTYPES,
- MDS_DEST,uint32_t,MDS_SEND_PRIORITY_TYPE,char *);
+ MDS_DEST,int64_t,MDS_SEND_PRIORITY_TYPE,char *);
uint32_t mds_direct_broadcast_message(MDS_HDL ,MDS_SVC_ID ,MDS_SVC_ID ,
MDS_CLIENT_MSG_FORMAT_VER,
MDS_SENDTYPES ,NCSMDS_SCOPE_TYPE,
MDS_SEND_PRIORITY_TYPE);
-uint32_t mds_direct_response(MDS_HDL ,MDS_SVC_ID, MDS_CLIENT_MSG_FORMAT_VER,
MDS_SENDTYPES ,uint32_t );
+uint32_t mds_direct_response(MDS_HDL ,MDS_SVC_ID, MDS_CLIENT_MSG_FORMAT_VER,
MDS_SENDTYPES ,int64_t );
/*General Purpose*/
uint32_t mds_service_retrieve(MDS_HDL ,MDS_SVC_ID ,SaDispatchFlagsT );
@@ -527,12 +527,12 @@ uint32_t mds_send_get_redack(MDS_HDL mds
MDS_SVC_ID to_svc,
MDS_DEST to_vdest,
V_DEST_QA to_anc,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
MDS_SEND_PRIORITY_TYPE priority,
TET_MDS_MSG *message);
uint32_t mds_send_redrsp_getack(MDS_HDL mds_hdl,
MDS_SVC_ID svc_id,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
TET_MDS_MSG *response);
uint32_t tet_sync_point(void);
diff --git a/tests/mds/mdstipc_conf.c b/tests/mds/mdstipc_conf.c
--- a/tests/mds/mdstipc_conf.c
+++ b/tests/mds/mdstipc_conf.c
@@ -935,7 +935,7 @@ uint32_t mds_send_get_ack(MDS_HDL mds_hd
MDS_SVC_ID svc_id,
MDS_SVC_ID to_svc,
MDS_DEST to_dest,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
MDS_SEND_PRIORITY_TYPE priority,
TET_MDS_MSG *message)
{
@@ -981,7 +981,7 @@ uint32_t mds_send_get_response(MDS_HDL m
MDS_SVC_ID svc_id,
MDS_SVC_ID to_svc,
MDS_DEST to_dest,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
MDS_SEND_PRIORITY_TYPE priority,
TET_MDS_MSG *message)
{
@@ -1042,7 +1042,7 @@ uint32_t mds_send_get_redack(MDS_HDL mds
MDS_SVC_ID to_svc,
MDS_DEST to_vdest,
V_DEST_QA to_anc,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
MDS_SEND_PRIORITY_TYPE priority,
TET_MDS_MSG *message)
{
@@ -1160,7 +1160,7 @@ uint32_t mds_send_response(MDS_HDL mds_h
}
uint32_t mds_sendrsp_getack(MDS_HDL mds_hdl,
MDS_SVC_ID svc_id,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
TET_MDS_MSG *response)
{
uint32_t rs;
@@ -1207,7 +1207,7 @@ uint32_t mds_sendrsp_getack(MDS_HDL mds_
uint32_t mds_send_redrsp_getack(MDS_HDL mds_hdl,
MDS_SVC_ID svc_id,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
TET_MDS_MSG *response)
{
uint32_t rs;
@@ -1256,7 +1256,7 @@ uint32_t mds_direct_send_message(MDS_HDL
MDS_CLIENT_MSG_FORMAT_VER msg_fmt_ver,
MDS_SENDTYPES sendtype,
MDS_DEST to_dest,
- uint32_t time_to_wait,
+ int64_t time_to_wait,
MDS_SEND_PRIORITY_TYPE priority,
char *message)
{
@@ -1359,7 +1359,7 @@ uint32_t mds_direct_response(MDS_HDL mds
MDS_SVC_ID svc_id,
MDS_CLIENT_MSG_FORMAT_VER msg_fmt_ver,
MDS_SENDTYPES sendtype,
- uint32_t time_to_wait)
+ int64_t time_to_wait)
{
uint32_t rs;
char msg[]="Resp Message";
------------------------------------------------------------------------------
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
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
