X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=dbabba224ded1d96e8d8175b42181d3221df6e52;hp=a5ea93aa9ffbb29fe6171bcf7dc28649ec081e3f;hb=31233289bedbb596b98eadd411bc6aac54d4ed69;hpb=1f31b52b6816ce2716a3755a1896f77744fa167b

diff --git a/blob.c b/blob.c
index a5ea93aa..dbabba22 100644
--- a/blob.c
+++ b/blob.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -13,6 +13,7 @@
 #include "afh.h"
 #include "afs.h"
 #include "net.h"
+#include "ipc.h"
 
 static struct osl_column_description blob_cols[] = {
 	[BLOBCOL_ID] = {
@@ -54,7 +55,7 @@ enum blob_ls_flags {
 
 /** Structure passed to the \p print_blob function. */
 struct lsblob_action_data {
-	/* The flags given at the command line. */
+	/** The flags given at the command line. */
 	uint32_t flags;
 	/** Message buffer. */
 	struct para_buffer pb;
@@ -68,24 +69,28 @@ static int print_blob(struct osl_table *table, struct osl_row *row,
 	uint32_t id;
 	int ret;
 
-	if (!(lbad->flags & BLOB_LS_FLAG_LONG)) {
-		para_printf(&lbad->pb, "%s\n", name);
-		return 1;
-	}
+	if (!(lbad->flags & BLOB_LS_FLAG_LONG))
+		return para_printf(&lbad->pb, "%s\n", name);
 	ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
 	if (ret < 0) {
-		para_printf(&lbad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	id = *(uint32_t *)obj.data;
-	para_printf(&lbad->pb, "%u\t%s\n", id, name);
-	return 1;
+	return para_printf(&lbad->pb, "%u\t%s\n", id, name);
 }
 
-static int com_lsblob_callback(struct osl_table *table,
-		const struct osl_object *query, struct osl_object *result)
+static void com_lsblob_callback(struct osl_table *table,
+		int fd, const struct osl_object *query)
 {
-	struct lsblob_action_data lbad = {.flags = *(uint32_t *)query->data};
+	struct lsblob_action_data lbad = {
+		.flags = *(uint32_t *)query->data,
+		.pb = {
+			.max_size = SHMMAX,
+			.private_data = &fd,
+			.max_size_handler = pass_buffer_as_shm
+		}
+	};
 	struct pattern_match_data pmd = {
 		.table = table,
 		.patterns = {.data = (char *)query->data + sizeof(uint32_t),
@@ -100,25 +105,22 @@ static int com_lsblob_callback(struct osl_table *table,
 	if (lbad.flags & BLOB_LS_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
 	if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID))
-		pmd.loop_col_num = BLOBCOL_ID;
-	else
 		pmd.loop_col_num = BLOBCOL_NAME;
+	else
+		pmd.loop_col_num = BLOBCOL_ID;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
-		para_printf(&lbad.pb, "%s\n", PARA_STRERROR(-ret));
-	if (!lbad.pb.buf)
-		return 0;
-	result->data = lbad.pb.buf;
-	result->size = lbad.pb.size;
-	return 1;
+		para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
+	if (lbad.pb.offset)
+		pass_buffer_as_shm(lbad.pb.buf, lbad.pb.offset, &fd);
+	free(lbad.pb.buf);
 }
 
 static int com_lsblob(callback_function *f, int fd, int argc, char * const * const argv)
 {
 	uint32_t flags = 0;
-	struct osl_object options = {.data = &flags, .size = sizeof(flags)},
-		result;
-	int i, ret;
+	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
+	int i;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -144,67 +146,46 @@ static int com_lsblob(callback_function *f, int fd, int argc, char * const * con
 	}
 //	if (argc > i)
 //		return -E_BLOB_SYNTAX;
-	ret = send_option_arg_callback_request(&options, argc - i,
-		argv + i, f, &result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	}
-	return ret;
+	return send_option_arg_callback_request(&options, argc - i,
+		argv + i, f, send_result, &fd);
 }
 
 static int cat_blob(struct osl_table *table, struct osl_row *row,
 		__a_unused const char *name, void *data)
 {
-	int ret;
-	struct osl_object *blobs = data;
+	int ret = 0, ret2;
 	struct osl_object obj;
 
 	ret = osl_open_disk_object(table, row, BLOBCOL_DEF, &obj);
 	if (ret < 0)
 		return ret;
-	if (obj.size) {
-		blobs->data = para_realloc(blobs->data, blobs->size + obj.size);
-		memcpy(blobs->data + blobs->size, obj.data, obj.size);
-		blobs->size += obj.size;
-	}
-	return osl_close_disk_object(&obj);
+	if (obj.size)
+		ret = pass_buffer_as_shm(obj.data, obj.size, data);
+	ret2 = osl_close_disk_object(&obj);
+	return (ret < 0)? ret : ret2;
 }
 
-static int com_catblob_callback(struct osl_table *table,
-		const struct osl_object *query, struct osl_object *result)
+static void com_catblob_callback(struct osl_table *table, int fd,
+		const struct osl_object *query)
 {
-	int ret;
 	struct pattern_match_data pmd = {
 		.table = table,
 		.patterns = *query,
 		.loop_col_num = BLOBCOL_NAME,
 		.match_col_num = BLOBCOL_NAME,
 		.pm_flags = PM_SKIP_EMPTY_NAME,
-		.data = result,
+		.data = &fd,
 		.action = cat_blob
 	};
-	result->data = NULL;
-	ret = for_each_matching_row(&pmd);
-	if (result->data)
-		return 1;
-	return (ret > 0)? 0 : ret;
+	for_each_matching_row(&pmd);
 }
 
 static int com_catblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
-	struct osl_object result;
-	int ret;
-
 	if (argc < 2)
 		return -E_BLOB_SYNTAX;
-	ret = send_standard_callback_request(argc - 1, argv + 1, f, &result);
-	if (ret > 0) {
-		ret = send_bin_buffer(fd, (char *)result.data, result.size);
-		free(result.data);
-	}
-	return ret;
+	return send_standard_callback_request(argc - 1, argv + 1, f, send_result, &fd);
 }
 
 /** Used for removing rows from a blob table. */
@@ -221,19 +202,25 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 	struct rmblob_data *rmbd = data;
 	int ret = osl_del_row(table, row);
 	if (ret < 0) {
-		para_printf(&rmbd->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	rmbd->num_removed++;
-	return 1; /* return success to remove other matching blobs. */
+	return 1;
 }
 
-static int com_rmblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		struct osl_object *result)
+static void com_rmblob_callback(struct osl_table *table, int fd,
+		const struct osl_object *query)
 {
-	int ret;
-	struct rmblob_data rmbd = {.num_removed = 0};
+	int ret, ret2 = 0;
+	struct rmblob_data rmbd = {
+		.num_removed = 0,
+		.pb = {
+			.max_size = SHMMAX,
+			.private_data = &fd,
+			.max_size_handler = pass_buffer_as_shm
+		}
+	};
 	struct pattern_match_data pmd = {
 		.table = table,
 		.patterns = *query,
@@ -243,41 +230,35 @@ static int com_rmblob_callback(struct osl_table *table,
 		.data = &rmbd,
 		.action = remove_blob
 	};
-	result->data = NULL;
 	ret = for_each_matching_row(&pmd);
-	if (ret < 0)
-		para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
+	if (ret < 0) {
+		ret2 = para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
+		if (ret2 < 0)
+			goto out;
+	}
 	if (!rmbd.num_removed)
-		para_printf(&rmbd.pb, "no matches, nothing removed\n");
+		ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n");
 	else {
-		para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
+		ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
 		afs_event(BLOB_RENAME, NULL, table);
 	}
-	result->data = rmbd.pb.buf;
-	result->size = rmbd.pb.size;
-	return 1;
+out:
+	if (ret2 >= 0 && rmbd.pb.offset)
+		pass_buffer_as_shm(rmbd.pb.buf, rmbd.pb.offset, &fd);
+	free(rmbd.pb.buf);
 }
 
 static int com_rmblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
-	int ret;
-	struct osl_object result;
-
 	if (argc < 2)
 		return -E_MOOD_SYNTAX;
-	ret = send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		&result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	}
-	return ret;
+	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
+		send_result, &fd);
 }
 
-static int com_addblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		__a_unused struct osl_object *result)
+static void com_addblob_callback(struct osl_table *table, __a_unused int fd,
+		const struct osl_object *query)
 {
 	struct osl_object objs[NUM_BLOB_COLUMNS];
 	char *name = query->data;
@@ -288,7 +269,7 @@ static int com_addblob_callback(struct osl_table *table,
 
 	ret = osl_get_num_rows(table, &num_rows);
 	if (ret < 0)
-		return ret;
+		goto out;
 	if (!num_rows) { /* this is the first entry ever added */
 		/* insert dummy row containing the id */
 		id = 2; /* this entry will be entry #1, so 2 is the next */
@@ -300,33 +281,34 @@ static int com_addblob_callback(struct osl_table *table,
 		objs[BLOBCOL_DEF].size = 1;
 		ret = osl_add_row(table, objs);
 		if (ret < 0)
-			return ret;
+			goto out;
 	} else {
 		/* check if name already exists */
 		struct osl_row *row;
 		struct osl_object obj = {.data = name, .size = name_len};
 		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
 		if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
-			return ret;
+			goto out;
 		if (ret >= 0) { /* we already have a blob with this name */
 			obj.data = name + name_len;
 			obj.size = query->size - name_len;
-			return osl_update_object(table, row, BLOBCOL_DEF, &obj);
+			ret = osl_update_object(table, row, BLOBCOL_DEF, &obj);
+			goto out;
 		}
 		/* new blob, get id of the dummy row and increment it */
 		obj.data = "";
 		obj.size = 1;
 		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
 		if (ret < 0)
-			return ret;
+			goto out;
 		ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
 		if (ret < 0)
-			return ret;
+			goto out;
 		id = *(uint32_t *)obj.data + 1;
 		obj.data = &id;
 		ret = osl_update_object(table, row, BLOBCOL_ID, &obj);
 		if (ret < 0)
-			return ret;
+			goto out;
 	}
 	id--;
 	objs[BLOBCOL_ID].data = &id;
@@ -337,9 +319,11 @@ static int com_addblob_callback(struct osl_table *table,
 	objs[BLOBCOL_DEF].size = query->size - name_len;
 	ret = osl_add_row(table, objs);
 	if (ret < 0)
-		return ret;
+		goto out;
 	afs_event(BLOB_ADD, NULL, table);
-	return 1;
+out:
+	if (ret < 0)
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
 static int com_addblob(callback_function *f, int fd, int argc,
@@ -351,15 +335,14 @@ static int com_addblob(callback_function *f, int fd, int argc,
 		return -E_BLOB_SYNTAX;
 	if (!*argv[1]) /* empty name is reserved for the dummy row */
 		return -E_BLOB_SYNTAX;
-	PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]);
 	arg_obj.size = strlen(argv[1]) + 1;
 	arg_obj.data = (char *)argv[1];
-	return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL);
+	return stdin_command(fd, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL);
 }
 
-static int com_mvblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		__a_unused struct osl_object *result)
+/* FIXME: Print output to client, not to log file */
+static void com_mvblob_callback(struct osl_table *table, __a_unused int fd,
+		const struct osl_object *query)
 {
 	char *src = (char *) query->data;
 	struct osl_object obj = {.data = src, .size = strlen(src) + 1};
@@ -368,14 +351,16 @@ static int com_mvblob_callback(struct osl_table *table,
 	int ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
 
 	if (ret < 0)
-		return ret;
+		goto out;
 	obj.data = dest;
 	obj.size = strlen(dest) + 1;
 	ret = osl_update_object(table, row, BLOBCOL_NAME, &obj);
 	if (ret < 0)
-		return ret;
+		goto out;
 	afs_event(BLOB_RENAME, NULL, table);
-	return 1;
+out:
+	if (ret < 0)
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
 static int com_mvblob(callback_function *f, __a_unused int fd,
@@ -384,14 +369,13 @@ static int com_mvblob(callback_function *f, __a_unused int fd,
 	if (argc != 3)
 		return -E_MOOD_SYNTAX;
 	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		NULL);
+		NULL, NULL);
 }
 
 #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \
-	static int com_ ## cmd_name ## cmd_prefix ## _callback(const struct osl_object *query, \
-			struct osl_object *output) \
+	static void com_ ## cmd_name ## cmd_prefix ## _callback(int fd, const struct osl_object *query) \
 	{ \
-		return com_ ## cmd_name ## blob_callback(table_name ## _table, query, output); \
+		return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \
 	} \
 	int com_ ## cmd_name ## cmd_prefix(int fd, int argc, char * const * const argv) \
 	{ \