service: adapt to new eloop

Author: rsmarples

src/service.c

@@ -70,7 +70,6 @@ svc_recv(void *arg, unsigned short e)
 	if (e & ELE_HANGUP) {
 	hangup:
 		eloop_exit(sctx->svc_ctx->ctx_eloop, EXIT_SUCCESS);
-		eloop_exit(sctx->svc_eloop, EXIT_SUCCESS);
 		return;
 	}
 	if (e != ELE_READ) {
@@ -109,12 +108,12 @@ svc_recv(void *arg, unsigned short e)
 	nread = recvmsg(sctx->svc_fd, &msg, 0);
 	if (nread == -1) {
 		logerr("%s: recvmsg cmd", __func__);
-		goto out;
+		return;
 	}
 	if ((size_t)nread != sizeof(cmd) + cmd.sc_datalen) {
 		logerrx("%s: read datalen mismatch: %zd != %zd", __func__,
 		    nread, sizeof(cmd) + cmd.sc_datalen);
-		goto out;
+		return;
 	}
 
 	sr->sr_datalen = cmd.sc_datalen;
@@ -125,9 +124,6 @@ svc_recv(void *arg, unsigned short e)
 	if (sctx->svc_dispatch != NULL)
 		sctx->svc_dispatch(sctx, (struct plugin *)cmd.sc_plugin,
 		    cmd.sc_cmd, sctx->svc_buf, cmd.sc_datalen);
-out:
-	if (sctx->svc_eloop != NULL)
-		eloop_exit(sctx->svc_eloop, EXIT_SUCCESS);
 }
 
 ssize_t
@@ -184,16 +180,17 @@ svc_runv(struct svc_ctx *sctx, struct plugin *p, unsigned int cmd,
     struct iovec *iov, int iovlen, ssize_t *res, void **rdata, size_t *rlen)
 {
 	struct svc_result *result = &sctx->svc_result;
-	int err;
+	int events;
 
 	if (svc_sendv(sctx, p, cmd, 0, iov, iovlen) == -1) {
 		logerr("%s: svc_write", __func__);
 		return -1;
 	}
 
-	err = eloop_start(sctx->svc_eloop);
-	if (err == -1)
+	events = eloop_waitfd(sctx->svc_fd);
+	if (events == -1)
 		return -1;
+	svc_recv(sctx, (unsigned short)events);
 
 	if (result->sr_result == -1)
 		errno = result->sr_errno;
@@ -203,7 +200,7 @@ svc_runv(struct svc_ctx *sctx, struct plugin *p, unsigned int cmd,
 		*rdata = result->sr_data;
 	if (rlen != NULL)
 		*rlen = result->sr_datalen;
-	return err;
+	return 0;
 }
 
 int
@@ -236,7 +233,6 @@ svc_init(struct ctx *ctx, const char *name,
 	sctx->svc_ctx = ctx;
 	sctx->svc_fd = -1;
 	sctx->svc_dispatch = NULL;
-	sctx->svc_eloop = NULL;
 
 	sctx->svc_buflen = 1024;
 	sctx->svc_buf = malloc(sctx->svc_buflen);
@@ -265,16 +261,6 @@ svc_init(struct ctx *ctx, const char *name,
 	default:
 		sctx->svc_fd = fdset[0];
 		close(fdset[1]);
-		sctx->svc_eloop = eloop_new();
-		if (sctx->svc_eloop == NULL) {
-			logerr("%s: eloop_new", __func__);
-			goto error;
-		}
-		if (eloop_event_add(sctx->svc_eloop, sctx->svc_fd, ELE_READ,
-			svc_recv, sctx) == -1) {
-			logerr("%s: eloop_event_add", __func__);
-			goto error;
-		}
 		logdebugx("service: spawned %s on pid %ld", name, (long)pid);
 		return sctx;
 	}
@@ -333,6 +319,5 @@ svc_free(struct svc_ctx *ctx)
 	if (ctx->svc_fd != -1)
 		close(ctx->svc_fd);
 	free(ctx->svc_buf);
-	eloop_free(ctx->svc_eloop);
 	free(ctx);
 }

src/service.h

@@ -45,7 +45,6 @@ struct svc_result {
 
 struct svc_ctx {
 	struct ctx *svc_ctx;
-	struct eloop *svc_eloop;
 	int svc_fd;
 	void *svc_buf;
 	size_t svc_buflen;