[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/io/bmi/bmi_portals: portals.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/io/bmi/bmi_portals
In directory parlweb1:/tmp/cvs-serv26608/src/io/bmi/bmi_portals

Modified Files:
      Tag: small-file-branch
	portals.c 
Log Message:
syncing small-file-branch back up with trunk at small-file-branch-point2 tag
(reverse merge)


Index: portals.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/bmi/bmi_portals/portals.c,v
diff -p -u -r1.7 -r1.7.2.1
--- portals.c	30 Nov 2007 19:26:02 -0000	1.7
+++ portals.c	7 Apr 2008 15:07:26 -0000	1.7.2.1
@@ -1,7 +1,7 @@
 /*
  * Portals BMI method.
  *
- * Copyright (C) 2007 Pete Wyckoff <pw at osc.edu>
+ * Copyright (C) 2007-8 Pete Wyckoff <pw at osc.edu>
  *
  * See COPYING in top-level directory.
  */
@@ -1898,15 +1898,19 @@ static int bmip_initialize(struct bmi_me
 	goto out;
     }
 
-    /* global debugging on all NIs */
-    /* PtlNIDebug(PTL_INVALID_HANDLE, PTL_DBG_ALL | PTL_DBG_NI_ALL); */
+/*
+ * utcp has shorter names for debug symbols; define catamount to these
+ * even though it never prints anything.
+ */
+#ifndef PTL_DBG_ALL
+#define  PTL_DBG_ALL PTL_DEBUG_ALL
+#define  PTL_DBG_NI_ALL PTL_DEBUG_NI_ALL
+#endif
+
+    PtlNIDebug(PTL_INVALID_HANDLE, PTL_DBG_ALL | PTL_DBG_NI_ALL);
     /* PtlNIDebug(PTL_INVALID_HANDLE, PTL_DBG_ALL | 0x001f0000); */
     /* PtlNIDebug(PTL_INVALID_HANDLE, PTL_DBG_ALL | 0x00000000); */
     /* PtlNIDebug(PTL_INVALID_HANDLE, PTL_DBG_DROP | 0x00000000); */
-
-    /* catamount has different debug symbols, but never prints anything */
-    PtlNIDebug(PTL_INVALID_HANDLE, PTL_DEBUG_ALL | PTL_DEBUG_NI_ALL);
-    /* PtlNIDebug(PTL_INVALID_HANDLE, PTL_DEBUG_DROP | 0x00000000); */
 
     /*
      * Allocate and build MDs for a queue of unexpected messages from