Comments inline. On Thursday 17 July 2014 11:31 AM, [email protected] wrote: > tests/mds/mdstipc.h | 2 +- > tests/mds/mdstipc_api.c | 40 ++++++++++++++++++++-------------------- > 2 files changed, 21 insertions(+), 21 deletions(-) > > > The patch tunes the MDS test code (<staging >/tests/mds) according to > new MDS. > > After the #654 MDS enhancement ,the MDS_DIRECT_BUF_MAXSIZE is the Fragment > SIZE, > so 2*1400+2 need to be replaced with 2*65479+2 > > > Tested the patch on the following configuration on physical Node ,except > one test case all are passed ( only one test case Failed ). > > ================================================================ > PLATFORM : DELL Server OPTIPLEX 7010 > Memory : 8 GB > Hard Disk : 500 GB > CPU : Quadcore - Intel(R) Core(TM) i5-3570 CPU @ 3.40GHz > OS : SLES 11 SP2 x86_64 > TIPC : 2.0 > ================================================================ > > Note : Please note that now the MDS single message size it self is equal to > MDS_DIRECT_BUF_MAXSIZE = 2^16 size ( 65536 ) > > diff --git a/tests/mds/mdstipc.h b/tests/mds/mdstipc.h > --- a/tests/mds/mdstipc.h > +++ b/tests/mds/mdstipc.h > @@ -106,7 +106,7 @@ typedef struct tet_vdest{ > > typedef struct mds_tet_msg{ > #define TET_MSG_SIZE_MAX 45875200 > -#define TET_MSG_SIZE_MIN 3000 > +#define TET_MSG_SIZE_MIN 131472 > uint32_t send_len; > uint32_t recvd_len; > /*char *send_data; this is best approach*/ > diff --git a/tests/mds/mdstipc_api.c b/tests/mds/mdstipc_api.c > --- a/tests/mds/mdstipc_api.c > +++ b/tests/mds/mdstipc_api.c > @@ -3665,7 +3665,7 @@ void tet_just_send_tp_10() > } > else > { > - printf("\nTest Case 10: Now send a message( > MDTM_NORMAL_MSG_FRAG_SIZE) > to Svc EXTMIN\n"); > + printf("\nTest Case 10: Now send a message( > MDS_DIRECT_BUF_MAXSIZE) to > Svc EXTMIN\n"); [Surya] There is a difference between normal pkt size and direct buf packet size. So remove the MDS_DIRECT_BUF_MAXSIZE and give a proper name. > /*--------------------------------------------------------------------*/ > printf("\nSubscribe\n"); > if(mds_service_subscribe(gl_tet_adest.mds_pwe1_hdl, > @@ -3683,8 +3683,8 @@ void tet_just_send_tp_10() > FAIL=1; > } > > - memset(mesg->send_data,'S',2*1400+2 ); > - mesg->send_len=2*1400+2; > + memset(mesg->send_data,'S',2*65479+2 ); > + mesg->send_len=2*65479+2; [Surya] Dont hardcode, use hash defines. > if(mds_just_send(gl_tet_adest.mds_pwe1_hdl, > NCSMDS_SVC_ID_EXTERNAL_MIN, > NCSMDS_SVC_ID_EXTERNAL_MIN, > @@ -4693,9 +4693,9 @@ void tet_send_ack_tp_11() > memset(mesg, 0, sizeof(TET_MDS_MSG)); > memcpy(mesg->send_data,tmp,sizeof(tmp)); > mesg->send_len=sizeof(tmp); > - printf("Test Case 11: Now send a message( > MDTM_NORMAL_MSG_FRAG_SIZE) > to 1700\n"); > - memset(mesg->send_data,'S',2*1400+2 ); > - mesg->send_len=2*1400+2; > + printf("Test Case 11: Now send a message( > MDS_DIRECT_BUF_MAXSIZE) to > 1700\n"); [Surya] Change the print as well. > + memset(mesg->send_data,'S',2*65479+2 ); > + mesg->send_len=2*65479+2; [Surya] Dont hardcode, use hash defines. > if(mds_send_get_ack(gl_tet_adest.mds_pwe1_hdl, > NCSMDS_SVC_ID_EXTERNAL_MIN, > NCSMDS_SVC_ID_EXTERNAL_MIN, > @@ -5949,9 +5949,9 @@ void tet_send_response_tp_11() > > else > { > - printf("\nTest Case 11: Now send_response a message(> > MDTM_NORMAL_MSG_FRAG_SIZE) to Svc EXTMIN on Active Vdest\n"); > - memset(mesg->send_data,'S',2*1400+2 ); > - mesg->send_len=2*1400+2; > + printf("\nTest Case 11: Now send_response a message(> > MDS_DIRECT_BUF_MAXSIZE) to Svc EXTMIN on Active Vdest\n"); > + memset(mesg->send_data,'S',2*65479+2 ); > + mesg->send_len=2*65479+2; [Surya] Dont hardcode, use hash defines. > /*Receiver thread*/ > if(tet_create_task((NCS_OS_CB)tet_adest_rcvr_thread, > gl_tet_adest.svc[2].task.t_handle) > @@ -7515,9 +7515,9 @@ void tet_send_response_ack_tp_8() > FAIL=1; > } else { > /*--------------------------------------------------------------------*/ > - printf("\nTest Case 8: Now send_response a message( > > MDTM_NORMAL_MSG_FRAG_SIZE) to Svc EXTMIN on Active Vdest\n"); > - memset(mesg->send_data,'S',2*1400+2 ); > - mesg->send_len=2*1400+2; > + printf("\nTest Case 8: Now send_response a message( > > MDS_DIRECT_BUF_MAXSIZE) to Svc EXTMIN on Active Vdest\n"); > + memset(mesg->send_data,'S',2*65479+2 ); > + mesg->send_len=2*65479+2; [Surya] Dont hardcode, use hash defines. > /*Receiver thread*/ > if(tet_create_task((NCS_OS_CB)tet_vdest_rcvr_thread, > gl_tet_vdest[1].svc[1].task.t_handle) > @@ -7968,9 +7968,9 @@ void tet_broadcast_to_svc_tp_6() > } > else > { > - printf("\nTest Case 6: Svc INTMIN on VDEST=200 Broadcasting a VERY HIGH > Priority message (>MDTM_NORMAL_MSG_FRAG_SIZE) to Svc EXTMIN\n"); > - memset(mesg->send_data,'S',2*1400+2 ); > - mesg->send_len=2*1400+2; > + printf("\nTest Case 6: Svc INTMIN on VDEST=200 Broadcasting a VERY HIGH > Priority message (>MDS_DIRECT_BUF_MAXSIZE) to Svc EXTMIN\n"); > + memset(mesg->send_data,'S',2*65479+2 ); > + mesg->send_len=2*65479+2; [Surya] Dont hardcode, use hash defines. > if(mds_service_subscribe(gl_tet_vdest[1].mds_pwe1_hdl, > NCSMDS_SVC_ID_INTERNAL_MIN, > NCSMDS_SCOPE_NONE,1, > @@ -14202,7 +14202,7 @@ __attribute__ ((constructor)) static voi > test_case_add(6, tet_just_send_tp_7, "Send a message to unsubscribed Svc > INTMIN on Active Vdest:Implicit/Explicit Combination"); > test_case_add(6, tet_just_send_tp_8, "Not able to send a message to Svc > EXTMIN with Improper Priority"); > test_case_add(6, tet_just_send_tp_9, "Not able to send aNULL message to > Svc EXTMIN on Active Vdest"); > - test_case_add(6, tet_just_send_tp_10, "Now send a message( > > MDTM_NORMAL_MSG_FRAG_SIZE) to Svc EXTMIN"); > + test_case_add(6, tet_just_send_tp_10, "Now send a message( > > MDS_DIRECT_BUF_MAXSIZE) to Svc EXTMIN"); [Surya] Change the print as well. > test_case_add(6, tet_just_send_tp_11, "Not able to Send a message with > Invalid Send type"); > test_case_add(6, tet_just_send_tp_12, "While Await Active timer is On: > send a message to Svc EXTMIN Vdest=200"); > test_case_add(6, tet_just_send_tp_13, "Send a message to Svc EXTMIN on > QUIESCED Vdest=200"); > @@ -14219,7 +14219,7 @@ __attribute__ ((constructor)) static voi > test_case_add(7, tet_send_ack_tp_8, "Send a message with ACK to > unsubscribed service 1600"); > test_case_add(7, tet_send_ack_tp_9, "Not able to send_ack a message with > Improper Priority to 1700"); > test_case_add(7, tet_send_ack_tp_10, "Not able to send a NULL message > with ACK to 1700"); > - test_case_add(7, tet_send_ack_tp_11, "Send a message( > > MDTM_NORMAL_MSG_FRAG_SIZE) to 1700"); > + test_case_add(7, tet_send_ack_tp_11, "Send a message( > > MDS_DIRECT_BUF_MAXSIZE) to 1700"); [Surya] Change the print as well. > test_case_add(7, tet_send_ack_tp_12, "While Await Active timer is On: > send_ack a message to Svc EXTMIN Vdest=200"); > test_case_add(7, tet_send_ack_tp_13, "Send_ack a message to Svc EXTMIN on > QUIESCED Vdest=200"); > > @@ -14239,7 +14239,7 @@ __attribute__ ((constructor)) static voi > test_case_add(9, tet_send_response_tp_8, "Not able to send a message to a > Service which doesn't exist"); > test_case_add(9, tet_send_response_tp_9, "Not able to send_response a > message to Svc 2000 with Improper Priority"); > test_case_add(9, tet_send_response_tp_10, "Not able to send_response a > NULL message to Svc EXTMIN on Active Vdest"); > - test_case_add(9, tet_send_response_tp_11, "Now send_response a message(> > MDTM_NORMAL_MSG_FRAG_SIZE) to Svc EXTMIN on Active Vdest"); > + test_case_add(9, tet_send_response_tp_11, "Now send_response a message(> > MDS_DIRECT_BUF_MAXSIZE) to Svc EXTMIN on Active Vdest"); > //TODO: Check this testcase > // test_case_add(9, tet_send_response_tp_12, "Able to send a messages > 200 times to Svc 2000 on Active Vdest"); > > @@ -14255,7 +14255,7 @@ __attribute__ ((constructor)) static voi > test_case_add(11, tet_send_response_ack_tp_5, "While Await Active Timer > ON:SvcEXTMIN of ADEST sends a message to Svc EXTMIN on Active Vdest=200 and > Times out"); > test_case_add(11, tet_send_response_ack_tp_6, "SvcEXTMIN of ADEST sends > message to SvcEXTMIN on QUIESCED Vdest=200 and Times out"); > test_case_add(11, tet_send_response_ack_tp_7, "Implicit Subscription: Svc > EXTL_MIN on ADEST sends a LOWPriority message to Svc EXTMIN on VDEST=200 and > expects Response"); > - test_case_add(11, tet_send_response_ack_tp_8, "send_response a message(> > MDTM_NORMAL_MSG_FRAG_SIZE) to Svc EXTMIN on Active Vdest"); > + test_case_add(11, tet_send_response_ack_tp_8, "send_response a message(> > MDS_DIRECT_BUF_MAXSIZE) to Svc EXTMIN on Active Vdest"); > > test_suite_add(12, "Send Broadcast To SVC test cases"); > test_case_add(12, tet_broadcast_to_svc_tp_1, "Svc INTMIN on VDEST=200 > Broadcasting a LOW Priority message to Svc EXTMIN"); > @@ -14263,7 +14263,7 @@ __attribute__ ((constructor)) static voi > test_case_add(12, tet_broadcast_to_svc_tp_3, "Svc INTMIN on VDEST=200 > Redundant Broadcasting a HIGH priority message to Svc EXTMIN"); > test_case_add(12, tet_broadcast_to_svc_tp_4, "Svc INTMIN on VDEST=200 Not > able to Broadcast a message with Invalid Priority"); > test_case_add(12, tet_broadcast_to_svc_tp_5, "Svc INTMIN on VDEST=200 Not > able to Broadcast a NULL message"); > - test_case_add(12, tet_broadcast_to_svc_tp_6, "Svc INTMIN on VDEST=200 > Broadcasting a VERY HIGH Priority message (>MDTM_NORMAL_MSG_FRAG_SIZE) to Svc > EXTMIN"); > + test_case_add(12, tet_broadcast_to_svc_tp_6, "Svc INTMIN on VDEST=200 > Broadcasting a VERY HIGH Priority message (>MDS_DIRECT_BUF_MAXSIZE) to Svc > EXTMIN"); > > test_suite_add(13, "Direct Just Send test cases"); > test_case_add(13, tet_direct_just_send_tp_1, "Test Case 1: Now Direct > send Low,Medium,High and Very High Priority messages to Svc EXTMIN on Active > Vdest=200"); >
-- Regards Surya ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
