DistRen Changeset - 73f6134ccb23 · protofusion repositories

Changeset - 73f6134ccb23

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Nathan Brink (binki) - 15 years ago 2010-07-29 21:20:27
ohnobinki@ohnopublishing.net

Add some consts to remoteio's callbacks.

5 files changed with 22 insertions and 13 deletions:

src/common/execio.c

src/common/execio.h

src/common/libremoteio.h

src/common/remoteio.c

src/common/remoteio.h

0 comments (0 inline, 0 general)

src/common/execio.c

➞

Show inline comments

@@ @@ -162,13 +162,13 @@ int _execio_checkpid(struct execio *eio) @@
   /* perror()? */
   return WIFEXITED(childstatus);
+}
 int execio_read(struct execio *eio, void *buf, size_t len, size_t *bytesread)
+int execio_read(struct execio *eio, const void *buf, size_t len, size_t *bytesread)
+{
   ssize_t ret;
   /*
     TODO: detect NULL eio?
     TODO: errno?
     update status of eio for execio_status/to be able to cleanup subproc??
@@ @@ -200,13 +200,13 @@ int execio_read(struct execio *eio, void @@
       return 1;
+    }
   return 0;
+}
 int execio_write(struct execio *eio, void *buf, size_t len, size_t *bytesread)
+int execio_write(struct execio *eio, const void *buf, size_t len, size_t *bytesread)
+{
   errno = 0;
   (*bytesread) = write(eio->pipe_write, buf, len);
   if(!*bytesread)
+    {
       switch(errno)

src/common/execio.h

➞

Show inline comments

@@ @@ -51,14 +51,14 @@ struct execio @@
 int execio_open(struct execio **eio, const char *progname, char *const argv[]);
 /**
    doesn't block,
    returns 0 on success, 1 on failure
 */
 int execio_read(struct execio *eio, void *buf, size_t len, size_t *bytesread);
 int execio_write(struct execio *eio, void *buf, size_t len, size_t *byteswritten);
 int execio_read(struct execio *eio, const void *buf, size_t len, size_t *bytesread);
 int execio_write(struct execio *eio, const void *buf, size_t len, size_t *byteswritten);
 /**
   use this function to determine if the using program should keep trying to read/write
   @todo is this function good enough/necessary?
  */

src/common/libremoteio.h

➞

Show inline comments

@@ @@ -114,13 +114,13 @@ struct remoteio @@
 };
 /* lookup table */
 typedef int remoteio_open_func_t(struct remoteio *rem, struct remoteio_server *server);
 typedef int remoteio_read_func_t(struct remoteio *rem, void *buf, size_t len, size_t *bytesread);
 typedef int remoteio_write_func_t(struct remoteio *rem, void *buf, size_t len, size_t *bytesread);
+typedef int remoteio_write_func_t(struct remoteio *rem, const void *buf, size_t len, size_t *bytesread);
 typedef int remoteio_close_func_t(struct remoteio *rem);
 struct remoteio_method_funcmap
+{
   enum remoteio_method method;

src/common/remoteio.c

➞

Show inline comments

@@ @@ -62,24 +62,24 @@ int _remoteio_handle_read(multiio_contex @@
 			  short revent,
 			  struct remoteio_opts *opts,
 			  struct remoteio *rem);
 int _remoteio_ssh_open(struct remoteio *rem, struct remoteio_server *server);
 int _remoteio_ssh_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread);
 int _remoteio_ssh_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten);
+int _remoteio_ssh_write(struct remoteio *rem, const void *buf, size_t len, size_t *byteswritten);
 int _remoteio_ssh_close(struct remoteio *rem);
 /**
    ``named pipes''
  */
 #ifndef _WIN32
 int _remoteio_sock_open(struct remoteio *rem, struct remoteio_server *server);
 int _remoteio_sock_close(struct remoteio *rem);
 #endif
 int _remoteio_sock_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread);
 int _remoteio_sock_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten);
+int _remoteio_sock_write(struct remoteio *rem, const void *buf, size_t len, size_t *byteswritten);
 /**
    These borrow from _remoteio_sock_read() and _remoteio_sock_write().
  */
 int _remoteio_tcp_open(struct remoteio *rem, struct remoteio_server *server);
 int _remoteio_tcp_close(struct remoteio *rem);
@@ @@ -358,13 +358,14 @@ int _remoteio_handle_read(multiio_contex @@
 int remoteio_write(struct remoteio *rem, const void *buf, size_t len)
+{
   struct remoteio_packet *packet;
   struct pollfd pollfd;
   ssize_t bytes_written;
   size_t bytes_written;
   int err;
   /**
    * This is probably about the only optimization that exists in
    * distren.... :-D
+   *
    * Write to the client immediately if there are no other messages
@@ @@ -375,13 +376,13 @@ int remoteio_write(struct remoteio *rem, @@
       pollfd.fd = rem->sock;
       pollfd.revents = POLLOUT;
       pollfd.events = 0;
       poll(&pollfd, 1, 0);
       if(pollfd.events & POLLOUT)
+	{
-	  bytes_written = write(rem->sock, buf, len);
+	  err = funcmap[rem->method].write_func(rem, buf, len, &bytes_written);
 	  if(bytes_written > 0)
+	    {
 	      len -= bytes_written;
 	      buf += bytes_written;
+	    }
+	}
@@ @@ -541,14 +542,16 @@ struct remoteio_server *remoteio_getserv @@
   if(traversal_result == LIST_OK)
     return (struct remoteio_server *)list_curr(opts->servers);
   return (struct remoteio_server *)NULL;
+}
 size_t remoteio_sendq_len(const struct remoteio *rem)
+{
   return (size_t)q_size(rem->outmsgs);
+}
 /**
    different remoteio methods' implementations:
  */
 /*
@@ @@ -582,13 +585,13 @@ int _remoteio_ssh_open(struct remoteio * @@
 int _remoteio_ssh_read(struct remoteio *rem, void *buf, size_t len, size_t *bytesread)
+{
   return execio_read(rem->execio, buf, len, bytesread);
+}
 int _remoteio_ssh_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten)
+int _remoteio_ssh_write(struct remoteio *rem, const void *buf, size_t len, size_t *byteswritten)
+{
   return execio_write(rem->execio, buf, len, byteswritten);
+}
 int _remoteio_ssh_close(struct remoteio *rem)
+{
@@ @@ -692,13 +695,13 @@ int _remoteio_sock_read(struct remoteio @@
       return 1;
+    }
   return 0;
+}
 int _remoteio_sock_write(struct remoteio *rem, void *buf, size_t len, size_t *byteswritten)
+int _remoteio_sock_write(struct remoteio *rem, const void *buf, size_t len, size_t *byteswritten)
+{
   ssize_t writertn;
   writertn = write(rem->sock, buf, len);
   if(writertn == -1)

src/common/remoteio.h

➞

Show inline comments

@@ @@ -126,7 +126,13 @@ int remoteio_write(struct remoteio *rem, @@
  * remoteio_read_handle_func_t.
+ *
  * @return nonzero on error
 */
 int remoteio_close(struct remoteio *rem);
 /**
  * Returns the number of unfulfilled remoteio_write() calls pending on
  * a remoteio handle.
  */
 size_t remoteio_sendq_len(const struct remoteio *rem);
 #endif

0 comments (0 inline, 0 general)