[devel] [PATCH 4 of 8] cpsv: Add new message to support extended SaNameT [#1574] v3
osaf/libs/common/cpsv/cpsv_evt.c | 439 +- osaf/libs/common/cpsv/include/cpsv_evt.h | 10 + osaf/services/saf/cpsv/cpd/cpd_mds.c | 84 +- osaf/services/saf/cpsv/cpnd/cpnd_mds.c | 86 +- 4 files changed, 581 insertions(+), 38 deletions(-) diff --git a/osaf/libs/common/cpsv/cpsv_evt.c b/osaf/libs/common/cpsv/cpsv_evt.c --- a/osaf/libs/common/cpsv/cpsv_evt.c +++ b/osaf/libs/common/cpsv/cpsv_evt.c @@ -30,11 +30,14 @@ #include "cpsv.h" #include "cpa_tmr.h" +#include "osaf_extended_name.h" FUNC_DECLARATION(CPSV_CKPT_DATA); static SaCkptSectionIdT *cpsv_evt_dec_sec_id(NCS_UBAID *i_ub, uint32_t svc_id); static uint32_t cpsv_evt_enc_sec_id(NCS_UBAID *o_ub, SaCkptSectionIdT *sec_id); static void cpsv_convert_sec_id_to_string(char *sec_id_str, SaCkptSectionIdT *section_id); +static uint32_t cpsv_encode_extended_name_flat(NCS_UBAID *uba, SaNameT *name); +static uint32_t cpsv_decode_extended_name_flat(NCS_UBAID *uba, SaNameT *name); const char *cpa_evt_str[] = { "STRING_0", @@ -254,8 +257,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * case CPND_EVT_A2ND_CKPT_OPEN: { CPSV_A2ND_OPEN_REQ *info = &evt->info.cpnd.info.openReq; - snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_OPEN(hdl=%llu, %s)", - info->client_hdl, info->ckpt_name.value); + snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_OPEN_2(hdl=%llu, %s)", + info->client_hdl, osaf_extended_name_borrow(&info->ckpt_name)); break; } case CPND_EVT_A2ND_CKPT_CLOSE: @@ -268,7 +271,7 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * case CPND_EVT_A2ND_CKPT_UNLINK: { CPSV_A2ND_CKPT_UNLINK *info = &evt->info.cpnd.info.ulinkReq; - snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_UNLINK(%s)", info->ckpt_name.value); + snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_UNLINK_2(%s)", osaf_extended_name_borrow(&info->ckpt_name)); break; } case CPND_EVT_A2ND_CKPT_RDSET: @@ -513,12 +516,22 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * case CPND_EVT_D2ND_CKPT_CREATE: { CPSV_D2ND_CKPT_CREATE *info = &evt->info.cpnd.info.ckpt_create; - snprintf(o_evt_str, len, "[%llu] CPND_EVT_D2ND_CKPT_CREATE(%s, create_rep=%s, active=0x%X)", - info->ckpt_info.ckpt_id, info->ckpt_name.value, + snprintf(o_evt_str, len, "[%llu] CPND_EVT_D2ND_CKPT_CREATE_2(%s, create_rep=%s, is_act=%s, active=0x%X, dest_cnt=%d)", + info->ckpt_info.ckpt_id, osaf_extended_name_borrow(&info->ckpt_name), info->ckpt_info.ckpt_rep_create ? "true" : "false", - m_NCS_NODE_ID_FROM_MDS_DEST(info->ckpt_info.active_dest)); + info->ckpt_info.is_active_exists ? "true" : "false", + m_NCS_NODE_ID_FROM_MDS_DEST(info->ckpt_info.active_dest), + info->ckpt_info.dest_cnt); + + SaCkptCheckpointCreationAttributesT *attr = &info->ckpt_info.attributes; + TRACE("mSecS=%lld, flags=%d, mSec=%d, mSecIdS=%lld, ret=%lld, ckptS=%lld", attr->maxSectionSize, + attr->creationFlags, attr->maxSections, attr->maxSectionIdSize, attr->retentionDuration, + attr->checkpointSize); + for (int i = 0; i < info->ckpt_info.dest_cnt; i++) + TRACE("dest[%d] = 0x%" PRIX64 " ", i, info->ckpt_info.dest_list[i].dest); break; } + case CPND_EVT_D2ND_CKPT_DESTROY: { snprintf(o_evt_str, len, "[%llu] CPND_EVT_D2ND_CKPT_DESTROY", evt->info.cpnd.info.ckpt_destroy.ckpt_id); @@ -608,8 +621,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * case CPND_EVT_A2ND_CKPT_LIST_UPDATE: { CPSV_A2ND_CKPT_LIST_UPDATE *info = &evt->info.cpnd.info.ckptListUpdate; - snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_LIST_UPDATE(hdl=%llu, %s)", - info->client_hdl, info->ckpt_name.value); + snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_LIST_UPDATE_2(hdl=%llu, %s)", + info->client_hdl, osaf_extended_name_borrow(&info->ckpt_name)); break; } case CPND_EVT_A2ND_ARRIVAL_CB_UNREG: @@ -813,13 +826,20 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * case CPD_EVT_ND2D_CKPT_CREATE: {
Re: [devel] [PATCH 4 of 8] cpsv: Add new message to support extended SaNameT [#1574] v3
Hi Hoang, ACK for [PATCH 4 of 8] assuming unrequited comment code will be removed Note : tested default functionality , LONG DN functionality not tested in full fledged -AVM On 8/18/2016 12:48 PM, Hoang Vo wrote: > osaf/libs/common/cpsv/cpsv_evt.c | 439 > +- > osaf/libs/common/cpsv/include/cpsv_evt.h | 10 + > osaf/services/saf/cpsv/cpd/cpd_mds.c | 84 +- > osaf/services/saf/cpsv/cpnd/cpnd_mds.c | 86 +- > 4 files changed, 581 insertions(+), 38 deletions(-) > > > diff --git a/osaf/libs/common/cpsv/cpsv_evt.c > b/osaf/libs/common/cpsv/cpsv_evt.c > --- a/osaf/libs/common/cpsv/cpsv_evt.c > +++ b/osaf/libs/common/cpsv/cpsv_evt.c > @@ -30,11 +30,14 @@ > > #include "cpsv.h" > #include "cpa_tmr.h" > +#include "osaf_extended_name.h" > > FUNC_DECLARATION(CPSV_CKPT_DATA); > static SaCkptSectionIdT *cpsv_evt_dec_sec_id(NCS_UBAID *i_ub, uint32_t > svc_id); > static uint32_t cpsv_evt_enc_sec_id(NCS_UBAID *o_ub, SaCkptSectionIdT > *sec_id); > static void cpsv_convert_sec_id_to_string(char *sec_id_str, > SaCkptSectionIdT *section_id); > +static uint32_t cpsv_encode_extended_name_flat(NCS_UBAID *uba, SaNameT > *name); > +static uint32_t cpsv_decode_extended_name_flat(NCS_UBAID *uba, SaNameT > *name); > > const char *cpa_evt_str[] = { > "STRING_0", > @@ -254,8 +257,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_A2ND_CKPT_OPEN: > { > CPSV_A2ND_OPEN_REQ *info = &evt->info.cpnd.info.openReq; > - snprintf(o_evt_str, len, > "CPND_EVT_A2ND_CKPT_OPEN(hdl=%llu, %s)", > - info->client_hdl, info->ckpt_name.value); > + snprintf(o_evt_str, len, > "CPND_EVT_A2ND_CKPT_OPEN_2(hdl=%llu, %s)", > + info->client_hdl, > osaf_extended_name_borrow(&info->ckpt_name)); > break; > } > case CPND_EVT_A2ND_CKPT_CLOSE: > @@ -268,7 +271,7 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_A2ND_CKPT_UNLINK: > { > CPSV_A2ND_CKPT_UNLINK *info = > &evt->info.cpnd.info.ulinkReq; > - snprintf(o_evt_str, len, > "CPND_EVT_A2ND_CKPT_UNLINK(%s)", info->ckpt_name.value); > + snprintf(o_evt_str, len, > "CPND_EVT_A2ND_CKPT_UNLINK_2(%s)", > osaf_extended_name_borrow(&info->ckpt_name)); > break; > } > case CPND_EVT_A2ND_CKPT_RDSET: > @@ -513,12 +516,22 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_D2ND_CKPT_CREATE: > { > CPSV_D2ND_CKPT_CREATE *info = > &evt->info.cpnd.info.ckpt_create; > - snprintf(o_evt_str, len, "[%llu] > CPND_EVT_D2ND_CKPT_CREATE(%s, create_rep=%s, active=0x%X)", > - info->ckpt_info.ckpt_id, info->ckpt_name.value, > + snprintf(o_evt_str, len, "[%llu] > CPND_EVT_D2ND_CKPT_CREATE_2(%s, create_rep=%s, is_act=%s, active=0x%X, > dest_cnt=%d)", > + info->ckpt_info.ckpt_id, > osaf_extended_name_borrow(&info->ckpt_name), > info->ckpt_info.ckpt_rep_create ? "true" : > "false", > - > m_NCS_NODE_ID_FROM_MDS_DEST(info->ckpt_info.active_dest)); > + info->ckpt_info.is_active_exists ? "true" : > "false", > + > m_NCS_NODE_ID_FROM_MDS_DEST(info->ckpt_info.active_dest), > + info->ckpt_info.dest_cnt); > + > + SaCkptCheckpointCreationAttributesT *attr = > &info->ckpt_info.attributes; > + TRACE("mSecS=%lld, flags=%d, mSec=%d, mSecIdS=%lld, > ret=%lld, ckptS=%lld", attr->maxSectionSize, > + attr->creationFlags, attr->maxSections, > attr->maxSectionIdSize, attr->retentionDuration, > + attr->checkpointSize); > + for (int i = 0; i < info->ckpt_info.dest_cnt; i++) > + TRACE("dest[%d] = 0x%" PRIX64 " ", i, > info->ckpt_info.dest_list[i].dest); > break; > } > + > case CPND_EVT_D2ND_CKPT_DESTROY: > { > snprintf(o_evt_str, len, "[%llu] > CPND_EVT_D2ND_CKPT_DESTROY", evt->info.cpnd.info.ckpt_destroy.ckpt_id); > @@ -608,8 +621,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_A2ND_CKPT_LIST_UPDATE: > { > CPSV_A2ND_CKPT_LIST_UPDATE *info = > &evt->info.cpnd.info.ckptListUpdate; > - snprintf(o_evt_str, len, > "CPND_EVT_A2ND_CKPT_LIST_UPDATE(hdl=%llu, %s)", > - info->client_hdl, info->ckpt_name.value); > + snprintf(o_evt_str, len, > "CPND_EVT_A2ND_CK
Re: [devel] [PATCH 4 of 8] cpsv: Add new message to support extended SaNameT [#1574] v3
Dear Mahesh, I would like to send updated patch following your comment. When this is minor comment, I send it as attached file. Sincerely, Hoang -Original Message- From: A V Mahesh [mailto:mahesh.va...@oracle.com] Sent: Monday, August 22, 2016 12:55 PM To: Hoang Vo Cc: opensaf-devel@lists.sourceforge.net Subject: Re: [PATCH 4 of 8] cpsv: Add new message to support extended SaNameT [#1574] v3 Hi Hoang, ACK for [PATCH 4 of 8] assuming unrequited comment code will be removed Note : tested default functionality , LONG DN functionality not tested in full fledged -AVM On 8/18/2016 12:48 PM, Hoang Vo wrote: > osaf/libs/common/cpsv/cpsv_evt.c | 439 +- > osaf/libs/common/cpsv/include/cpsv_evt.h | 10 + > osaf/services/saf/cpsv/cpd/cpd_mds.c | 84 +- > osaf/services/saf/cpsv/cpnd/cpnd_mds.c | 86 +- > 4 files changed, 581 insertions(+), 38 deletions(-) > > > diff --git a/osaf/libs/common/cpsv/cpsv_evt.c > b/osaf/libs/common/cpsv/cpsv_evt.c > --- a/osaf/libs/common/cpsv/cpsv_evt.c > +++ b/osaf/libs/common/cpsv/cpsv_evt.c > @@ -30,11 +30,14 @@ > > #include "cpsv.h" > #include "cpa_tmr.h" > +#include "osaf_extended_name.h" > > FUNC_DECLARATION(CPSV_CKPT_DATA); > static SaCkptSectionIdT *cpsv_evt_dec_sec_id(NCS_UBAID *i_ub, uint32_t svc_id); > static uint32_t cpsv_evt_enc_sec_id(NCS_UBAID *o_ub, SaCkptSectionIdT *sec_id); > static void cpsv_convert_sec_id_to_string(char *sec_id_str, > SaCkptSectionIdT *section_id); > +static uint32_t cpsv_encode_extended_name_flat(NCS_UBAID *uba, > +SaNameT *name); static uint32_t > +cpsv_decode_extended_name_flat(NCS_UBAID *uba, SaNameT *name); > > const char *cpa_evt_str[] = { > "STRING_0", > @@ -254,8 +257,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_A2ND_CKPT_OPEN: > { > CPSV_A2ND_OPEN_REQ *info = &evt->info.cpnd.info.openReq; > - snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_OPEN(hdl=%llu, %s)", > - info->client_hdl, info->ckpt_name.value); > + snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_OPEN_2(hdl=%llu, %s)", > + info->client_hdl, osaf_extended_name_borrow(&info->ckpt_name)); > break; > } > case CPND_EVT_A2ND_CKPT_CLOSE: > @@ -268,7 +271,7 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_A2ND_CKPT_UNLINK: > { > CPSV_A2ND_CKPT_UNLINK *info = &evt->info.cpnd.info.ulinkReq; > - snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_UNLINK(%s)", info->ckpt_name.value); > + snprintf(o_evt_str, len, "CPND_EVT_A2ND_CKPT_UNLINK_2(%s)", > +osaf_extended_name_borrow(&info->ckpt_name)); > break; > } > case CPND_EVT_A2ND_CKPT_RDSET: > @@ -513,12 +516,22 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_D2ND_CKPT_CREATE: > { > CPSV_D2ND_CKPT_CREATE *info = &evt->info.cpnd.info.ckpt_create; > - snprintf(o_evt_str, len, "[%llu] CPND_EVT_D2ND_CKPT_CREATE(%s, create_rep=%s, active=0x%X)", > - info->ckpt_info.ckpt_id, info->ckpt_name.value, > + snprintf(o_evt_str, len, "[%llu] CPND_EVT_D2ND_CKPT_CREATE_2(%s, create_rep=%s, is_act=%s, active=0x%X, dest_cnt=%d)", > + info->ckpt_info.ckpt_id, > +osaf_extended_name_borrow(&info->ckpt_name), > info->ckpt_info.ckpt_rep_create ? "true" : "false", > - m_NCS_NODE_ID_FROM_MDS_DEST(info->ckpt_info.active_dest)); > + info->ckpt_info.is_active_exists ? "true" : "false", > + m_NCS_NODE_ID_FROM_MDS_DEST(info->ckpt_info.active_dest), > + info->ckpt_info.dest_cnt); > + > + SaCkptCheckpointCreationAttributesT *attr = &info->ckpt_info.attributes; > + TRACE("mSecS=%lld, flags=%d, mSec=%d, mSecIdS=%lld, ret=%lld, ckptS=%lld", attr->maxSectionSize, > + attr->creationFlags, attr->maxSections, attr->maxSectionIdSize, attr->retentionDuration, > + attr->checkpointSize); > + for (int i = 0; i < info->ckpt_info.dest_cnt; i++) > + TRACE("dest[%d] = 0x%" PRIX64 " ", i, > +info->ckpt_info.dest_list[i].dest); > break; > } > + > case CPND_EVT_D2ND_CKPT_DESTROY: > { > snprintf(o_evt_str, len, "[%llu] CPND_EVT_D2ND_CKPT_DESTROY", > evt->info.cpnd.info.ckpt_destroy.ckpt_id); > @@ -608,8 +621,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char * > case CPND_EVT_A2ND_CKPT_LIST_UPDATE: > { > CPSV_A2ND_CKPT_LIST_UPD