X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client.c;h=827ff215dbf68446f90da4575dd32ebb3ed93a35;hb=e3a7e12639c34fd86d48a072beb48add8c498d09;hp=c43ebe161cfa322ce3e08c6f8a980f2e6de846da;hpb=e072e2a4feb9879f66bc4847a5007cec07b5f5f7;p=paraslash.git

diff --git a/client.c b/client.c
index c43ebe16..827ff215 100644
--- a/client.c
+++ b/client.c
@@ -42,7 +42,7 @@ struct exec_task {
 	size_t result_size;
 };
 
-static void exec_pre_select(struct sched *s, void *context)
+static void exec_pre_monitor(struct sched *s, void *context)
 {
 	struct exec_task *et = context;
 	int ret = btr_node_status(et->btrn, 0, BTR_NT_LEAF);
@@ -51,7 +51,7 @@ static void exec_pre_select(struct sched *s, void *context)
 		sched_min_delay(s);
 }
 
-static int exec_post_select(__a_unused struct sched *s, void *context)
+static int exec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct exec_task *et = context;
 	struct btr_node *btrn = et->btrn;
@@ -100,7 +100,7 @@ static int create_merged_lpr(const char *line)
 	/*
 	 * The original lpr for the interactive session has no non-option
 	 * arguments. We create a fresh lpr from the words in "line" and merge
-	 * it with the orignal lpr.
+	 * it with the original lpr.
 	 */
 	ret = lls(lls_parse(argc, argv, cmd, &argv_lpr, &errctx));
 	free_argv(argv);
@@ -123,7 +123,7 @@ fail:
 static int execute_client_command(const char *cmd, char **result)
 {
 	int ret;
-	struct sched command_sched = {.default_timeout = {.tv_sec = 1}};
+	struct sched command_sched = {.default_timeout = 1000};
 	struct exec_task exec_task = {
 		.result_buf = para_strdup(""),
 		.result_size = 1,
@@ -138,8 +138,8 @@ static int execute_client_command(const char *cmd, char **result)
 		EMBRACE(.name = "exec_collect"));
 	exec_task.task = task_register(&(struct task_info) {
 		.name = "client exec",
-		.pre_select = exec_pre_select,
-		.post_select = exec_post_select,
+		.pre_monitor = exec_pre_monitor,
+		.post_monitor = exec_post_monitor,
 		.context = &exec_task,
 	}, &command_sched);
 	ret = client_connect(ct, &command_sched, NULL, exec_task.btrn);
@@ -243,20 +243,19 @@ I9E_DUMMY_COMPLETER(term);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);
-I9E_DUMMY_COMPLETER(tasks);
 
 static struct i9e_completer completers[];
 
 static void help_completer(struct i9e_completion_info *ci,
-		struct i9e_completion_result *result)
+		struct i9e_completion_result *cr)
 {
 	char *opts[] = {LSG_SERVER_CMD_HELP_OPTS, NULL};
 
 	if (ci->word[0] == '-') {
-		i9e_complete_option(opts, ci, result);
+		i9e_complete_option(opts, ci, cr);
 		return;
 	}
-	result->matches = i9e_complete_commands(ci->word, completers);
+	cr->matches = i9e_complete_commands(ci->word, completers);
 }
 
 static void stat_completer(struct i9e_completion_info *ci,
@@ -579,7 +578,7 @@ struct supervisor_task {
 	struct task *task;
 };
 
-static int supervisor_post_select(struct sched *s, void *context)
+static int supervisor_post_monitor(struct sched *s, void *context)
 {
 	struct supervisor_task *svt = context;
 	int ret = task_status(ct->task);
@@ -624,8 +623,8 @@ int main(int argc, char *argv[])
 {
 	int ret;
 
-	init_random_seed_or_die();
-	sched.default_timeout.tv_sec = 1;
+	crypt_init();
+	sched.default_timeout = 1000;
 
 	ret = client_parse_config(argc, argv, &ct, &client_loglevel);
 	if (ret < 0)
@@ -649,7 +648,7 @@ int main(int argc, char *argv[])
 		EMBRACE(.name = "stdout", .parent = ct->btrn[0]));
 	supervisor_task.task = task_register(&(struct task_info) {
 		.name = "supervisor",
-		.post_select = supervisor_post_select,
+		.post_monitor = supervisor_post_monitor,
 		.context = &supervisor_task,
 	}, &sched);
 
@@ -670,6 +669,7 @@ int main(int argc, char *argv[])
 		}
 	}
 	sched_shutdown(&sched);
+	crypt_shutdown();
 out:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));