X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=28d8f3980f814763cfe249e5762203ff5038a9a5;hp=96f0d7ec7cfe3e0b2a757de4f66472ec2d576267;hb=534a94f441767947874cb15d18211edf758e9277;hpb=625fdbbafaf3842753bff02b349eaaf9554d846d

diff --git a/afh_recv.c b/afh_recv.c
index 96f0d7ec..28d8f398 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -41,11 +40,11 @@ static int afh_execute(struct btr_node *btrn, const char *cmd, char **result)
 
 	*result = NULL;
 	if (!strcmp(cmd, "seconds_total")) {
-		*result = make_message("%lu", pard->afhi.seconds_total);
+		*result = make_message("%" PRIu32, pard->afhi.seconds_total);
 		return 1;
 	}
 	if (!strcmp(cmd, "chunks_total")) {
-		*result = make_message("%lu", pard->afhi.chunks_total);
+		*result = make_message("%" PRIu32, pard->afhi.chunks_total);
 		return 1;
 	}
 	if (!strcmp(cmd, "afhi")) {
@@ -59,8 +58,8 @@ static int afh_execute(struct btr_node *btrn, const char *cmd, char **result)
 			return ret;
 		if (x >= pard->afhi.chunks_total)
 			return -ERRNO_TO_PARA_ERROR(EINVAL);
-		pard->first_chunk = pard->current_chunk = x;
-		rn->task.error = 0;
+		pard->first_chunk = afh_get_start_chunk(x, &pard->afhi);
+		pard->current_chunk = pard->first_chunk;
 		return 1;
 	}
 	return -E_BTR_NAVAIL;
@@ -110,9 +109,12 @@ static int afh_recv_open(struct receiver_node *rn)
 	if (PARA_ABS(conf->begin_chunk_arg) >= afhi->chunks_total)
 		goto out_clear_afhi;
 	if (conf->begin_chunk_arg >= 0)
-		pard->first_chunk = conf->begin_chunk_arg;
+		pard->first_chunk = afh_get_start_chunk(
+			conf->begin_chunk_arg, &pard->afhi);
 	else
-		pard->first_chunk = afhi->chunks_total + conf->begin_chunk_arg;
+		pard->first_chunk = afh_get_start_chunk(
+			afhi->chunks_total + conf->begin_chunk_arg,
+			&pard->afhi);
 	if (conf->end_chunk_given) {
 		ret = -ERRNO_TO_PARA_ERROR(EINVAL);
 		if (PARA_ABS(conf->end_chunk_arg) > afhi->chunks_total)
@@ -151,14 +153,14 @@ static void afh_recv_close(struct receiver_node *rn)
 	freep(&rn->private_data);
 }
 
-static void afh_recv_pre_select(struct sched *s, struct task *t)
+static void afh_recv_pre_select(struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 	struct private_afh_recv_data *pard = rn->private_data;
 	struct afh_info *afhi = &pard->afhi;
 	struct afh_recv_args_info *conf = rn->conf;
 	struct timeval chunk_time;
-	int state = generic_recv_pre_select(s, t);
+	int state = generic_recv_pre_select(s, rn);
 
 	if (state <= 0)
 		return;
@@ -171,9 +173,9 @@ static void afh_recv_pre_select(struct sched *s, struct task *t)
 	sched_request_barrier_or_min_delay(&chunk_time, s);
 }
 
-static int afh_recv_post_select(__a_unused struct sched *s, struct task *t)
+static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 	struct afh_recv_args_info *conf = rn->conf;
 	struct private_afh_recv_data *pard = rn->private_data;
 	struct btr_node *btrn = rn->btrn;
@@ -203,7 +205,7 @@ static int afh_recv_post_select(__a_unused struct sched *s, struct task *t)
 		afh_get_chunk(pard->first_chunk, afhi, pard->map, &start, &size);
 		afh_get_chunk(pard->last_chunk, afhi, pard->map, &end, &size);
 		end += size;
-		PARA_INFO_LOG("adding %zu bytes\n", end - start);
+		PARA_INFO_LOG("adding %td bytes\n", end - start);
 		btr_add_output_dont_free(start, end - start, btrn);
 		ret = -E_RECV_EOF;
 		goto out;
@@ -254,9 +256,6 @@ void afh_recv_init(struct receiver *r)
 	r->parse_config = afh_recv_parse_config;
 	r->free_config = afh_recv_free_config;
 	r->execute = afh_execute;
-	r->help = (struct ggo_help) {
-		.short_help = afh_recv_args_info_help,
-		.detailed_help = afh_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(afh_recv);
 	afh_recv_cmdline_parser_free(&dummy);
 }