DistRen Changeset - a16eb3847e57 · protofusion repositories

Changeset - a16eb3847e57

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 15 years ago 2010-07-31 01:12:43
ohnobinki@ohnopublishing.net

Quieter operation and dots to show upload progress for libdistren.

3 files changed with 17 insertions and 10 deletions:

src/client/libdistren.c

src/common/remoteio.c

src/server/mysql.c

0 comments (0 inline, 0 general)

src/client/libdistren.c

➞

Show inline comments

@@ @@ -127,12 +127,14 @@ int distren_submit_file(distren_t handle @@
   struct distren_request_file_post data_header;
   distren_request_file_post_context_t post_context;
   /* for basename() to play with */
   char *my_filename;
   size_t sendq_dots;
   errno = 0;
   in = fopen(filename, "r" FOPEN_BINARY);
   if(!in)
+    {
       perror("fopen");
       return 1;
@@ @@ -171,16 +173,21 @@ int distren_submit_file(distren_t handle @@
       remoteio_write(handle->rem, &data_header, sizeof(struct distren_request_file_post));
       remoteio_write(handle->rem, buf, len);
       distren_request_free(req);
       /* 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);
+	      }
+	}
+    }
   /*
    * declare the upload as finished, marking it as cancelled on I/O
    * error.
@@ @@ -194,17 +201,23 @@ int distren_submit_file(distren_t handle @@
     fclose(in);
   if(!handle->rem)
     return 1;
   /* 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;
+}
 int distren_free(distren_t handle)

src/common/remoteio.c

➞

Show inline comments

@@ @@ -427,15 +427,12 @@ int _remoteio_handle_write(multiio_conte @@
+{
   struct remoteio_packet *packet;
   size_t written_amount;
   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.
    */
   if(q_empty(rem->outmsgs))
+    {
       multiio_socket_event_disable(multiio, fd, POLLOUT);

src/server/mysql.c

➞

Show inline comments

@@ @@ -159,21 +159,18 @@ distrend_mysql_result_t mysqlQuery(distr @@
   if(mysql_ping(conn->mysqlconn))
+    {
       fprintf(stderr, "mysql_ping() failed: %s\n", mysql_error(conn->mysqlconn));
       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);
   /**
      Flush stuff out when an empty set is expected.
    */
   if(!expected_columns)

0 comments (0 inline, 0 general)