Changeset 4888 for mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_impl.h

Timestamp:

07/02/09 09:58:01 (5 months ago)

Author:

buntinas

Message:

squashed more warnings

Files:

• mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_impl.h (modified) (5 diffs)

mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_impl.h

@@ -105 +105 @@
     MPID_nem_pkt_lmt_cookie_t lmt_cookie;
 } MPIDI_CH3_nem_pkt_t;
+
+
+/* MPID_PKT_DECL_CAST(pkt_u_var, s_pkt_type, s_pkt_p_var)
+   To avoid strict aliasing warnings when doing something like:
+       pkt_t upkt;
+       rts_pkt_t * const rts_pkt = (rts_pkt_t *)&upkt;
+   this macro does the same but through a union.
+
+   pkt_u_var -- variable name of the packet union
+   s_pkt_type -- type of the sub-packet
+   s_pkt_p_var -- variable name of the sub-packet pointer
+ */
+#define MPID_PKT_DECL_CAST(pkt_u_var, s_pkt_type, s_pkt_p_var)  \
+    union                                                       \
+    {                                                           \
+        MPIDI_CH3_Pkt_t p;                                      \
+        s_pkt_type s;                                           \
+    } pkt_u_var;                                                \
+    s_pkt_type * const s_pkt_p_var = &pkt_u_var.s
 
     
@@ -153 +172 @@
 
 #define MPID_nem_lmt_send_CTS(vc, rreq, r_cookie_buf, r_cookie_len) do {                                \
-        MPIDI_CH3_Pkt_t _upkt;                                                                          \
-        MPID_nem_pkt_lmt_cts_t * const _cts_pkt = (MPID_nem_pkt_lmt_cts_t *)&_upkt;                     \
+        MPID_PKT_DECL_CAST(_upkt, MPID_nem_pkt_lmt_cts_t, _cts_pkt);                                    \
         MPID_Request *_cts_req;                                                                         \
         MPID_IOV _iov[2];                                                                               \
@@ -187 +205 @@
 {
     int mpi_errno = MPI_SUCCESS;
-    MPIDI_CH3_Pkt_t _upkt;
-    MPID_nem_pkt_lmt_cookie_t * const cookie_pkt = (MPID_nem_pkt_lmt_cookie_t *)&_upkt;
+    MPID_PKT_DECL_CAST(_upkt, MPID_nem_pkt_lmt_cookie_t, cookie_pkt);
     MPID_Request *cookie_req;
     MPID_IOV iov[2];
@@ -232 +249 @@
         
 #define MPID_nem_lmt_send_DONE(vc, rreq) do {                                                                   \
-        MPIDI_CH3_Pkt_t _upkt;                                                                                  \
-        MPID_nem_pkt_lmt_done_t * const _done_pkt = (MPID_nem_pkt_lmt_done_t *)&_upkt;                          \
+        MPID_PKT_DECL_CAST(_upkt, MPID_nem_pkt_lmt_done_t, _done_pkt);                                          \
         MPID_Request *_done_req;                                                                                \
                                                                                                                 \
@@ -240 +256 @@
         _done_pkt->req_id = (rreq)->ch.lmt_req_id;                                                              \
                                                                                                                 \
-        mpi_errno = MPIDI_CH3_iStartMsg((vc), _done_pkt, sizeof(*_done_pkt), &_done_req);                        \
+        mpi_errno = MPIDI_CH3_iStartMsg((vc), _done_pkt, sizeof(*_done_pkt), &_done_req);                       \
         MPIU_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**donepkt");                                  \
         if (_done_req != NULL)                                                                                  \