Modify macro name for DCFA specific lines

Signed-off-by: Pavan Balaji <balaji@mcs.anl.gov>

src/mpid/ch3/channels/nemesis/netmod/dcfa/dcfa_ibcom.h

@@ -13,6 +13,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/mman.h>
+#include "mpid_nem_impl.h"
 
 //#define DEBUG_ON      1
 #ifdef DEBUG_ON
@@ -21,7 +22,7 @@
 #define DEBUG	if (0)
 #endif
 
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
 #include "dcfa.h"
 
 /*
@@ -271,7 +272,7 @@ typedef struct IbCom {
     short icom_used;
     short icom_connected;
     int icom_port;
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
 #else
     struct ibv_port_attr icom_pattr;    /* IB port attributes */
 #endif

src/mpid/ch3/channels/nemesis/netmod/dcfa/dcfa_lmt.c

@@ -82,7 +82,7 @@ int MPID_nem_dcfa_lmt_initiate_lmt(struct MPIDI_VC *vc, union MPIDI_CH3_Pkt *rts
         ("lmt_initate_lmt,dt_contig=%d,write_from_buf=%p,req->dev.user_buf=%p,REQ_FIELD(req, lmt_pack_buf)=%p\n",
          dt_contig, write_from_buf, req->dev.user_buf, REQ_FIELD(req, lmt_pack_buf));
 
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
 #else
     s_cookie_buf->addr = write_from_buf;
 #endif
@@ -111,7 +111,7 @@ int MPID_nem_dcfa_lmt_initiate_lmt(struct MPIDI_VC *vc, union MPIDI_CH3_Pkt *rts
     /* put IB rkey */
     struct ibv_mr *mr = ibcom_reg_mr_fetch(write_from_buf, data_sz);
     MPIU_ERR_CHKANDJUMP(!mr, mpi_errno, MPI_ERR_OTHER, "**ibcom_reg_mr_fetch");
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
     s_cookie_buf->addr = (void *) mr->host_addr;
     dprintf("lmt_initiate_lmt,s_cookie_buf->addr=%p\n", s_cookie_buf->addr);
 #endif

src/mpid/ch3/channels/nemesis/netmod/dcfa/dcfa_poll.c

@@ -63,7 +63,7 @@ int MPID_nem_dcfa_drain_scq(int dont_call_progress)
     }
     entered_drain_scq = 1;
 
-#if 0   /*def DCFA */
+#if 0   /*def HAVE_LIBDCFA */
     result = ibv_poll_cq(rc_shared_scq, 1, &cqe[0]);
 #else
     result = ibv_poll_cq(rc_shared_scq, /*3 */ IBCOM_MAX_CQ_HEIGHT_DRAIN, &cqe[0]);
@@ -95,7 +95,7 @@ int MPID_nem_dcfa_drain_scq(int dont_call_progress)
             printf("%d\n", *(int *) 0);
         }
 
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
         if (cqe[i].status != IBV_WC_SUCCESS) {
             dprintf("drain_scq,kind=%d,req_type=%d,msg_type=%d,cqe.status=%08x\n", kind, req_type,
                     msg_type, cqe[i].status);
@@ -411,7 +411,7 @@ int MPID_nem_dcfa_drain_scq_lmt_put()
     MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_DCFA_DRAIN_SCQ_LMT_PUT);
     MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_DCFA_DRAIN_SCQ_LMT_PUT);
 
-#if 0   /*def DCFA */
+#if 0   /*def HAVE_LIBDCFA */
     result = ibv_poll_cq(rc_shared_scq_lmt_put, 1, &cqe[0]);
 #else
     result = ibv_poll_cq(rc_shared_scq_lmt_put, IBCOM_MAX_CQ_HEIGHT_DRAIN, &cqe[0]);
@@ -427,7 +427,7 @@ int MPID_nem_dcfa_drain_scq_lmt_put()
         MPID_Request_kind_t kind;
         int req_type, msg_type;
 
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
         if (cqe[i].status != IBV_WC_SUCCESS) {
             dprintf("drain_scq_lmt_put,status=%08x\n", cqe[i].status);
         }
@@ -521,7 +521,7 @@ int MPID_nem_dcfa_drain_scq_scratch_pad()
     MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_DCFA_DRAIN_SCQ_SCRATCH_PAD);
     MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_DCFA_DRAIN_SCQ_SCRATCH_PAD);
 
-#if 0   /*def DCFA */
+#if 0   /*def HAVE_LIBDCFA */
     result = ibv_poll_cq(rc_shared_scq_scratch_pad, 1, &cqe[0]);
 #else
     result = ibv_poll_cq(rc_shared_scq_scratch_pad, IBCOM_MAX_CQ_HEIGHT_DRAIN, &cqe[0]);
@@ -533,7 +533,7 @@ int MPID_nem_dcfa_drain_scq_scratch_pad()
     }
     for (i = 0; i < result; i++) {
 
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
         if (cqe[i].status != IBV_WC_SUCCESS) {
             dprintf("drain_scq_scratch_pad,status=%08x\n", cqe[i].status);
         }
@@ -1872,7 +1872,7 @@ int MPID_nem_dcfa_cm_drain_scq()
     }
     for (i = 0; i < result; i++) {
 
-#ifdef DCFA
+#ifdef HAVE_LIBDCFA
         if (cqe[i].status != IBV_WC_SUCCESS) {
             dprintf("cm_drain_scq,status=%08x\n", cqe[i].status);
         }

src/mpid/ch3/channels/nemesis/netmod/dcfa/dcfa_reg_mr.c

@@ -175,7 +175,7 @@ struct ibv_mr *ibcom_reg_mr_fetch(void *addr, int len)
     int key;
     struct ibcom_reg_mr_cache_entry_t *e;
 
-#if 1   /*def DCFA */
+#if 1   /*def HAVE_LIBDCFA */
     /* we can't change addr because ibv_post_send assumes mr->host_addr (output of this function)
      * must have an exact mirror value of addr (input of this function) */
     void *addr_aligned = addr;