# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-07-31 01:12:43
# Node ID a16eb3847e5752b5c812eee6f8f838d10b4f72ea
# Parent  e0b7e9dd5b546d8dd3f7b94a44591d075a1e8f7f

Quieter operation and dots to show upload progress for libdistren.

diff --git a/src/client/libdistren.c b/src/client/libdistren.c
--- a/src/client/libdistren.c
+++ b/src/client/libdistren.c
@@ -130,6 +130,8 @@ int distren_submit_file(distren_t handle
   /* for basename() to play with */
   char *my_filename;
 
+  size_t sendq_dots;
+
   errno = 0;
   in = fopen(filename, "r" FOPEN_BINARY);
   if(!in)
@@ -174,10 +176,15 @@ int distren_submit_file(distren_t handle
 
       /* ensure we have no more than a megabyte waiting to be sent. */
       while(handle->rem
-	    && remoteio_sendq_len(handle->rem) / 3 > (1024 * 1024 / DISTREN_REQUEST_FILE_POST_DATA_LEN))
+	    && (sendq_dots = remoteio_sendq_len(handle->rem) / 3) > (1024 * 1024 / DISTREN_REQUEST_FILE_POST_DATA_LEN))
 	{
-	  fprintf(stderr, "info: %d packets waiting to be sent...\n", remoteio_sendq_len(handle->rem) / 3);
 	  multiio_poll(handle->multiio, -1);
+	  if(handle->rem)
+	    while(sendq_dots > remoteio_sendq_len(handle->rem) / 3)
+	      {
+		sendq_dots --;
+		fputc('.', stderr);
+	      }
 	}
     }
 
@@ -197,11 +204,17 @@ int distren_submit_file(distren_t handle
 
   /* let's block until the file's gone. */
   while(handle->rem
-	&& remoteio_sendq_len(handle->rem))
+	&& (sendq_dots = remoteio_sendq_len(handle->rem)))
     {
-      fprintf(stderr, "info: %d packets waiting to be sent...\n", remoteio_sendq_len(handle->rem) / 3);
       multiio_poll(handle->multiio, -1);
+      if(handle->rem)
+	while(sendq_dots / 3 > remoteio_sendq_len(handle->rem) / 3)
+	  {
+	    sendq_dots -= 3;
+	    fputc('.', stderr);
+	  }
     }
+  fputc('\n', stderr);
   fprintf(stderr, "info: %s successfully uploaded, as far as we know.\n", filename);
 
   return 0;
diff --git a/src/common/remoteio.c b/src/common/remoteio.c
--- a/src/common/remoteio.c
+++ b/src/common/remoteio.c
@@ -430,9 +430,6 @@ int _remoteio_handle_write(multiio_conte
 
   int tmp;
 
-  fprintf(stderr, "%s:%d: <del>My</del><ins>Someone else's</ins> traversal says that sock %d is available for writing\n",
-	  __FILE__, __LINE__, fd);
-
   /*
    * check if we're out of stuff to write.
    */
diff --git a/src/server/mysql.c b/src/server/mysql.c
--- a/src/server/mysql.c
+++ b/src/server/mysql.c
@@ -162,15 +162,12 @@ distrend_mysql_result_t mysqlQuery(distr
       return NULL;
     }
 
-  fprintf(stderr,"Querying... ");
   if (mysql_query(conn->mysqlconn, query))
     {
       fprintf(stderr, "calling mysql_query() resulted in: %s\n", mysql_error(conn->mysqlconn));
       return NULL;
     }
-  fprintf(stderr,"Queried!\n");
 
-  fprintf(stderr,"Getting results... ");
   result = mysql_use_result(conn->mysqlconn);
   
   /**