[devel] [PATCH 1/2] mds: Improve readibility [#3089]
Correct indent and reduce code lines (<80 chars) for
mds_mdtm_send_tipc() and mdtm_frag_and_send()
---
src/mds/mds_dt_tipc.c | 490 ++
1 file changed, 256 insertions(+), 234 deletions(-)
diff --git a/src/mds/mds_dt_tipc.c b/src/mds/mds_dt_tipc.c
index fdf0da7..722076f 100644
--- a/src/mds/mds_dt_tipc.c
+++ b/src/mds/mds_dt_tipc.c
@@ -2561,16 +2561,16 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
send message
*/
uint32_t status = 0;
- uint32_t sum_mds_hdr_plus_mdtm_hdr_plus_len;
+ uint32_t mds_and_mdtm_hdr_len;
uint16_t fctrl_seq_num = 0;
int version = req->msg_arch_word & 0x7;
if (version > 1) {
- sum_mds_hdr_plus_mdtm_hdr_plus_len =
+ mds_and_mdtm_hdr_len =
(SUM_MDS_HDR_PLUS_MDTM_HDR_PLUS_LEN +
gl_mds_mcm_cb->node_name_len);
} else {
/* sending message to Old version Node */
- sum_mds_hdr_plus_mdtm_hdr_plus_len =
+ mds_and_mdtm_hdr_len =
(SUM_MDS_HDR_PLUS_MDTM_HDR_PLUS_LEN - 1);
}
@@ -2598,13 +2598,13 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
/* This is exclusively for the Bcast ENC and ENC_FLAT case */
if (recv.msg.encoding == MDS_ENC_TYPE_FULL) {
ncs_dec_init_space(_uba,
- recv.msg.data.fullenc_uba.start);
+ recv.msg.data.fullenc_uba.start);
recv.msg_arch_word = req->msg_arch_word;
} else if (recv.msg.encoding == MDS_ENC_TYPE_FLAT) {
/* This case will not arise, but just to be on safe side
*/
ncs_dec_init_space(_uba,
- recv.msg.data.flat_uba.start);
+ recv.msg.data.flat_uba.start);
} else {
/* Do nothing for the DIrect buff and Copy case */
}
@@ -2620,19 +2620,18 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
uint32_t frag_seq_num = 0, node_status = 0;
node_status = m_MDS_CHECK_NCS_NODE_ID_RANGE(
- m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
+ m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
if (NCSCC_RC_SUCCESS == node_status) {
tipc_id.node = m_MDS_GET_TIPC_NODE_ID_FROM_NCS_NODE_ID(
- m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
+ m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
tipc_id.ref = (uint32_t)(req->adest);
} else {
- if (req->snd_type !=
- MDS_SENDTYPE_ACK) { /* This check is becoz in ack
- cases we are only sending the
- hdr and no data part is being
- send, so no message free ,
- fix me */
+ if (req->snd_type != MDS_SENDTYPE_ACK) {
+ /* This check is becoz in ack cases we are only
+* sending the hdr and no data part is being
+* send, so no message free. fix me
+*/
mdtm_free_reassem_msg_mem(>msg);
}
return NCSCC_RC_FAILURE;
@@ -2643,43 +2642,45 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
/* Only for the ack and not for any other message */
if (req->snd_type == MDS_SENDTYPE_ACK ||
req->snd_type == MDS_SENDTYPE_RACK) {
- uint8_t len = sum_mds_hdr_plus_mdtm_hdr_plus_len;
+ uint8_t len = mds_and_mdtm_hdr_len;
uint8_t buffer_ack[len];
/* Add mds_hdr */
- if (NCSCC_RC_SUCCESS !=
- mdtm_add_mds_hdr(buffer_ack, req)) {
+ if (mdtm_add_mds_hdr(buffer_ack, req)
+ != NCSCC_RC_SUCCESS) {
+ return NCSCC_RC_FAILURE;
+ }
+ /* if sndqueue is capable, then obtain the current
+* sending seq
+*/
+ if (mds_tipc_fctrl_sndqueue_capable(tipc_id,
+ _seq_num) == NCSCC_RC_FAILURE){
+ m_MDS_LOG_ERR("FCTRL: Failed to send message"
+ " len :%d", len);
return NCSCC_RC_FAILURE;
}
-
[devel] [PATCH 1/2] mds: Improve readibility [#3089]
Correct indent and reduce code lines (<80 chars) for
mds_mdtm_send_tipc() and mdtm_frag_and_send()
---
src/mds/mds_dt_tipc.c | 484 ++
1 file changed, 254 insertions(+), 230 deletions(-)
diff --git a/src/mds/mds_dt_tipc.c b/src/mds/mds_dt_tipc.c
index fdf0da7..16cf11b 100644
--- a/src/mds/mds_dt_tipc.c
+++ b/src/mds/mds_dt_tipc.c
@@ -2561,16 +2561,16 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
send message
*/
uint32_t status = 0;
- uint32_t sum_mds_hdr_plus_mdtm_hdr_plus_len;
+ uint32_t mds_and_mdtm_hdr_len;
uint16_t fctrl_seq_num = 0;
int version = req->msg_arch_word & 0x7;
if (version > 1) {
- sum_mds_hdr_plus_mdtm_hdr_plus_len =
+ mds_and_mdtm_hdr_len =
(SUM_MDS_HDR_PLUS_MDTM_HDR_PLUS_LEN +
gl_mds_mcm_cb->node_name_len);
} else {
/* sending message to Old version Node */
- sum_mds_hdr_plus_mdtm_hdr_plus_len =
+ mds_and_mdtm_hdr_len =
(SUM_MDS_HDR_PLUS_MDTM_HDR_PLUS_LEN - 1);
}
@@ -2598,13 +2598,13 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
/* This is exclusively for the Bcast ENC and ENC_FLAT case */
if (recv.msg.encoding == MDS_ENC_TYPE_FULL) {
ncs_dec_init_space(_uba,
- recv.msg.data.fullenc_uba.start);
+ recv.msg.data.fullenc_uba.start);
recv.msg_arch_word = req->msg_arch_word;
} else if (recv.msg.encoding == MDS_ENC_TYPE_FLAT) {
/* This case will not arise, but just to be on safe side
*/
ncs_dec_init_space(_uba,
- recv.msg.data.flat_uba.start);
+ recv.msg.data.flat_uba.start);
} else {
/* Do nothing for the DIrect buff and Copy case */
}
@@ -2620,19 +2620,18 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
uint32_t frag_seq_num = 0, node_status = 0;
node_status = m_MDS_CHECK_NCS_NODE_ID_RANGE(
- m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
+ m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
if (NCSCC_RC_SUCCESS == node_status) {
tipc_id.node = m_MDS_GET_TIPC_NODE_ID_FROM_NCS_NODE_ID(
- m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
+ m_MDS_GET_NODE_ID_FROM_ADEST(req->adest));
tipc_id.ref = (uint32_t)(req->adest);
} else {
- if (req->snd_type !=
- MDS_SENDTYPE_ACK) { /* This check is becoz in ack
- cases we are only sending the
- hdr and no data part is being
- send, so no message free ,
- fix me */
+ if (req->snd_type != MDS_SENDTYPE_ACK) {
+ /* This check is becoz in ack cases we are only
+* sending the hdr and no data part is being
+* send, so no message free. fix me
+*/
mdtm_free_reassem_msg_mem(>msg);
}
return NCSCC_RC_FAILURE;
@@ -2643,43 +2642,45 @@ uint32_t mds_mdtm_send_tipc(MDTM_SEND_REQ *req)
/* Only for the ack and not for any other message */
if (req->snd_type == MDS_SENDTYPE_ACK ||
req->snd_type == MDS_SENDTYPE_RACK) {
- uint8_t len = sum_mds_hdr_plus_mdtm_hdr_plus_len;
+ uint8_t len = mds_and_mdtm_hdr_len;
uint8_t buffer_ack[len];
/* Add mds_hdr */
- if (NCSCC_RC_SUCCESS !=
- mdtm_add_mds_hdr(buffer_ack, req)) {
+ if (mdtm_add_mds_hdr(buffer_ack, req)
+ != NCSCC_RC_SUCCESS) {
+ return NCSCC_RC_FAILURE;
+ }
+ /* if sndqueue is capable, then obtain the current
+* sending seq
+*/
+ if (mds_tipc_fctrl_sndqueue_capable(tipc_id,
+ _seq_num) == NCSCC_RC_FAILURE){
+ m_MDS_LOG_ERR("FCTRL: Failed to send message"
+ " len :%d", len);
return NCSCC_RC_FAILURE;
}
-
