Re: [PATCH 2.3.3] mamac: added enums for HMS middleware


Frank Quinn <f.quinn@...>
 

Hi Jorg,

 

This is now merged into the next branch.

 

Cheers,

Frank

 

From: openmama-dev-bounces@... [mailto:openmama-dev-bounces@...] On Behalf Of Matt Mulhern
Sent: 08 September 2015 09:29
To: Jörg Hansper <joerg.hansper@...>; openmama-dev@...
Subject: Re: [Openmama-dev] [PATCH 2.3.3] mamac: added enums for HMS middleware

 

Hi Jörg,
Thanks for the patch. We'll get this into the next branch as soon as possible.

Thanks,
Matt Mulhern

On 01/09/2015 19:39, Jörg Hansper wrote:

This patch follows an official request for OpenMAMA enumerations for HMS

(Hardware based Messaging System) developed by BCC Group.

The new enum values (based on the recent version 2.3.3) are:

1. for mamaMiddleware:

MAMA_MIDDLEWARE_HMS=17 (corresponding string: “hms”)

2. for mamaPayloadType:

MAMA_PAYLOAD_HMS='H' (corresponding string: “HMS”)

 

Submitted by:

Jörg Hansper joerg.hansper@...

 

From 268494fe9b999f6cfa371ecb6e45e9a6974f00f8 Mon Sep 17 00:00:00 2001

From: Joerg Hansper <joerg.hansper@...>

Date: Tue, 1 Sep 2015 18:47:50 +0200

Subject: [PATCH] Added enums for HMS

 

---

mama/c_cpp/src/c/mama/middleware.h | 3 ++-

mama/c_cpp/src/c/mama/msg.h        | 1 +

mama/c_cpp/src/c/middleware.c      | 9 +++++++--

mama/c_cpp/src/c/msg.c             | 2 ++

4 files changed, 12 insertions(+), 3 deletions(-)

 

diff --git a/mama/c_cpp/src/c/mama/middleware.h b/mama/c_cpp/src/c/mama/middleware.h

index 51225a2..6a0d028 100644

--- a/mama/c_cpp/src/c/mama/middleware.h

+++ b/mama/c_cpp/src/c/mama/middleware.h

@@ -50,7 +50,8 @@ typedef enum mamaMiddleware_

     MAMA_MIDDLEWARE_INRUSH  = 14,

     MAMA_MIDDLEWARE_LBMKOMODO = 15,

     MAMA_MIDDLEWARE_UMDSKOMODO = 16,

-    MAMA_MIDDLEWARE_MAX     = 17,

+    MAMA_MIDDLEWARE_HMS     = 17,

+    MAMA_MIDDLEWARE_MAX     = 18,

    MAMA_MIDDLEWARE_UNKNOWN = 99

} mamaMiddleware;

diff --git a/mama/c_cpp/src/c/mama/msg.h b/mama/c_cpp/src/c/mama/msg.h

index 2fbbe6b..7026da7 100644

--- a/mama/c_cpp/src/c/mama/msg.h

+++ b/mama/c_cpp/src/c/mama/msg.h

@@ -47,6 +47,7 @@ typedef enum mamaPayloadType_

     MAMA_PAYLOAD_AVIS       = 'A',

     MAMA_PAYLOAD_TICK42BLP  = 'B',

     MAMA_PAYLOAD_FAST       = 'F',

+    MAMA_PAYLOAD_HMS        = 'H',

     MAMA_PAYLOAD_RAI        = 'I',

     MAMA_PAYLOAD_KWANTUM    = 'K',

     MAMA_PAYLOAD_UMS        = 'L',

diff --git a/mama/c_cpp/src/c/middleware.c b/mama/c_cpp/src/c/middleware.c

index f966491..5980ec0 100644

--- a/mama/c_cpp/src/c/middleware.c

+++ b/mama/c_cpp/src/c/middleware.c

@@ -79,7 +79,10 @@ mamaMiddleware_convertFromString (const char*  str)

     if (strcasecmp (str, "umdskomodo") == 0)

         return MAMA_MIDDLEWARE_UMDSKOMODO;

-

+   

+    if (strcasecmp (str, "hms") == 0)

+        return MAMA_MIDDLEWARE_HMS;

+   

     return MAMA_MIDDLEWARE_UNKNOWN;

}

@@ -123,7 +126,9 @@ mamaMiddleware_convertToString (mamaMiddleware  middleware)

             return "lbmkomodo";

         case MAMA_MIDDLEWARE_UMDSKOMODO:

             return "umdskomodo";

-        default:

+        case MAMA_MIDDLEWARE_HMS:

+            return "hms";       

+             default:

             return "unknown";

     }

}

diff --git a/mama/c_cpp/src/c/msg.c b/mama/c_cpp/src/c/msg.c

index 3fa30a1..f589883 100644

--- a/mama/c_cpp/src/c/msg.c

+++ b/mama/c_cpp/src/c/msg.c

@@ -378,6 +378,8 @@ mamaPayload_convertToString (mamaPayloadType payloadType)

             return "TICK42BLP";

         case MAMA_PAYLOAD_FAST:

             return "FAST";

+        case MAMA_PAYLOAD_HMS:

+            return "HMS";

         case MAMA_PAYLOAD_RAI:

             return "rai";

         case MAMA_PAYLOAD_UMS:

--

1.8.3.1

 




_______________________________________________
Openmama-dev mailing list
Openmama-dev@...
https://lists.openmama.org/mailman/listinfo/openmama-dev

 


The information contained in this message may be privileged and confidential and protected from disclosure. If the reader of this message is not the intended recipient, you are hereby notified that any dissemination, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by replying to this message and deleting it from your computer. Thank you. SR Labs LLC

Join Openmama-dev@lists.openmama.org to automatically receive all group messages.