X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=313f7af9ccb322b691ad7fed4375cc5abd559456;hb=59a4f545566f77a22a8c27ece5155ecd154d4145;hp=82ac4dac87226fcc5482ea472574d9a486b62857;hpb=112efddb6753266296cad0a9b0499528fe784214;p=paraslash.git diff --git a/attribute.c b/attribute.c index 82ac4dac..313f7af9 100644 --- a/attribute.c +++ b/attribute.c @@ -149,15 +149,15 @@ static int print_attribute(struct osl_table *table, struct osl_row *row, return 1; } -static int com_lsatt_callback(int fd, const struct osl_object *query) +static int com_lsatt_callback(struct afs_callback_arg *aca) { int ret; struct lsatt_action_data laad = { - .flags = *(unsigned *) query->data, + .flags = *(unsigned *)aca->query.data, .pb = { .max_size = shm_get_shmmax(), .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, + .fd = aca->fd, .band = SBD_OUTPUT }, .max_size_handler = afs_max_size_handler @@ -168,8 +168,8 @@ static int com_lsatt_callback(int fd, const struct osl_object *query) .table = attribute_table, .loop_col_num = ATTCOL_BITNUM, .match_col_num = ATTCOL_NAME, - .patterns = {.data = (char *)query->data + sizeof(laad.flags), - .size = query->size - sizeof(laad.flags)}, + .patterns = {.data = (char *)aca->query.data + sizeof(laad.flags), + .size = aca->query.size - sizeof(laad.flags)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING, .data = &laad, .action = print_attribute @@ -225,21 +225,25 @@ struct addatt_event_data { }; -static int com_addatt_callback(int fd, const struct osl_object *query) +static int com_addatt_callback(struct afs_callback_arg *aca) { char *p; int ret = 1; struct para_buffer pb = { .max_size = shm_get_shmmax(), .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, + .fd = aca->fd, .band = SBD_OUTPUT }, .max_size_handler = afs_max_size_handler }; size_t len; - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { + for ( + p = aca->query.data; + p < (char *)aca->query.data + aca->query.size; + p += len + 1 + ) { struct osl_object objs[NUM_ATT_COLUMNS]; struct osl_row *row; unsigned char bitnum; @@ -280,7 +284,9 @@ static int com_addatt_callback(int fd, const struct osl_object *query) goto out; aed.name = p; aed.bitnum = bitnum; - afs_event(ATTRIBUTE_ADD, &pb, &aed); + ret = afs_event(ATTRIBUTE_ADD, &pb, &aed); + if (ret < 0) + goto out; greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum); } out: @@ -303,9 +309,9 @@ int com_addatt(struct command_context *cc) return ret; } -static int com_mvatt_callback(int fd, const struct osl_object *query) +static int com_mvatt_callback(struct afs_callback_arg *aca) { - char *old = query->data; + char *old = aca->query.data; size_t size = strlen(old) + 1; char *new = old + size; struct osl_object obj = {.data = old, .size = size}; @@ -313,7 +319,7 @@ static int com_mvatt_callback(int fd, const struct osl_object *query) struct para_buffer pb = { .max_size = shm_get_shmmax(), .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, + .fd = aca->fd, .band = SBD_OUTPUT }, .max_size_handler = afs_max_size_handler, @@ -328,103 +334,77 @@ static int com_mvatt_callback(int fd, const struct osl_object *query) ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj)); out: if (ret < 0) - para_printf(&pb, "%s\n", para_strerror(-ret)); + para_printf(&pb, "cannot rename %s to %s\n", old, new); else - afs_event(ATTRIBUTE_RENAME, &pb, NULL); + ret = afs_event(ATTRIBUTE_RENAME, &pb, NULL); flush_and_free_pb(&pb); - return 0; + return ret; } int com_mvatt(struct command_context *cc) { - int ret; - if (cc->argc != 3) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_mvatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } -/** Data passed to the action handler of com_rmatt(). */ -struct remove_attribute_action_data { - /** Message buffer. */ - struct para_buffer pb; - /** Number of attributes removed. */ - int num_removed; - /** Bitwise "or" of the removed attributes. */ - uint64_t mask_of_removed_atts; -}; - -/* returns succcess even on errors to keep the loop going */ static int remove_attribute(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct remove_attribute_action_data *raad = data; + struct para_buffer *pb = data; int ret; struct rmatt_event_data red = {.name = name}; ret = get_attribute_bitnum_by_name(name, &red.bitnum); if (ret < 0) { - para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); - return 0; + para_printf(pb, "cannot remove %s\n", name); + return ret; } + para_printf(pb, "removing attribute %s\n", name); ret = osl(osl_del_row(table, row)); if (ret < 0) { - para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret)); - return 0; + para_printf(pb, "cannot remove %s\n", name); + return ret; } - para_printf(&raad->pb, "removed attribute %s\n", name); - raad->num_removed++; - raad->mask_of_removed_atts |= (1 << red.bitnum); - afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red); - return 1; + return afs_event(ATTRIBUTE_REMOVE, pb, &red); } -static int com_rmatt_callback(int fd, const struct osl_object *query) +static int com_rmatt_callback(struct afs_callback_arg *aca) { - struct remove_attribute_action_data raad = { - .num_removed = 0, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &(struct afs_max_size_handler_data) { - .fd = fd, - .band = SBD_OUTPUT - }, - .max_size_handler = afs_max_size_handler, - } + struct para_buffer pb = { + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = aca->fd, + .band = SBD_OUTPUT + }, + .max_size_handler = afs_max_size_handler, }; int ret; struct pattern_match_data pmd = { .table = attribute_table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = ATTCOL_BITNUM, .match_col_num = ATTCOL_NAME, - .data = &raad, + .data = &pb, .action = remove_attribute }; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&raad.pb, "%s\n", para_strerror(-ret)); - else if (!raad.num_removed) - para_printf(&raad.pb, "no match -- nothing removed\n"); - flush_and_free_pb(&raad.pb); - return 0; + goto out; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; +out: + flush_and_free_pb(&pb); + return ret; } int com_rmatt(struct command_context *cc) { - int ret; - if (cc->argc < 2) return -E_ATTR_SYNTAX; - ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_rmatt_callback, afs_cb_result_handler, cc); - if (ret < 0) - send_strerror(cc, -ret); - return ret; } /** @@ -500,6 +480,57 @@ err: return ret; } +static int att_logical_or(struct osl_row *row, void *data) +{ + uint64_t *att_mask = data; + struct osl_object bitnum_obj; + int ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &bitnum_obj); + + if (ret < 0) + return ret; + *att_mask |= 1 << *(unsigned char *)bitnum_obj.data; + return 0; +} + +/** + * Compute the attribute bit mask and check each afs info bitmap. + * + * \param aca The query field of \a aca is ignored. + * + * This iterates over all attributes in the attribute table and computes the + * logical or of 1 << b where b is the bit number of the attribute. The + * resulting bit mask is passed to aft_check_attributes() which performs the + * actual check. + * + * \return Standard. + * + * \sa \ref aft_check_attributes(). + */ +int attribute_check_callback(struct afs_callback_arg *aca) +{ + int ret; + uint64_t att_mask = 0; /* bits corresponding to a attributes */ + struct para_buffer pb = { + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = aca->fd, + .band = SBD_OUTPUT + }, + .max_size_handler = afs_max_size_handler, + }; + + ret = osl_rbtree_loop(attribute_table, ATTCOL_BITNUM, &att_mask, + att_logical_or); + if (ret < 0) { + PARA_ERROR_LOG("attribute table loop failed: %s\n", + para_strerror(-ret)); + return ret; + } + ret = aft_check_attributes(att_mask, &pb); + flush_and_free_pb(&pb); + return ret; +} + /** * Close the attribute table. *