[Pvfs2-cvs] commit by slang in pvfs2/src/io/dev: pint-dev.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/dev
In directory parlweb1:/tmp/cvs-serv5758/src/io/dev

Modified Files:
      Tag: WALT3
	pint-dev.c 
Log Message:
reverse merge of HEAD to WALT3 branch.


Index: pint-dev.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/dev/pint-dev.c,v
diff -p -u -r1.29.10.1 -r1.29.10.2
--- pint-dev.c	18 Sep 2006 15:05:16 -0000	1.29.10.1
+++ pint-dev.c	19 Oct 2006 22:16:58 -0000	1.29.10.2
@@ -282,6 +282,10 @@ int PINT_dev_test_unexpected(
     pfd.fd = pdev_fd;
     pfd.events = POLLIN;
 
+    gossip_debug(GOSSIP_DEV_DEBUG, 
+                 "[DEV]: Entered %s: incount: %d, timeout: %d\n",
+                 __func__, incount, max_idle_time);
+
     do
     {
         /*
@@ -317,6 +321,9 @@ int PINT_dev_test_unexpected(
             /* device is emptied */
             if (avail == 0)
             {
+                gossip_debug(GOSSIP_DEV_DEBUG,
+                             "[DEV]: Exiting %s: incount: %d, device empty!\n",
+                             __func__, incount);
                 return ((*outcount > 0) ? 1 : 0);
             }
 
@@ -390,7 +397,8 @@ int PINT_dev_test_unexpected(
         if(*proto_ver != PVFS_KERNEL_PROTO_VERSION)
         {
             gossip_err("Error: protocol versions do not match.\n");
-            gossip_err("Please check that your pvfs2 module and pvfs2-client versions are consistent.\n");
+            gossip_err("Please check that your pvfs2 module "
+                       "and pvfs2-client versions are consistent.\n");
             ret = -(PVFS_EPROTO|PVFS_ERROR_DEV);
             goto dev_test_unexp_error;
         }
@@ -429,6 +437,11 @@ int PINT_dev_test_unexpected(
         */
 
     } while((*outcount < incount) && avail);
+
+    gossip_debug(GOSSIP_DEV_DEBUG,
+                 "[DEV]: %s Exit: "
+                 "incount: %d, outcount: %d, bytes available: %d\n",
+                 __func__, incount, *outcount, avail);
 
     return ((*outcount > 0) ? 1 : 0);