* fixed a ./config warning

*    moved klnds/ptllnd/ptllnd_wire.h into lnet/include/lnet/ so
     ulnds/ptllnd can get at it.

*    fixed/added some .cvsignore files

*    fixed ulnds/tcplnd to give itself some send credits

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index d8ef6cc..139985c 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -85,10 +85,10 @@ fi
 AC_DEFUN([LN_CONFIG_PTLLND],
 [AC_MSG_CHECKING([for Portals API headers])
 
-if test ! "x$PORTALS" = "x" -o ! "x$LUSTRE_PORTALS" = "x" ; then
+if test -n "$PORTALS" -o -n "$LUSTRE_PORTALS"; then
        AC_MSG_RESULT([yes])
        PTLLND="ptllnd"
-       if test $PORTALS ; then
+       if test -n "$PORTALS"; then
                PTLLNDCPPFLAGS="-I$PORTALS/include"
        else
                PTLLNDCPPFLAGS="-I$LUSTRE_PORTALS/include"

diff --git a/lnet/klnds/ptllnd/ptllnd_wire.h b/lnet/include/lnet/ptllnd_wire.h
similarity index 100%
rename from lnet/klnds/ptllnd/ptllnd_wire.h
rename to lnet/include/lnet/ptllnd_wire.h

diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index 9a2ebd5..743f70a 100755 (executable)
--- a/lnet/klnds/ptllnd/ptllnd.h
+++ b/lnet/klnds/ptllnd/ptllnd.h
@@ -157,7 +157,7 @@ typedef struct
 
 
 
-#include "ptllnd_wire.h"
+#include "lnet/ptllnd_wire.h"
 
 /***********************************************************************/
 

diff --git a/lnet/ulnds/.cvsignore b/lnet/ulnds/.cvsignore
index e995588..036598e 100644 (file)
--- a/lnet/ulnds/.cvsignore
+++ b/lnet/ulnds/.cvsignore
@@ -1,3 +1,5 @@
 .deps
 Makefile
 Makefile.in
+autoMakefile
+autoMakefile.in

diff --git a/lnet/ulnds/socklnd/.cvsignore b/lnet/ulnds/socklnd/.cvsignore
new file mode 100644 (file)
index 0000000..e995588
--- /dev/null
+++ b/lnet/ulnds/socklnd/.cvsignore
@@ -0,0 +1,3 @@
+.deps
+Makefile
+Makefile.in

diff --git a/lnet/ulnds/socklnd/procapi.c b/lnet/ulnds/socklnd/procapi.c
index 7b53cfd..817049b 100644 (file)
--- a/lnet/ulnds/socklnd/procapi.c
+++ b/lnet/ulnds/socklnd/procapi.c
@@ -131,6 +131,12 @@ procbridge_startup (lnet_ni_t *ni)
     LASSERT (!tcpnal_running);                  /* only single instance supported */
     LASSERT (ni->ni_interfaces[0] == NULL);     /* explicit interface(s) not supported */
 
+    /* The credit settings here are pretty irrelevent.  Userspace tcplnd has no
+     * tx descriptor pool to exhaust and does a blocking send; that's the real
+     * limit on send concurrency. */
+    ni->ni_maxtxcredits = 1000;
+    ni->ni_peertxcredits = 1000;
+    
     init_unix_timer();
 
     b=(bridge)malloc(sizeof(struct bridge));