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 18 insertions and 11 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

@@ @@ -109,108 +109,121 @@ static void distren_init_cleanup(distren @@
     remoteio_close(distren->rem);
   distren->rem = NULL;
   distren_free(distren);
+}
 #ifdef _WIN32
 #define FOPEN_BINARY "b"
 #else
 #define FOPEN_BINARY ""
 #endif
 int distren_submit_file(distren_t handle, distren_job_t *job, const char *filename)
+{
   FILE *in;
   char buf[DISTREN_REQUEST_FILE_POST_DATA_LEN];
   size_t len;
   void *data;
   struct distren_request *req;
   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;
+    }
   fprintf(stderr, "info: Starting upload of %s...\n", filename);
   /* prepare the server for a file upload */
   my_filename = strdup(filename);
   distren_request_file_post_start(&req,
 				  &data,
 				  &post_context,
 				  handle->file_post_id,
 				  basename(my_filename));
   free(my_filename);
   distren_request_send(handle->rem, req, data);
   distren_request_free_with_data(req, data);
   handle->file_post_id ++;
   /* send file body */
   while(in
 	&& !ferror(in)
 	&& !feof(in)
 	&& handle->rem)
+    {
       len = fread(buf, 1, DISTREN_REQUEST_FILE_POST_DATA_LEN, in);
       if(len == 0)
 	continue;
       distren_request_file_post(&req,
 				&data_header,
 				post_context,
 				buf,
 				len);
       remoteio_write(handle->rem, req, sizeof(struct distren_request));
       /* should we check of handle->rem is NULL or not here...? */
       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.
   */
   distren_request_file_post_finish(&req, &data, post_context, (!in || ferror(in)) ? 1 : 0);
   if(handle->rem)
     distren_request_send(handle->rem, req, data);
     distren_request_free_with_data(req, data);
   if(in)
     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)))
+    {
       multiio_poll(handle->multiio, -1);
       if(handle->rem)
 	while(sendq_dots / 3 > remoteio_sendq_len(handle->rem) / 3)
+    {
       fprintf(stderr, "info: %d packets waiting to be sent...\n", remoteio_sendq_len(handle->rem) / 3);
       multiio_poll(handle->multiio, -1);
 	    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)
+{
   if(handle->rem)
     remoteio_close(handle->rem);
   free(handle);
   return 0;
+}

src/common/remoteio.c

➞

Show inline comments

@@ @@ -409,51 +409,48 @@ int remoteio_write(struct remoteio *rem, @@
       free(packet);
       fprintf(stderr, "OOM\n");
       return 1;
+    }
   memcpy(packet->data, buf, len);
   q_enqueue(rem->outmsgs, packet, 0);
   multiio_socket_event_enable(rem->opts->multiio, rem->sock, POLLOUT);
   return 0;
+}
 int _remoteio_handle_write(multiio_context_t multiio,
 			   int fd,
 			   short revent,
 			   struct remoteio_opts *opts,
 			   struct remoteio *rem)
+{
   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);
       return 0;
+    }
   packet = q_front(rem->outmsgs);
   tmp = funcmap[rem->method].write_func(rem, packet->data, packet->len, &written_amount);
   /**
      Disconnect in case of write error.
   */
   if(tmp)
+    {
       fprintf(stderr, __FILE__ ":%d: error handling for write() needs to be inserted into remoteio.... perhaps.. ;-)\n", __LINE__);
+    }
   if(packet->len == written_amount)
+    {
       q_dequeue(rem->outmsgs);
       remoteio_packet_free(packet);

src/server/mysql.c

➞

Show inline comments

@@ @@ -141,57 +141,54 @@ int mysqlDisconnect(distrend_mysql_conn_ @@
+}
 distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query, MYSQL_FIELD_OFFSET expected_columns)
+{
   MYSQL_RES *result;
   distrend_mysql_result_t distrenresult;
   MYSQL_FIELD_OFFSET num_columns;
   /**
      pointless sanity check
   */
   if(conn->pointlesscheck != SEVENTY_FIVE)
     fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
   /** make sure that connection is still alive
    */
   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)
+    {
       if(result)
+	{
 	  while(mysql_fetch_row(result))
+	    ;
 	  mysql_free_result(result);
+	}
       return NULL;
+    }
   if(!result)
+    {
       fprintf(stderr, "expected response/result for query ``%s'', got nothing\n", query);
       return NULL;
+    }
   /**
      Sanity check

0 comments (0 inline, 0 general)