Summary: imm: Fix upgrade problem introduced by enhancement #969 [#1267] Review request for Trac Ticket(s): 1267 Peer Reviewer(s): Anders, Neelakanta Pull request to: Affected branch(es): default(4.7), 4.6 Development branch: default(4.7)
-------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts n SAF services n OpenSAF services y Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- changeset 728ba0de31a2d6ed19fa97a4e47da311a0124c68 Author: Hung Nguyen <[email protected]> Date: Tue, 24 Mar 2015 15:15:21 +0700 imm: Remove use of SaNameT from IMMSV_OI_CCB_UPCALL_RSP [#1267] Add new IMMSV_OCTET_STRING member to IMMSV_OI_CCB_UPCALL_RSP. Introduce new message types: IMMND_EVT_A2ND_CCB_OBJ_DELETE_RSP_3, IMMND_EVT_A2ND_CCB_OBJ_DELETE_RSP_4, IMMND_EVT_A2ND_OI_CCB_AUG_INIT_2. Add encoding/decoding for new message types. SaNameT is converted to IMMSV_OCTET_STRING when decoding old-typed messages. New-typed messages are only forwarded to IMMD when protocol46 is enabled. When protocol46 is disabled, the messages are converted to the old type before forwarding to IMMD, this is done in immnd_fevs_local_checks(). changeset 26676002c9196b212eadd43e13af931658c18a6d Author: Hung Nguyen <[email protected]> Date: Tue, 24 Mar 2015 18:05:13 +0700 imm: Remove use of SaNameT from IMMSV_OM_ADMIN_OWNER_INITIALIZE [#1267] Replace the union (added in changeset:6275) with new IMMSV_OCTET_STRING member. Remove unecessary flat decoding for IMMND_EVT_D2ND_ADMINIT, that type of message is packed to a fevs message. Avoid doing both borrow and malloc in immsv_evt_dec_flat(). Complete diffstat: ------------------ osaf/libs/agents/saf/imma/imma_oi_api.c | 21 ++++++++++++++- osaf/libs/agents/saf/imma/imma_om_api.c | 8 ++-- osaf/libs/agents/saf/imma/imma_proc.c | 20 ++++++++++++-- osaf/libs/common/immsv/immsv_evt.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- osaf/libs/common/immsv/include/immsv_evt.h | 4 ++ osaf/libs/common/immsv/include/immsv_evt_model.h | 9 ++--- osaf/services/saf/immsv/immd/immd_evt.c | 19 +++++++++---- osaf/services/saf/immsv/immnd/ImmModel.cc | 6 ++-- osaf/services/saf/immsv/immnd/immnd_evt.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 9 files changed, 308 insertions(+), 91 deletions(-) Testing Commands: ----------------- Testing, Expected Results: -------------------------- Conditions of Submission: ------------------------- Ack from reviewers. Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 n n powerpc n n powerpc64 n n Reviewer Checklist: ------------------- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single commit. ___ You have extraneous garbage in your review (merge commits etc) ___ You have giant attachments which should never have been sent; Instead you should place your content in a public tree to be pulled. ___ You have too many commits attached to an e-mail; resend as threaded commits, or place in a public tree for a pull. ___ You have resent this content multiple times without a clear indication of what has changed between each re-send. ___ You have failed to adequately and individually address all of the comments and change requests that were proposed in the initial review. ___ You have a misconfigured ~/.hgrc file (i.e. username, email etc) ___ Your computer have a badly configured date and time; confusing the the threaded patch review. ___ Your changes affect IPC mechanism, and you don't present any results for in-service upgradability test. ___ Your changes affect user manual and documentation, your patch series do not contain the patch that updates the Doxygen manual. ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
