Commit 90b3b2f8 authored by James Dinan's avatar James Dinan
Browse files

Converted packet type field to 16-bits

Convert the packet type field from an enum to a uint16.  This change was also
applied to packet types defined by Nemesis.  Downstream netmod developers will
also have to make this change if they defined new packet types.

Reviewer: goodell
parent bba35589
......@@ -61,7 +61,7 @@ typedef enum MPID_nem_pkt_type
typedef struct MPID_nem_pkt_lmt_rts
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
MPIDI_Message_match match;
MPI_Request sender_req_id;
MPIDI_msg_sz_t data_sz;
......@@ -71,7 +71,7 @@ MPID_nem_pkt_lmt_rts_t;
typedef struct MPID_nem_pkt_lmt_cts
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
MPI_Request sender_req_id;
MPI_Request receiver_req_id;
MPIDI_msg_sz_t data_sz;
......@@ -81,14 +81,14 @@ MPID_nem_pkt_lmt_cts_t;
typedef struct MPID_nem_pkt_lmt_done
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
MPI_Request req_id;
}
MPID_nem_pkt_lmt_done_t;
typedef struct MPID_nem_pkt_lmt_cookie
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
int from_sender;
MPI_Request sender_req_id;
MPI_Request receiver_req_id;
......@@ -98,14 +98,14 @@ MPID_nem_pkt_lmt_cookie_t;
typedef struct MPID_nem_pkt_ckpt_marker
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
int wave; /* used for debugging */
}
MPID_nem_pkt_ckpt_marker_t;
typedef struct MPID_nem_pkt_netmod
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
unsigned subtype;
}
MPID_nem_pkt_netmod_t;
......
......@@ -194,7 +194,7 @@ typedef enum MPIDI_nem_tcp_pkt_type {
#ifdef ENABLE_CHECKPOINTING
typedef struct MPIDI_nem_tcp_pkt_unpause
{
MPID_nem_pkt_type_t type;
MPIDI_CH3_Pkt_type_t type;
unsigned subtype;
} MPIDI_nem_tcp_pkt_unpause_t;
#endif
......
......@@ -9,6 +9,13 @@
#include "oputil.h"
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
/* Enable the use of data within the message packet for small messages */
#define USE_EAGER_SHORT
#define MPIDI_EAGER_SHORT_INTS 4
......@@ -49,13 +56,11 @@ typedef union {
} MPIDI_CH3_FOP_Immed_u;
/*
* MPIDI_CH3_Pkt_type_t
*
* Predefined packet types. This simplifies some of the code.
*/
/* FIXME: Having predefined names makes it harder to add new message types,
such as different RMA types. */
typedef enum MPIDI_CH3_Pkt_type
enum MPIDI_CH3_Pkt_types
{
MPIDI_CH3_PKT_EAGER_SEND = 0,
#if defined(USE_EAGER_SHORT)
......@@ -101,8 +106,9 @@ typedef enum MPIDI_CH3_Pkt_type
# endif
, MPIDI_CH3_PKT_END_ALL,
MPIDI_CH3_PKT_INVALID = -1 /* forces a signed enum to quash warnings */
}
MPIDI_CH3_Pkt_type_t;
};
typedef int16_t MPIDI_CH3_Pkt_type_t;
typedef struct MPIDI_CH3_Pkt_send
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment