Have you pushed cpsv ?
If yes ,how this patch is still getting applied on today's staging ?
-AVM
On 4/4/2016 8:25 PM, Anders Widell wrote:
> I noticed that I replied on the wrong mail; this patch is obviously
> for ticket [#79] and not [#1613].
>
> Regarding both ticket [#79] and [#1613], I think I still haven't
> received any ACK for the MSG service?
>
> regards,
> Anders Widell
>
> On 04/04/2016 04:47 PM, A V Mahesh wrote:
>> Ok I will check.
>>
>> -AVM
>>
>> On 4/4/2016 8:15 PM, Anders Widell wrote:
>>> Hi!
>>>
>>> Here is a re-based version of this patch that can be pushed on the
>>> default branch after [#1621] was pushed. It also contain improved
>>> handling of a couple of error codes (in particular: TIMEOUT) from
>>> saClmInitialize(), to work better together with ticket [#1621].
>>> Could you please take a look before I push?
>>>
>>> thanks,
>>> Anders Widell
>>>
>>> On 03/31/2016 07:28 AM, A V Mahesh wrote:
>>>> ACK tested
>>>>
>>>> -AVM
>>>>
>>>> On 3/18/2016 9:32 PM, Anders Widell wrote:
>>>>> osaf/libs/common/cpsv/include/cpd_cb.h | 1 -
>>>>> osaf/services/saf/cpsv/cpd/cpd_db.c | 15 ++-------------
>>>>> osaf/services/saf/cpsv/cpnd/cpnd_db.c | 15 ++-------------
>>>>> 3 files changed, 4 insertions(+), 27 deletions(-)
>>>>>
>>>>>
>>>>> Use the new support function GetSlotSubslotIdFromNodeId() to
>>>>> extract a 32-bit
>>>>> integer containing the slot ID and subslot ID from a Node ID.
>>>>>
>>>>> diff --git a/osaf/libs/common/cpsv/include/cpd_cb.h
>>>>> b/osaf/libs/common/cpsv/include/cpd_cb.h
>>>>> --- a/osaf/libs/common/cpsv/include/cpd_cb.h
>>>>> +++ b/osaf/libs/common/cpsv/include/cpd_cb.h
>>>>> @@ -180,7 +180,6 @@ typedef struct cpd_cb_tag {
>>>>> bool is_quiesced_set;
>>>>> MDS_DEST loc_cpnd_dest;
>>>>> MDS_DEST rem_cpnd_dest;
>>>>> - /*MDS_DEST cpnd_dests[NCS_MAX_SLOTS]; */
>>>>> NCS_PATRICIA_TREE cpnd_tree;
>>>>> diff --git a/osaf/services/saf/cpsv/cpd/cpd_db.c
>>>>> b/osaf/services/saf/cpsv/cpd/cpd_db.c
>>>>> --- a/osaf/services/saf/cpsv/cpd/cpd_db.c
>>>>> +++ b/osaf/services/saf/cpsv/cpd/cpd_db.c
>>>>> @@ -1209,12 +1209,7 @@ uint32_t cpd_process_cpnd_del(CPD_CB *cb
>>>>> uint32_t cpd_get_slot_sub_id_from_mds_dest(MDS_DEST dest)
>>>>> {
>>>>> - NCS_PHY_SLOT_ID phy_slot;
>>>>> - NCS_SUB_SLOT_ID sub_slot;
>>>>> -
>>>>> -
>>>>> m_NCS_GET_PHYINFO_FROM_NODE_ID(m_NCS_NODE_ID_FROM_MDS_DEST(dest),
>>>>> NULL, &phy_slot, &sub_slot);
>>>>> -
>>>>> - return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
>>>>> + return
>>>>> GetSlotSubslotIdFromNodeId(m_NCS_NODE_ID_FROM_MDS_DEST(dest));
>>>>> }
>>>>> /********************************************************************************
>>>>>
>>>>>
>>>>> @@ -1228,13 +1223,7 @@ uint32_t cpd_get_slot_sub_id_from_mds_de
>>>>> uint32_t cpd_get_slot_sub_slot_id_from_node_id(NCS_NODE_ID
>>>>> i_node_id)
>>>>> {
>>>>> - NCS_PHY_SLOT_ID phy_slot;
>>>>> - NCS_SUB_SLOT_ID sub_slot;
>>>>> -
>>>>> - m_NCS_GET_PHYINFO_FROM_NODE_ID(i_node_id, NULL, &phy_slot,
>>>>> &sub_slot);
>>>>> -
>>>>> - return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
>>>>> -
>>>>> + return GetSlotSubslotIdFromNodeId(i_node_id);
>>>>> }
>>>>> /*******************************************************************************************
>>>>>
>>>>>
>>>>> diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_db.c
>>>>> b/osaf/services/saf/cpsv/cpnd/cpnd_db.c
>>>>> --- a/osaf/services/saf/cpsv/cpnd/cpnd_db.c
>>>>> +++ b/osaf/services/saf/cpsv/cpnd/cpnd_db.c
>>>>> @@ -756,12 +756,7 @@ void cpnd_allrepl_write_evt_node_tree_de
>>>>> *********************************************************************************/
>>>>>
>>>>>
>>>>> uint32_t cpnd_get_slot_sub_slot_id_from_mds_dest(MDS_DEST dest)
>>>>> {
>>>>> - NCS_PHY_SLOT_ID phy_slot;
>>>>> - NCS_SUB_SLOT_ID sub_slot;
>>>>> -
>>>>> -
>>>>> m_NCS_GET_PHYINFO_FROM_NODE_ID(m_NCS_NODE_ID_FROM_MDS_DEST(dest),
>>>>> NULL, &phy_slot, &sub_slot);
>>>>> -
>>>>> - return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
>>>>> + return
>>>>> GetSlotSubslotIdFromNodeId(m_NCS_NODE_ID_FROM_MDS_DEST(dest));
>>>>> }
>>>>> /***********************************************************************************
>>>>>
>>>>>
>>>>> @@ -772,13 +767,7 @@ uint32_t cpnd_get_slot_sub_slot_id_from_
>>>>> *********************************************************************************/
>>>>>
>>>>>
>>>>> uint32_t cpnd_get_slot_sub_slot_id_from_node_id(NCS_NODE_ID
>>>>> i_node_id)
>>>>> {
>>>>> - NCS_PHY_SLOT_ID phy_slot;
>>>>> - NCS_SUB_SLOT_ID sub_slot;
>>>>> -
>>>>> - m_NCS_GET_PHYINFO_FROM_NODE_ID(i_node_id, NULL, &phy_slot,
>>>>> &sub_slot);
>>>>> -
>>>>> - return ((sub_slot * NCS_SUB_SLOT_MAX) + (phy_slot));
>>>>> -
>>>>> + return GetSlotSubslotIdFromNodeId(i_node_id);
>>>>> }
>>>>> /******************************************************************************************
>>>>>
>>>>>
>>>>
>>>
>>
>
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
