#include <atalk/logger.h>
#include <atalk/dsi.h>
-#include <netatalk/endian.h>
#include <atalk/util.h>
#define min(a,b) ((a) < (b) ? (a) : (b))
#define MSG_DONTWAIT 0x40
#endif
-/* ----------------------
- afpd is sleeping too much while trying to send something.
- May be there's no reader or the reader is also sleeping in write,
- look if there's some data for us to read, hopefully it will wake up
- the reader so we can write again.
-*/
+/*
+ * afpd is sleeping too much while trying to send something.
+ * May be there's no reader or the reader is also sleeping in write,
+ * look if there's some data for us to read, hopefully it will wake up
+ * the reader so we can write again.
+ *
+ * @returns 0 when is possible to send again, -1 on error
+ */
static int dsi_peek(DSI *dsi)
{
+ static int warned = 0;
fd_set readfds, writefds;
int len;
int maxfd;
LOG(log_debug, logtype_dsi, "dsi_peek");
- FD_ZERO(&readfds);
- FD_ZERO(&writefds);
- FD_SET( dsi->socket, &readfds);
- FD_SET( dsi->socket, &writefds);
- maxfd = dsi->socket +1;
+ maxfd = dsi->socket + 1;
while (1) {
- FD_SET( dsi->socket, &readfds);
+ FD_ZERO(&readfds);
+ FD_ZERO(&writefds);
+
+ if (dsi->eof < dsi->end) {
+ /* space in read buffer */
+ FD_SET( dsi->socket, &readfds);
+ } else {
+ if (!warned) {
+ warned = 1;
+ LOG(log_note, logtype_dsi, "dsi_peek: readahead buffer is full, possibly increase -dsireadbuf option");
+ LOG(log_note, logtype_dsi, "dsi_peek: dsireadbuf: %d, DSI quantum: %d, effective buffer size: %d",
+ dsi->dsireadbuf,
+ dsi->server_quantum ? dsi->server_quantum : DSI_SERVQUANT_DEF,
+ dsi->end - dsi->buffer);
+ }
+ }
+
FD_SET( dsi->socket, &writefds);
/* No timeout: if there's nothing to read nor nothing to write,
return -1;
}
+ if (FD_ISSET(dsi->socket, &writefds)) {
+ /* we can write again */
+ LOG(log_debug, logtype_dsi, "dsi_peek: can write again");
+ break;
+ }
+
/* Check if there's sth to read, hopefully reading that will unblock the client */
if (FD_ISSET(dsi->socket, &readfds)) {
- len = dsi->end - dsi->eof;
-
- if (len <= 0) {
- /* ouch, our buffer is full ! fall back to blocking IO
- * could block and disconnect but it's better than a cpu hog */
- LOG(log_warning, logtype_dsi, "dsi_peek: read buffer is full");
- break;
- }
+ len = dsi->end - dsi->eof; /* it's ensured above that there's space */
if ((len = read(dsi->socket, dsi->eof, len)) <= 0) {
if (len == 0) {
dsi->eof += len;
}
-
- if (FD_ISSET(dsi->socket, &writefds)) {
- /* we can write again */
- LOG(log_debug, logtype_dsi, "dsi_peek: can write again");
- break;
- }
}
return 0;
continue;
if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ LOG(log_debug, logtype_dsi, "dsi_stream_write: send: %s", strerror(errno));
+
if (mode == DSI_NOWAIT && written == 0) {
/* DSI_NOWAIT is used by attention give up in this case. */
written = -1;
{
size_t nbe = 0;
+ if (dsi->buffer == NULL)
+ /* afpd master has no DSI buffering */
+ return 0;
+
LOG(log_maxdebug, logtype_dsi, "from_buf: %u bytes", count);
- if (dsi->start) {
- nbe = dsi->eof - dsi->start;
+ nbe = dsi->eof - dsi->start;
- if (nbe > 0) {
- nbe = min((size_t)nbe, count);
- memcpy(buf, dsi->start, nbe);
- dsi->start += nbe;
+ if (nbe > 0) {
+ nbe = min((size_t)nbe, count);
+ memcpy(buf, dsi->start, nbe);
+ dsi->start += nbe;
- if (dsi->eof == dsi->start)
- dsi->start = dsi->eof = dsi->buffer;
-
- }
+ if (dsi->eof == dsi->start)
+ dsi->start = dsi->eof = dsi->buffer;
}
+
+ LOG(log_debug, logtype_dsi, "from_buf(read: %u, unread:%u , space left: %u): returning %u",
+ dsi->start - dsi->buffer, dsi->eof - dsi->start, dsi->end - dsi->eof, nbe);
+
return nbe;
}
*/
static ssize_t buf_read(DSI *dsi, u_int8_t *buf, size_t count)
{
- ssize_t nbe;
+ ssize_t len;
- LOG(log_maxdebug, logtype_dsi, "buf_read: %u bytes", count);
+ LOG(log_maxdebug, logtype_dsi, "buf_read(%u bytes)", count);
if (!count)
return 0;
- nbe = from_buf(dsi, buf, count); /* 1. */
- if (nbe)
- return nbe; /* 2. */
+ len = from_buf(dsi, buf, count); /* 1. */
+ if (len)
+ return len; /* 2. */
- return readt(dsi->socket, buf, count, 0, 1); /* 3. */
+ len = readt(dsi->socket, buf, count, 0, 1); /* 3. */
+
+ LOG(log_maxdebug, logtype_dsi, "buf_read(%u bytes): got: %d", count, len);
+
+ return len;
}
/*
* Essentially a loop around buf_read() to ensure "length" bytes are read
* from dsi->buffer and/or the socket.
+ *
+ * @returns length on success, some value smaller then length indicates an error
*/
size_t dsi_stream_read(DSI *dsi, void *data, const size_t length)
{
size_t stored;
ssize_t len;
- LOG(log_maxdebug, logtype_dsi, "dsi_stream_read: %u bytes", length);
+ LOG(log_maxdebug, logtype_dsi, "dsi_stream_read(%u bytes)", length);
stored = 0;
while (stored < length) {
- len = buf_read(dsi, (u_int8_t *) data + stored, length - stored);
- if (len == -1 && (errno == EINTR || errno == EAGAIN)) {
- LOG(log_debug, logtype_dsi, "dsi_stream_read: select read loop");
- continue;
- } else if (len > 0) {
- stored += len;
- } else { /* eof or error */
- /* don't log EOF error if it's just after connect (OSX 10.3 probe) */
- if (len || stored || dsi->read_count) {
- if (! (dsi->flags & DSI_DISCONNECTED)) {
- LOG(log_error, logtype_dsi, "dsi_stream_read: len:%d, %s",
- len, (len < 0) ? strerror(errno) : "unexpected EOF");
- AFP_PANIC("FIXME");
+ len = buf_read(dsi, (u_int8_t *) data + stored, length - stored);
+ if (len == -1 && (errno == EINTR || errno == EAGAIN)) {
+ LOG(log_debug, logtype_dsi, "dsi_stream_read: select read loop");
+ continue;
+ } else if (len > 0) {
+ stored += len;
+ } else { /* eof or error */
+ /* don't log EOF error if it's just after connect (OSX 10.3 probe) */
+ if (len || stored || dsi->read_count) {
+ if (! (dsi->flags & DSI_DISCONNECTED)) {
+ LOG(log_error, logtype_dsi, "dsi_stream_read: len:%d, %s",
+ len, (len < 0) ? strerror(errno) : "unexpected EOF");
+ }
+ return 0;
}
+ break;
}
- break;
- }
}
dsi->read_count += stored;
+
+ LOG(log_maxdebug, logtype_dsi, "dsi_stream_read(%u bytes): got: %u", length, stored);
return stored;
}
/*
* Get "length" bytes from buffer and/or socket. In order to avoid frequent small reads
- * this tries to read larger chunks (65536 bytes) into a buffer.
+ * this tries to read larger chunks (8192 bytes) into a buffer.
*/
static size_t dsi_buffered_stream_read(DSI *dsi, u_int8_t *data, const size_t length)
{
return len; /* yes */
}
- /* fill the buffer with 65536 bytes or until buffer is full */
- buflen = min(65536, dsi->end - dsi->eof);
+ /* fill the buffer with 8192 bytes or until buffer is full */
+ buflen = min(8192, dsi->end - dsi->eof);
if (buflen > 0) {
ssize_t ret;
ret = read(dsi->socket, dsi->eof, buflen);
towrite = sizeof(block) + length;
dsi->write_count += towrite;
while (towrite > 0) {
- if (((len = writev(dsi->socket, iov, 2)) == -1 && errno == EINTR) ||
- !len)
- continue;
+ if (((len = writev(dsi->socket, iov, 2)) == -1 && errno == EINTR) || (len == 0))
+ continue;
- if ((size_t)len == towrite) /* wrote everything out */
- break;
- else if (len < 0) { /* error */
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
- if (!dsi_peek(dsi)) {
- continue;
+ if ((size_t)len == towrite) /* wrote everything out */
+ break;
+ else if (len < 0) { /* error */
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (!dsi_peek(dsi)) {
+ continue;
+ }
}
+ LOG(log_error, logtype_dsi, "dsi_stream_send: %s", strerror(errno));
+ unblock_sig(dsi);
+ return 0;
}
- LOG(log_error, logtype_dsi, "dsi_stream_send: %s", strerror(errno));
- unblock_sig(dsi);
- return 0;
- }
- towrite -= len;
- if (towrite > length) { /* skip part of header */
- iov[0].iov_base = (char *) iov[0].iov_base + len;
- iov[0].iov_len -= len;
- } else { /* skip to data */
- if (iov[0].iov_len) {
- len -= iov[0].iov_len;
- iov[0].iov_len = 0;
+ towrite -= len;
+ if (towrite > length) { /* skip part of header */
+ iov[0].iov_base = (char *) iov[0].iov_base + len;
+ iov[0].iov_len -= len;
+ } else { /* skip to data */
+ if (iov[0].iov_len) {
+ len -= iov[0].iov_len;
+ iov[0].iov_len = 0;
+ }
+ iov[1].iov_base = (char *) iov[1].iov_base + len;
+ iov[1].iov_len -= len;
}
- iov[1].iov_base = (char *) iov[1].iov_base + len;
- iov[1].iov_len -= len;
- }
}
unblock_sig(dsi);
projects / netatalk.git / blobdiff