X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmtio.c;h=b2f55f8ef6e2c9ded84dbee955617f450f0adb06;hb=107712e330c1921d198dcb2c70c8369cda2d85be;hp=43cc1f7045d3478c483846ebf57a232684b5d100;hpb=330c9bc3a9008ac4937e79e80a0d383ce082f7c1;p=ashd.git
diff --git a/lib/mtio.c b/lib/mtio.c
index 43cc1f7..b2f55f8 100644
--- a/lib/mtio.c
+++ b/lib/mtio.c
@@ -16,16 +16,17 @@
along with this program. If not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include
+#endif
#include
#include
+#include
#include
#include
#include
#include
-#ifdef HAVE_CONFIG_H
-#include
-#endif
#include
#include
#include
@@ -37,7 +38,7 @@ struct stdiofd {
int timeout;
};
-static ssize_t mtread(void *cookie, char *buf, size_t len)
+static ssize_t mtread(void *cookie, void *buf, size_t len)
{
struct stdiofd *d = cookie;
int ev;
@@ -62,39 +63,30 @@ static ssize_t mtread(void *cookie, char *buf, size_t len)
}
}
-static ssize_t mtwrite(void *cookie, const char *buf, size_t len)
+static ssize_t mtwrite(void *cookie, const void *buf, size_t len)
{
struct stdiofd *d = cookie;
int ev;
- size_t off;
ssize_t ret;
- off = 0;
- while(off < len) {
+ while(1) {
if(d->sock)
- ret = send(d->fd, buf + off, len - off, MSG_DONTWAIT | MSG_NOSIGNAL);
+ ret = send(d->fd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL);
else
- ret = write(d->fd, buf + off, len - off);
- if(ret < 0) {
- if(errno == EAGAIN) {
- ev = block(d->fd, EV_WRITE, d->timeout);
- if(ev < 0) {
- /* If we just go on, we should get the real error. */
- continue;
- } else if(ev == 0) {
- errno = ETIMEDOUT;
- return(off);
- } else {
- continue;
- }
- } else {
- return(off);
+ ret = write(d->fd, buf, len);
+ if((ret < 0) && (errno == EAGAIN)) {
+ ev = block(d->fd, EV_WRITE, d->timeout);
+ if(ev < 0) {
+ /* If we just go on, we should get the real error. */
+ continue;
+ } else if(ev == 0) {
+ errno = ETIMEDOUT;
+ return(-1);
}
} else {
- off += ret;
+ return(ret);
}
}
- return(off);
}
static int mtclose(void *cookie)
@@ -106,25 +98,135 @@ static int mtclose(void *cookie)
return(0);
}
-static cookie_io_functions_t iofuns = {
- .read = mtread,
- .write = mtwrite,
- .close = mtclose,
-};
-
FILE *mtstdopen(int fd, int issock, int timeout, char *mode)
{
struct stdiofd *d;
FILE *ret;
+ int r, w;
+ if(!strcmp(mode, "r")) {
+ r = 1; w = 0;
+ } else if(!strcmp(mode, "w")) {
+ r = 0; w = 1;
+ } else if(!strcmp(mode, "r+")) {
+ r = w = 1;
+ } else {
+ return(NULL);
+ }
omalloc(d);
d->fd = fd;
d->sock = issock;
d->timeout = timeout;
- ret = fopencookie(d, mode, iofuns);
+ ret = funstdio(d, r?mtread:NULL, w?mtwrite:NULL, NULL, mtclose);
if(!ret)
free(d);
else
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
return(ret);
}
+
+struct pipe {
+ struct charbuf data;
+ size_t bufmax;
+ int closed;
+ struct muth *r, *w;
+};
+
+static void freepipe(struct pipe *p)
+{
+ buffree(p->data);
+ free(p);
+}
+
+static ssize_t piperead(void *pdata, void *buf, size_t len)
+{
+ struct pipe *p = pdata;
+ ssize_t ret;
+
+ while(p->data.d == 0) {
+ if(p->closed & 2)
+ return(0);
+ if(p->r) {
+ errno = EBUSY;
+ return(-1);
+ }
+ p->r = current;
+ yield();
+ p->r = NULL;
+ }
+ ret = min(len, p->data.d);
+ memcpy(buf, p->data.b, ret);
+ memmove(p->data.b, p->data.b + ret, p->data.d -= ret);
+ if(p->w)
+ resume(p->w, 0);
+ return(ret);
+}
+
+static int piperclose(void *pdata)
+{
+ struct pipe *p = pdata;
+
+ if(p->closed & 2) {
+ freepipe(p);
+ } else {
+ p->closed |= 1;
+ if(p->w)
+ resume(p->w, 0);
+ }
+ return(0);
+}
+
+static ssize_t pipewrite(void *pdata, const void *buf, size_t len)
+{
+ struct pipe *p = pdata;
+ ssize_t ret;
+
+ if(p->closed & 1) {
+ errno = EPIPE;
+ return(-1);
+ }
+ while(p->data.d >= p->bufmax) {
+ if(p->w) {
+ errno = EBUSY;
+ return(-1);
+ }
+ p->w = current;
+ yield();
+ p->w = NULL;
+ if(p->closed & 1) {
+ errno = EPIPE;
+ return(-1);
+ }
+ }
+ ret = min(len, p->bufmax - p->data.d);
+ sizebuf(p->data, p->data.d + ret);
+ memcpy(p->data.b + p->data.d, buf, ret);
+ p->data.d += ret;
+ if(p->r)
+ resume(p->r, 0);
+ return(ret);
+}
+
+static int pipewclose(void *pdata)
+{
+ struct pipe *p = pdata;
+
+ if(p->closed & 1) {
+ freepipe(p);
+ } else {
+ p->closed |= 2;
+ if(p->r)
+ resume(p->r, 0);
+ }
+ return(0);
+}
+
+void mtiopipe(FILE **read, FILE **write)
+{
+ struct pipe *p;
+
+ omalloc(p);
+ p->bufmax = 4096;
+ *read = funstdio(p, piperead, NULL, NULL, piperclose);
+ *write = funstdio(p, NULL, pipewrite, NULL, pipewclose);
+}