Changeset 7180

Timestamp:

02/27/08 15:05:04 (5 years ago)

Author:

frsyuki

Message:

lang/c/partty: fixed busy loop probrem

Location:

lang/c/partty/trunk

Files:

• host.cc (modified) (5 diffs)
• multiplexer.cc (modified) (5 diffs)
• partty.h (modified) (5 diffs)
• uniext.h (modified) (3 diffs)

lang/c/partty/trunk/host.cc

@@ -79 +79 @@
         {
                 uint16_t msglen = ntohs(reply.message_length);
-                char* msg = (char*)malloc(msglen);
+                char* msg = (char*)malloc(msglen+1);
                 if( msg == NULL ) {
                         throw initialize_error("failed to receive negotiation reply");
@@ -88 +88 @@
                 }
                 if( reply.code != negotiation_reply::SUCCESS ) {
+                        msg[msglen] = '\0';
                         initialize_error e(msg);
                         free(msg);
@@ -160 +161 @@
         } else if( len == 0 ) { throw io_end_error("end of stdinput"); }
         // ブロックしながらシェルに書き込む
-        // XXX 書き込み可能になるまでビジーループ
-        if( write_all(sh, shared_buffer, len) != (size_t)len ){
+        if( continued_blocking_write_all(sh, shared_buffer, len) != (size_t)len ){
                 throw io_error("pty is broken");
         }
@@ -191 +191 @@
         if( m_locking ) { return 0; }
         // ブロックしながらシェルに書き込む
-        // XXX 書き込み可能になるまでビジーループ
-        if( write_all(sh, shared_buffer, len) != (size_t)len ){
+        if( continued_blocking_write_all(sh, shared_buffer, len) != (size_t)len ){
                 throw io_error("pty is broken");
         }
@@ -208 +207 @@
         } else if( len == 0 ) { throw io_end_error("session ends"); }
         // ブロックしながら標準出力に書き込む
-        // XXX 書き込み可能になるまでビジーループ
-        if( write_all(STDOUT_FILENO, shared_buffer, len) != (size_t)len ) {
+        if( continued_blocking_write_all(STDOUT_FILENO, shared_buffer, len) != (size_t)len ) {
                 throw io_error("stdoutput is broken");
         }
         // ブロックしながらServerに書き込む
-        // XXX 書き込み可能になるまでビジーループ
-        if( write_all(server, shared_buffer, len) != (size_t)len ) {
+        if( continued_blocking_write_all(server, shared_buffer, len) != (size_t)len ) {
                 throw io_error("server connection is broken");
         }

lang/c/partty/trunk/multiplexer.cc

@@ -75 +75 @@
         for(delimiter = 0x3A; delimiter <= 0x7E; ++delimiter) {
                 // ':' - '~'
-                if( !(exist = strchr(info.session_name, delimiter)) ) { break; }
+                if( (exist = strchr(info.session_name, delimiter)) ) { break; }
         }
         if( !exist ) {
                 for(delimiter = 0x21; delimiter < 0x3A; ++delimiter) {
                         // '!' - '9'
-                        if( !(exist = strchr(info.session_name, delimiter)) ) { break; }
+                        if( (exist = strchr(info.session_name, delimiter)) ) { break; }
                 }
         }
@@ -195 +195 @@
         ssize_t len = read(fd, shared_buffer, SHARED_BUFFER_SIZE);
         if( len < 0 ) {
-                if( errno == EAGAIN || errno == EINTR ) { /* do nothing */ }
+                if( errno == EAGAIN || errno == EINTR ) { return 0; }
                 else { throw io_error("host socket is broken"); }
         } else if( len == 0 ) {
@@ -226 +226 @@
                 ssize_t len = read(fd, shared_buffer, SHARED_BUFFER_SIZE);
                 if( len < 0 ) {
-                        if( errno == EAGAIN || errno == EINTR ) { /* do nothing */ }
+                        if( errno == EAGAIN || errno == EINTR ) { /* pass through */ }
                         else {
                                 perror("read from guest failed");
@@ -243 +243 @@
                                 return 0;
                         }
-                        // FIXME write_all? ブロッキングモードにする？
                         // FIXME Hostが切断されたのかエラーが発生したのか区別できない
-                        if( write_all(host, ibuf.buf, ibuf.len) != ibuf.len ) {
+                        if( continued_blocking_write_all(host, ibuf.buf, ibuf.len) != ibuf.len ) {
                                 throw io_error("host socket is broken");
                         }
@@ -257 +256 @@
                 //if( srv.olength == 0 ) { return 0; }  // olengthは0の可能性がある？
                 if( len < 0 ) {
-                        if( errno == EAGAIN || errno == EINTR ) { /* do nothing */ }
+                        if( errno == EAGAIN || errno == EINTR ) { return 0; }
                         else {
                                 perror("write to guest failed");

lang/c/partty/trunk/partty.h

@@ -12 +12 @@
 
 #ifndef PARTTY_GATE_DIR
-#define PARTTY_GATE_DIR "./var/"
-#endif
-
-//#ifndef PARTTY_GATE_SOCKET_NAME
-//#define PARTTY_GATE_SOCKET_NAME "gate"
-//#endif
+#define PARTTY_GATE_DIR "./var/socket/"
+#endif
+
+#ifndef PARTTY_ARCHIVE_DIR
+#define PARTTY_ARCHIVE_DIR \
+        "./archive/archive/"
+#endif
 
 #ifndef PARTTY_GATE_SESSION_BANNER
@@ -65 +66 @@
 
 static const char* const GATE_DIR = PARTTY_GATE_DIR;
-//static const char* const GATE_SOCKET_NAME = PARTTY_GATE_SOCKET_NAME;
+static const char* const ARCHIVE_DIR = PARTTY_ARCHIVE_DIR;
 static const char* const GATE_PASSWORD_BANNER = PARTTY_GATE_PASSWORD_BANNER;
 static const char* const GATE_SESSION_BANNER = PARTTY_GATE_SESSION_BANNER;
@@ -73 +74 @@
 
 
-//static const char PARTTY_VERSION[] = "0.0";
-//static const char PARTTY_REVISION[] = "0";
 static const uint8_t PROTOCOL_VERSION = 1;
 
@@ -239 +238 @@
 class Host {
 public:
+        struct config_t {
+                config_t(int _server_socket,
+                                const session_info_ref_t& info_) :
+                        server_socket(_server_socket),
+                        info(info_) {}
+        public:
+                int lock_code;
+        private:
+                int server_socket;
+                const session_info_ref_t& info;
+                friend class HostIMPL;
+        };
+public:
         Host(int server_socket, char lock_code,
                 const session_info_ref_t& info);
@@ -255 +267 @@
 class Gate {
 public:
+        struct config_t {
+                config_t(int listen_socket_) :
+                        listen_socket(listen_socket_) {}
+        public:
+        private:
+                int listen_socket;
+                friend class GateIMPL;
+        };
+public:
         Gate(int listen_socket);
         ~Gate();

lang/c/partty/trunk/uniext.h

@@ -5 +5 @@
 #include <unistd.h>
 #include <errno.h>
+#include <fcntl.h>
 
 namespace Partty {
 
 
-inline size_t read_all(int fd, void *buf, size_t count) {
+inline size_t read_all(int fd, void *buf, size_t count)
+{
         char *p = (char*)buf;
         char * const endp = p + count;
 
         do {
-                const int num_bytes = read(fd, p, endp - p);
+                const ssize_t num_bytes = read(fd, p, endp - p);
                 if( num_bytes < 0 ) {
                         if( errno != EINTR && errno != EAGAIN ) {
@@ -27 +29 @@
 }
 
-inline size_t write_all(int fd, const void *buf, size_t count) {
+inline size_t write_all(int fd, const void *buf, size_t count)
+{
         const char *p = (char*)buf;
         const char * const endp = p + count;
 
         do {
-                const int num_bytes = write(fd, p, endp - p);
+                const ssize_t num_bytes = write(fd, p, endp - p);
                 if( num_bytes < 0 ) {
                         if( errno != EINTR && errno != EAGAIN ) {
@@ -45 +48 @@
 }
 
+inline size_t continued_blocking_read_all(int fd, void* buf, size_t count)
+{
+        ssize_t num_bytes;
+
+        num_bytes = read(fd, buf, count);
+        if( num_bytes >= count ) {
+                return num_bytes;
+        } else if( num_bytes <= 0 ) {
+                if( errno != EINTR && errno != EAGAIN ) { return 0; }
+                else { num_bytes = 0; }
+        }
+
+        fcntl(fd, F_SETFL, 0);
+
+        char *p = (char*)buf + num_bytes;
+        char * const endp = (char*)buf + count;
+
+        do {
+                num_bytes = read(fd, p, endp - p);
+                if( num_bytes < 0 ) {
+                        if( errno != EINTR && errno != EAGAIN ) {
+                                break;
+                        }
+                } else {
+                        p += num_bytes;
+                }
+        } while (p < endp);
+
+        fcntl(fd, F_SETFL, O_NONBLOCK);
+
+        return endp - p;
+}
+
+inline size_t continued_blocking_write_all(int fd, const void* buf, size_t count)
+{
+        ssize_t num_bytes;
+
+        num_bytes = write(fd, buf, count);
+        if( num_bytes >= count ) {
+                return num_bytes;
+        } else if( num_bytes <= 0 ) {
+                if( errno != EINTR && errno != EAGAIN ) { return 0; }
+                else { num_bytes = 0; }
+        }
+
+        fcntl(fd, F_SETFL, 0);
+
+        const char *p = (char*)buf + num_bytes;
+        const char * const endp = (char*)buf + count;
+
+        do {
+                num_bytes = write(fd, p, endp - p);
+                if( num_bytes < 0 ) {
+                        if( errno != EINTR && errno != EAGAIN ) {
+                                break;
+                        }
+                } else {
+                        p += num_bytes;
+                }
+        } while (p < endp);
+
+        fcntl(fd, F_SETFL, O_NONBLOCK);
+
+        return endp - p;
+}
+
 void initprocname(int argc, char**& argv, char**& envp);