X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=6a0ec239bbcbd120efd130b5f8f24c2b136d4516;hp=e7f85a1bd5a6dce0c8c256b22e52e2c1c9bf9ece;hb=HEAD;hpb=610cb53b94af8e95326cd44b7845f35cffdb6bf3

diff --git a/afh_recv.c b/afh_recv.c
index e7f85a1b..8449e787 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -75,7 +75,7 @@ static int afh_recv_open(struct receiver_node *rn)
 
 	if (!fn || *fn == '\0')
 		return -E_AFH_RECV_BAD_FILENAME;
-	rn->private_data = pard = para_calloc(sizeof(*pard));
+	rn->private_data = pard = zalloc(sizeof(*pard));
 	afhi = &pard->afhi;
 	ret = mmap_full_file(fn, O_RDONLY, &pard->map,
 		&pard->map_size, &pard->fd);
@@ -142,14 +142,14 @@ static void afh_recv_close(struct receiver_node *rn)
 	freep(&rn->private_data);
 }
 
-static void afh_recv_pre_select(struct sched *s, void *context)
+static void afh_recv_pre_monitor(struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 	struct private_afh_recv_data *pard = rn->private_data;
 	struct afh_info *afhi = &pard->afhi;
 	struct lls_parse_result *lpr = rn->lpr;
 	struct timeval chunk_time;
-	int state = generic_recv_pre_select(s, rn);
+	int state = generic_recv_pre_monitor(s, rn);
 	unsigned j_given = RECV_CMD_OPT_GIVEN(AFH, JUST_IN_TIME, lpr);
 
 	if (state <= 0)
@@ -163,7 +163,7 @@ static void afh_recv_pre_select(struct sched *s, void *context)
 	sched_request_barrier_or_min_delay(&chunk_time, s);
 }
 
-static int afh_recv_post_select(__a_unused struct sched *s, void *context)
+static int afh_recv_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 	struct lls_parse_result *lpr = rn->lpr;
@@ -205,7 +205,7 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 			PARA_DEBUG_LOG("adding %u bytes\n", len);
 			btr_add_output_dont_free(start, len, btrn);
 		}
-		ret = -E_RECV_EOF;
+		ret = -E_EOF;
 		goto out;
 	}
 	if (pard->current_chunk == pard->first_chunk)
@@ -226,7 +226,7 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 	PARA_DEBUG_LOG("adding chunk %u\n", pard->current_chunk);
 	btr_add_output_dont_free(start, len, btrn);
 	if (pard->current_chunk >= pard->last_chunk) {
-		ret = -E_RECV_EOF;
+		ret = -E_EOF;
 		goto out;
 	}
 	pard->current_chunk++;
@@ -242,7 +242,7 @@ out:
 const struct receiver lsg_recv_cmd_com_afh_user_data = {
 	.open = afh_recv_open,
 	.close = afh_recv_close,
-	.pre_select = afh_recv_pre_select,
-	.post_select = afh_recv_post_select,
+	.pre_monitor = afh_recv_pre_monitor,
+	.post_monitor = afh_recv_post_monitor,
 	.execute = afh_execute,
 };