/*
- * 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.
*/
#include <fnmatch.h>
#include "para.h"
#include "error.h"
+#include "string.h"
#include "afh.h"
#include "afs.h"
-#include "string.h"
#include "net.h"
+#include "ipc.h"
+#include "portable_io.h"
+
+/**
+ * Compare two osl objects pointing to unsigned integers of 32 bit size.
+ *
+ * \param obj1 Pointer to the first integer.
+ * \param obj2 Pointer to the second integer.
+ *
+ * \return The values required for an osl compare function.
+ *
+ * \sa osl_compare_func, osl_hash_compare().
+ */
+static int uint32_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+{
+ uint32_t d1 = read_u32((const char *)obj1->data);
+ uint32_t d2 = read_u32((const char *)obj2->data);
+
+ if (d1 < d2)
+ return 1;
+ if (d1 > d2)
+ return -1;
+ return 0;
+}
static struct osl_column_description blob_cols[] = {
[BLOBCOL_ID] = {
};
/** Structure passed to the \p print_blob function. */
-struct lsblob_data {
+struct lsblob_action_data {
+ /** The flags given at the command line. */
uint32_t flags;
+ /** Message buffer. */
struct para_buffer pb;
};
-static int print_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data)
+static int print_blob(struct osl_table *table, struct osl_row *row,
+ const char *name, void *data)
{
+ struct lsblob_action_data *lbad = data;
struct osl_object obj;
uint32_t id;
int ret;
- struct lsblob_data *lbd = data;
- if (!(lbd->flags & BLOB_LS_FLAG_LONG)) {
- para_printf(&lbd->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)
- return ret;
- id = *(uint32_t *)obj.data;
- para_printf(&lbd->pb, "%u\t%s\n", id, name);
- return 1;
-}
-
-enum blob_match_loop_flags {
- BM_NAME_LOOP = 1,
- BM_REVERSE_LOOP = 2
-};
-
-struct blob_match_data {
- struct osl_table *table;
- const char *patterns;
- size_t patterns_size;
- int fnmatch_flags;
- unsigned loop_flags;
- void *data;
- int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
-};
-
-static int action_if_blob_matches(struct osl_row *row, void *data)
-{
- struct blob_match_data *bmd = data;
- struct osl_object name_obj;
- const char *p, *name;
- int ret = osl_get_object(bmd->table, row, BLOBCOL_NAME, &name_obj);
-
if (ret < 0) {
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
}
- name = (char *)name_obj.data;
- if (!*name) /* ignore dummy row */
- return 1;
- if (!bmd->patterns_size) /* match everything if no pattern was given */
- return bmd->action(bmd->table, row, name, bmd->data);
- for (p = bmd->patterns; p < bmd->patterns + bmd->patterns_size;
- p += strlen(p) + 1) {
- ret = fnmatch(p, name, bmd->fnmatch_flags);
- if (ret == FNM_NOMATCH)
- continue;
- if (ret)
- return -E_FNMATCH;
- return bmd->action(bmd->table, row, name, bmd->data);
- }
- return 1;
-}
-
-static int for_each_matching_blob(struct blob_match_data *bmd)
-{
- unsigned col = (bmd->loop_flags & BM_NAME_LOOP)?
- BLOBCOL_NAME : BLOBCOL_ID;
-
- if (bmd->loop_flags & BM_REVERSE_LOOP)
- return osl_rbtree_loop_reverse(bmd->table, col, bmd, action_if_blob_matches);
- return osl_rbtree_loop(bmd->table, col, bmd, action_if_blob_matches);
+ id = *(uint32_t *)obj.data;
+ return para_printf(&lbad->pb, "%u\t%s\n", id, name);
}
-int com_lsblob_callback(struct osl_table *table,
- const struct osl_object *query, struct osl_object *ls_output)
+static void com_lsblob_callback(struct osl_table *table,
+ int fd, const struct osl_object *query)
{
- struct lsblob_data lbd = {.flags = *(uint32_t *)query};
- struct blob_match_data bmd = {
+ 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 = (char *)query->data + sizeof(uint32_t),
- .patterns_size = query->size - sizeof(uint32_t),
- .data = &lbd,
- .action = print_blob
+ .patterns = {.data = (char *)query->data + sizeof(uint32_t),
+ .size = query->size - sizeof(uint32_t)},
+ .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING | PM_SKIP_EMPTY_NAME,
+ .match_col_num = BLOBCOL_NAME,
+ .data = &lbad,
+ .action = print_blob,
};
int ret;
- if (lbd.flags & BLOB_LS_FLAG_REVERSE)
- bmd.loop_flags |= BM_REVERSE_LOOP;
- if (!(lbd.flags & BLOB_LS_FLAG_SORT_BY_ID))
- bmd.loop_flags |= BM_NAME_LOOP;
- ret = for_each_matching_blob(&bmd);
- if (lbd.pb.buf) {
- ls_output->data = lbd.pb.buf;
- ls_output->size = lbd.pb.size;
- return 1;
- }
- if (ret > 0)
- ret = 0;
- return ret;
+ 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_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.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];
flags |= BLOB_LS_FLAG_REVERSE;
continue;
}
+ break;
}
// 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 blob_match_data bmd = {
+ struct pattern_match_data pmd = {
.table = table,
- .patterns = (char *)query->data,
- .patterns_size = query->size,
- .data = result,
+ .patterns = *query,
+ .loop_col_num = BLOBCOL_NAME,
+ .match_col_num = BLOBCOL_NAME,
+ .pm_flags = PM_SKIP_EMPTY_NAME,
+ .data = &fd,
.action = cat_blob
};
- result->data = NULL;
- ret = for_each_matching_blob(&bmd);
- 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. */
struct rmblob_data {
+ /** Message buffer. */
struct para_buffer pb;
+ /** Number of removed blobs. */
unsigned num_removed;
};
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,
- __a_unused 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};
- struct blob_match_data bmd = {
+ 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 = (char *)query->data,
- .patterns_size = query->size,
+ .patterns = *query,
+ .loop_col_num = BLOBCOL_NAME,
+ .match_col_num = BLOBCOL_NAME,
+ .pm_flags = PM_SKIP_EMPTY_NAME,
.data = &rmbd,
.action = remove_blob
};
- result->data = NULL;
- ret = for_each_matching_blob(&bmd);
- if (ret < 0)
- para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
+ ret = for_each_matching_row(&pmd);
+ 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");
- else
- para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
- result->data = rmbd.pb.buf;
- result->size = rmbd.pb.size;
- return 1;
+ ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n");
+ else {
+ ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
+ afs_event(BLOB_RENAME, NULL, table);
+ }
+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, __a_unused int fd, int argc,
+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;
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 */
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;
+ if (ret < 0 && ret != -E_OSL_RB_KEY_NOT_FOUND)
+ 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;
objs[BLOBCOL_NAME].size = name_len;
objs[BLOBCOL_DEF].data = name + name_len;
objs[BLOBCOL_DEF].size = query->size - name_len;
- return osl_add_row(table, objs);
+ ret = osl_add_row(table, objs);
+ if (ret < 0)
+ goto out;
+ afs_event(BLOB_ADD, NULL, table);
+out:
+ if (ret < 0)
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
}
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};
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;
- return osl_update_object(table, row, BLOBCOL_NAME, &obj);
+ ret = osl_update_object(table, row, BLOBCOL_NAME, &obj);
+ if (ret < 0)
+ goto out;
+ afs_event(BLOB_RENAME, NULL, table);
+out:
+ if (ret < 0)
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
}
-static int com_mvblob(callback_function *f, __a_unused int fd,
+static int com_mvblob(callback_function *f, __a_unused int fd,
int argc, char * const * const argv)
{
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) \
{ \
return blob_get_name_by_id(table_name ## _table, id, name); \
}
+
+static int blob_get_def_by_name(struct osl_table *table, char *name,
+ struct osl_object *def)
+{
+ struct osl_row *row;
+ struct osl_object obj = {.data = name, .size = strlen(name) + 1};
+ int ret;
+
+ def->data = NULL;
+ if (!*name)
+ return 1;
+ ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
+ if (ret < 0)
+ return ret;
+ return osl_open_disk_object(table, row, BLOBCOL_DEF, def);
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix) \
+ int cmd_prefix ## _get_def_by_name(char *name, struct osl_object *def) \
+ { \
+ return blob_get_def_by_name(table_name ## _table, name, def); \
+ }
+
+static int blob_get_def_by_id(struct osl_table *table, uint32_t id,
+ struct osl_object *def)
+{
+ struct osl_row *row;
+ struct osl_object obj = {.data = &id, .size = sizeof(id)};
+ int ret;
+
+ def->data = NULL;
+ if (!id)
+ return 1;
+ ret = osl_get_row(table, BLOBCOL_ID, &obj, &row);
+ if (ret < 0)
+ return ret;
+ return osl_open_disk_object(table, row, BLOBCOL_DEF, def);
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix) \
+ int cmd_prefix ## _get_def_by_id(uint32_t id, struct osl_object *def) \
+ { \
+ return blob_get_def_by_id(table_name ## _table, id, def); \
+ }
+
static int blob_get_name_and_def_by_row(struct osl_table *table,
const struct osl_row *row, char **name, struct osl_object *def)
{
row, name, def); \
}
-/** Define the \p shutdown function for this blob type. */
-#define DEFINE_BLOB_SHUTDOWN(table_name) \
- void table_name ## _shutdown(enum osl_close_flags flags) \
+/** Define the \p close function for this blob type. */
+#define DEFINE_BLOB_CLOSE(table_name) \
+ void table_name ## _close(void) \
{ \
- osl_close_table(table_name ## _table, flags); \
+ osl_close_table(table_name ## _table, OSL_MARK_CLEAN); \
table_name ## _table = NULL; \
}
-static int blob_init(struct osl_table **table,
+/** Define the \p create function for this blob type. */
+#define DEFINE_BLOB_CREATE(table_name) \
+ int table_name ## _create(const char *dir) \
+ { \
+ table_name ## _table_desc.dir = dir; \
+ return osl_create_table(&table_name ## _table_desc); \
+ }
+
+static int blob_open(struct osl_table **table,
struct osl_table_description *desc,
- struct table_info *ti, const char *db)
+ const char *dir)
{
int ret;
- desc->dir = db;
- ti->desc = desc;
- ret = osl_open_table(ti->desc, table);
+ desc->dir = dir;
+ ret = osl_open_table(desc, table);
if (ret >= 0)
return ret;
*table = NULL;
- return ret == -E_NOENT? 1 : ret;
+ if (ret >= 0 || is_errno(-ret, ENOENT))
+ return 1;
+ return ret;
}
+#define DEFINE_BLOB_OPEN(table_name) \
+ int table_name ## _open(const char *dir) \
+ { \
+ return blob_open(&table_name ## _table, \
+ &table_name ## _table_desc, dir); \
+ }
+
+
/** Define the \p init function for this blob type. */
#define DEFINE_BLOB_INIT(table_name) \
- int table_name ## _init(struct table_info *ti, const char *db) \
+ void table_name ## _init(struct afs_table *t) \
{ \
- return blob_init(&table_name ## _table, \
- &table_name ## _table_desc, ti, db); \
+ t->name = table_name ## _table_desc.name; \
+ t->open = table_name ## _open; \
+ t->close = table_name ## _close; \
+ t->create = table_name ## _create;\
+ t->event_handler = table_name ##_event_handler; \
+ table_name ## _table = NULL; \
}
/** Define all functions for this blob type. */
#define DEFINE_BLOB_FUNCTIONS(table_name, cmd_prefix) \
+ DEFINE_BLOB_OPEN(table_name) \
+ DEFINE_BLOB_CLOSE(table_name) \
+ DEFINE_BLOB_CREATE(table_name) \
+ DEFINE_BLOB_INIT(table_name) \
DEFINE_BLOB_COMMAND(ls, table_name, cmd_prefix) \
DEFINE_BLOB_COMMAND(cat, table_name, cmd_prefix) \
DEFINE_BLOB_COMMAND(add, table_name, cmd_prefix) \
DEFINE_BLOB_COMMAND(rm, table_name, cmd_prefix) \
DEFINE_BLOB_COMMAND(mv, table_name, cmd_prefix) \
DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix); \
+ DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix); \
+ DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix); \
DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix); \
- DEFINE_BLOB_SHUTDOWN(table_name); \
- DEFINE_BLOB_INIT(table_name);
/** \cond doxygen isn't smart enough to recognize these */
DEFINE_BLOB_FUNCTIONS(lyrics, lyr);
projects / paraslash.git / blobdiff