Changeset 3217

Timestamp:

10/01/08 19:02:02 (18 months ago)

Author:

balaji

Message:

#ifdef out zero-length arrays to ensure strict compilers don't complain about it.

Location:

mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis

Files:

• include/mpid_nem_datatypes.h (modified) (6 diffs)
• include/mpid_nem_defs.h (modified) (1 diff)
• src/mpid_nem_init.c (modified) (1 diff)

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

@@ -101 +101 @@
 */
 
-#define MPID_NEM_CELL_HEAD_LEN sizeof(double)
+#define MPID_NEM_CELL_HEAD_LEN    8 /* We use this to keep elements 64-bit aligned */
 #define MPID_NEM_CELL_PAYLOAD_LEN (MPID_NEM_CELL_LEN - MPID_NEM_CELL_HEAD_LEN)
 
@@ -166 +166 @@
  * convert between relative and absolute pointers. */
 
+/* This should always be exactly the size of a pointer */
 typedef struct MPID_nem_cell_rel_ptr
 {
@@ -181 +182 @@
 {
     MPID_nem_cell_rel_ptr_t next;
+#if MPID_NEM_CELL_HEAD_LEN != SIZEOF_VOID_P
     char padding[MPID_NEM_CELL_HEAD_LEN - sizeof(MPID_nem_cell_rel_ptr_t)];
+#endif
     MPID_nem_pkt_t pkt;
 } MPID_nem_cell_t;
@@ -189 +192 @@
 {
     struct MPID_nem_abs_cell *next;
+#if MPID_NEM_CELL_HEAD_LEN != SIZEOF_VOID_P
     char padding[MPID_NEM_CELL_HEAD_LEN - sizeof(struct MPID_nem_abs_cell*)];
+#endif
     volatile MPID_nem_pkt_t pkt;
 } MPID_nem_abs_cell_t;
@@ -214 +219 @@
     volatile MPID_nem_cell_rel_ptr_t head;
     volatile MPID_nem_cell_rel_ptr_t tail;
+#if MPID_NEM_CACHE_LINE_LEN != (2 * SIZEOF_VOID_P)
     char padding1[MPID_NEM_CACHE_LINE_LEN - 2 * sizeof(MPID_nem_cell_rel_ptr_t)];
+#endif
     MPID_nem_cell_rel_ptr_t my_head;
+#if MPID_NEM_CACHE_LINE_LEN != SIZEOF_VOID_P
     char padding2[MPID_NEM_CACHE_LINE_LEN - sizeof(MPID_nem_cell_rel_ptr_t)];
+#endif
 } MPID_nem_queue_t, *MPID_nem_queue_ptr_t;
 
@@ -223 +232 @@
 {
     volatile int value;
+#if MPID_NEM_CACHE_LINE_LEN != 0
     char padding[MPID_NEM_CACHE_LINE_LEN];
+#endif
 }
 MPID_nem_opt_volint_t;

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

@@ -97 +97 @@
     volatile int usage_cnt;
     volatile int cnt;
+#if MPID_NEM_CACHE_LINE_LEN != SIZEOF_INT
     char padding0[MPID_NEM_CACHE_LINE_LEN - sizeof(int)];
+#endif
     volatile int sig0;
     volatile int sig;

mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_init.c

@@ -74 +74 @@
     MPIU_Assert(sizeof(MPIDI_CH3_nem_pkt_t) <= sizeof(MPIDI_CH3_PktGeneric_t));
 
+    /* The MPID_nem_cell_rel_ptr_t defined in mpid_nem_datatypes.h
+     * should only contain a pointer. Also, we don't support compilers
+     * which add random padding to the start of the structure. The
+     * below assert should blow up if any of these happens. */
+    MPIU_Assert(sizeof(MPID_nem_cell_rel_ptr_t) == SIZEOF_VOID_P);
+
     /* Make sure the cell structure looks like it should */
     MPIU_Assert(MPID_NEM_CELL_PAYLOAD_LEN + MPID_NEM_CELL_HEAD_LEN == sizeof(MPID_nem_cell_t));