[EMAIL PROTECTED] wrote on Thu, 04 Oct 2007 08:43 -0400:
> Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_mx
> In directory parlweb1:/tmp/cvs-serv13824
>
> Modified Files:
> mx.c mx.h
> Log Message:
>
> Modified Files:
> mx.c mx.h
>
> Sync with Myricom's svn HEAD
>
> Increase unexpected messages size from 4KB to 8KB to handle small IO
> Increase large IO buffer size from 1MB to 4MB
> Add buffer handling for unexpected messages to remove malloc for
> unexpected messages
> Improve error reporting and use BMI errnos
> Move completion of unexpected sends after expected sends/recvs
[..]
Nice to see improvement. But...
[..]
> diff -p -u -r1.3 -r1.4
> --- mx.h 22 Jul 2007 16:15:01 -0000 1.3
> +++ mx.h 4 Oct 2007 12:43:46 -0000 1.4
[..]
> @@ -286,6 +293,7 @@ struct bmx_connreq
> #if BMX_DEBUG
> /* set the mask to the BMX_DB_* errors that you want gossip to report */
> #define BMX_DB_MASK (BMX_DB_ERR|BMX_DB_WARN)
> +#ifdef GOSSIP_ENABLE_BACKTRACE
> #define debug(lvl,fmt,args...)
> \
> do {
> \
> if (lvl & BMX_DB_MASK) {
> \
> @@ -297,6 +305,18 @@ struct bmx_connreq
> }
> \
> }
> \
> } while (0)
> +#else /* #ifndef GOSSIP_ENABLE_BACKTRACE */
> +#define debug(lvl,fmt,args...)
> \
> + do {
> \
> + if (lvl & BMX_DB_MASK) {
> \
> + if (lvl & (BMX_DB_ERR | BMX_DB_WARN)) { /* always send to log */
> \
> + gossip_err("bmi_mx: " fmt ".\n", ##args);
> \
> + } else {
> \
> + gossip_debug(GOSSIP_BMI_DEBUG_MX, "bmi_mx: " fmt ".\n",
> ##args); \
> + }
> \
> + }
> \
> + } while (0)
> +#endif /* GOSSIP_ENABLE_BACKTRACE */
> #else /* ! BMX_DEBUG */
> #define debug(lvl,fmt,...) do { } while (0)
> #endif /* BMX_DEBUG */
You stomped on my cleanup from r1.2 to r1.3.
A better approach to maintaining out-of-tree like this is to first
pull changes from the CVS into your tree. Then push your SVN
changes back up into the CVS.
-- Pete
_______________________________________________
Pvfs2-developers mailing list
[email protected]
http://www.beowulf-underground.org/mailman/listinfo/pvfs2-developers
