--- deliantra/server/socket/lowlevel.C 2006/12/14 20:39:54 1.19 +++ deliantra/server/socket/lowlevel.C 2006/12/14 21:46:34 1.20 @@ -53,31 +53,87 @@ #define SOCKET_TIMEOUT2 20 void -Socket_Flush (client_socket * ns) +client_socket::flush () { #ifdef __linux__ // check time of last ack, and, if too old, kill connection struct tcp_info tcpi; socklen_t len = sizeof (tcpi); - if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) + if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) { unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s { - LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, + LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); - ns->status = Ns_Dead; + status = Ns_Dead; } } +#endif + + /** + * Writes data to socket. + * + * When the socket is clear to write, and we have backlogged data, this + * is called to write it out. + */ - int val; + if (!outputbuffer.len || socket_ev.poll () & PE_W) + return; - val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); - val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); + write_outputbuffer (); +} + +void +client_socket::write_outputbuffer () +{ + while (outputbuffer.len) + { + int res = write (fd, outputbuffer.data + outputbuffer.start, + min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start)); + + if (res > 0) + { + outputbuffer.start += res; + /* wrap back to start of buffer */ + if (outputbuffer.start == SOCKETBUFSIZE) + outputbuffer.start = 0; + + outputbuffer.len -= res; +#ifdef CS_LOGSTATS + cst_tot.obytes += res; + cst_lst.obytes += res; #endif + } + else if (res == 0) + { + LOG (llevError, "socket write failed, connection closed.\n"); + status = Ns_Dead; + return; + } + else if (errno == EINTR) + { + // just retry + } + else if (errno == EAGAIN) + { + // delay till ready + socket_ev.poll (socket_ev.poll () | PE_W); + socket_ev.start (); + return; + } + else + { + LOG (llevError, "socket write failed: %s\n", strerror (errno)); + status = Ns_Dead; + return; + } + } + + socket_ev.poll (socket_ev.poll () & ~PE_W); } /*********************************************************************** @@ -173,7 +229,7 @@ { if (errno != EAGAIN && errno != EINTR) { - LOG (llevError, "read error: %s", strerror (errno)); + LOG (llevError, "read error: %s\n", strerror (errno)); return -1; } @@ -206,24 +262,32 @@ * ns is the socket we are adding the data to, buf is the start of the * data, and len is the number of bytes to add. */ - -static void -add_to_buffer (client_socket *ns, char *buf, int len) +void +client_socket::send (void *buf_, int len) { - int avail, end; + char *buf = (char *)buf_; + char *pos = buf; + int amt = 0; + + if (status == Ns_Dead || !buf) + { + LOG (llevDebug, "Write_To_Socket called with dead socket\n"); + return; + } - if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE) + if ((len + outputbuffer.len) > SOCKETBUFSIZE) { - LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd); - ns->status = Ns_Dead; + LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd); + status = Ns_Dead; return; } + int avail, end; + /* data + end is where we start putting the new data. The last byte * currently in use is actually data + end -1 */ - - end = ns->outputbuffer.start + ns->outputbuffer.len; + end = outputbuffer.start + outputbuffer.len; /* The buffer is already in a wrapped state, so adjust end */ if (end >= SOCKETBUFSIZE) end -= SOCKETBUFSIZE; @@ -232,151 +296,23 @@ /* We can all fit it behind the current data without wrapping */ if (avail >= len) - memcpy (ns->outputbuffer.data + end, buf, len); + memcpy (outputbuffer.data + end, buf, len); else { - memcpy (ns->outputbuffer.data + end, buf, avail); - memcpy (ns->outputbuffer.data, buf + avail, len - avail); + memcpy (outputbuffer.data + end, buf, avail); + memcpy (outputbuffer.data, buf + avail, len - avail); } - ns->outputbuffer.len += len; -#if 0 - LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start); -#endif -} - -/** - * Writes data to socket. - * - * When the socket is clear to write, and we have backlogged data, this - * is called to write it out. - */ -void -write_socket_buffer (client_socket * ns) -{ - int amt, max; - - if (ns->outputbuffer.len == 0) - { - LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd); - return; - } - - do - { - max = SOCKETBUFSIZE - ns->outputbuffer.start; - if (ns->outputbuffer.len < max) - max = ns->outputbuffer.len; - - do - { - amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max); - } - while ((amt < 0) && (errno == EINTR)); - - if (amt < 0) - { /* We got an error */ - - if (errno != EWOULDBLOCK) - { - LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno)); - ns->status = Ns_Dead; - return; - } - else - { /* EWOULDBLOCK */ - /* can't write it, so store it away. */ - ns->can_write = 0; - return; - } - } - ns->outputbuffer.start += amt; - /* wrap back to start of buffer */ - if (ns->outputbuffer.start == SOCKETBUFSIZE) - ns->outputbuffer.start = 0; - ns->outputbuffer.len -= amt; -#ifdef CS_LOGSTATS - cst_tot.obytes += amt; - cst_lst.obytes += amt; -#endif - } - while (ns->outputbuffer.len > 0); -} - -/** - * This writes data to the socket. - It is very low level - - * all we try and do is write out the data to the socket - * provided (ns). buf is the data to write, len is the number - * of bytes to write. IT doesn't return anything - rather, it - * updates the ns structure if we get an error. - */ -void -client_socket::send (void *buf_, int len) -{ - char *buf = (char *)buf_; - char *pos = buf; - int amt = 0; - - if (status == Ns_Dead || !buf) - { - LOG (llevDebug, "Write_To_Socket called with dead socket\n"); - return; - } - -#ifndef __GNU__ /* This caused problems on Hurd */ - if (!can_write) - { - add_to_buffer (this, buf, len); - return; - } -#endif - - /* If we manage to write more than we wanted, take it as a bonus */ - while (len > 0) - { - do - { - amt = write (fd, pos, len); - } - while ((amt < 0) && (errno == EINTR)); - - if (amt < 0) - { /* We got an error */ - if (errno != EWOULDBLOCK) - { - LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ - errno, strerror (errno)); - status = Ns_Dead; - return; - } - else - { /* EWOULDBLOCK */ - /* can't write it, so store it away. */ - add_to_buffer (this, pos, len); - can_write = 0; - return; - } - } - /* amt gets set to 0 above in blocking code, so we do this as - * an else if to make sure we don't reprocess it. - */ - else if (amt == 0) - LOG (llevError, "Write_To_Socket: No data written out.\n"); - - len -= amt; - pos += amt; -#ifdef CS_LOGSTATS - cst_tot.obytes += amt; - cst_lst.obytes += amt; -#endif - } + outputbuffer.len += len; } void client_socket::socket_cb (iow &w, int got) { - //printf ("iow got %x\n", got); - w.stop (); + write_outputbuffer (); + + if (!outputbuffer.len) + socket_ev.poll (socket_ev.poll () & ~PE_W); } /**