shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: add min_num_bits to dm_bitset_parse_list()

Browse Source 
It's useful to be able to specify a minimum number of bits for a
new bitmap parsed from a list, for e.g. to allow for expansing a
group without needing to copy/reallocate the bitmap.

Add a backwards compatible symbol for programs linked against old
versions of the library.
This commit is contained in:
Bryn M. Reeves 2016-12-11 22:41:45 +00:00
parent e8d966bc31
commit 7dff632c11
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libdm/.exported_symbols.DM_1_02_138
View File

@ -1,2 +1,3 @@
dm_bit_get_last dm_bit_get_last
dm_bit_get_prev dm_bit_get_prev
dm_bitset_parse_list

22
libdm/datastruct/bitset.c
View File

@ -145,7 +145,8 @@ int dm_bit_get_last(dm_bitset_t bs)
/* /*
* Based on the Linux kernel __bitmap_parselist from lib/bitmap.c * Based on the Linux kernel __bitmap_parselist from lib/bitmap.c
*/ */
dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem) dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem,
size_t min_num_bits)
{ {
unsigned a, b; unsigned a, b;
int c, old_c, totaldigits, ndigits, nmaskbits; int c, old_c, totaldigits, ndigits, nmaskbits;
@ -221,6 +222,9 @@ scan:
} while (len && c == ','); } while (len && c == ',');
if (!mask) { if (!mask) {
if (min_num_bits && (nmaskbits < min_num_bits))
nmaskbits = min_num_bits;
if (!(mask = dm_bitset_create(mem, nmaskbits))) if (!(mask = dm_bitset_create(mem, nmaskbits)))
goto_bad; goto_bad;
str = start; str = start;
@ -237,3 +241,19 @@ bad:
} }
return NULL; return NULL;
} }
#if defined(__GNUC__)
/*
* Maintain backward compatibility with older versions that did not
* accept a 'min_num_bits' argument to dm_bitset_parse_list().
*/
dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem);
dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem)
{
return dm_bitset_parse_list(str, mem, 0);
}
DM_EXPORT_SYMBOL(dm_bitset_parse_list, 1_02_129);
#else /* if defined(__GNUC__) */
#endif

3
libdm/libdevmapper.h
View File

@ -2100,7 +2100,8 @@ int dm_bit_get_prev(dm_bitset_t bs, int last_bit);
* dm_malloc(). Otherwise the bitset will be allocated using the supplied * dm_malloc(). Otherwise the bitset will be allocated using the supplied
* dm_pool. * dm_pool.
*/ */
dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem); dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem,
size_t min_num_bits);
/* Returns number of set bits */ /* Returns number of set bits */
static inline unsigned hweight32(uint32_t i) static inline unsigned hweight32(uint32_t i)

5
libdm/libdm-stats.c
View File

@ -675,6 +675,7 @@ static void _check_group_regions_present(struct dm_stats *dms,
#define DMS_GROUP_TAG_LEN (sizeof(DMS_GROUP_TAG) - 1) #define DMS_GROUP_TAG_LEN (sizeof(DMS_GROUP_TAG) - 1)
#define DMS_GROUP_SEP ':' #define DMS_GROUP_SEP ':'
#define DMS_AUX_SEP "#" #define DMS_AUX_SEP "#"
static int _parse_aux_data_group(struct dm_stats *dms, static int _parse_aux_data_group(struct dm_stats *dms,
struct dm_stats_region *region, struct dm_stats_region *region,
struct dm_stats_group *group) struct dm_stats_group *group)
@ -718,7 +719,7 @@ static int _parse_aux_data_group(struct dm_stats *dms,
end = c + strlen(c); end = c + strlen(c);
*(end++) = '\0'; *(end++) = '\0';
if (!(regions = dm_bitset_parse_list(c, NULL))) { if (!(regions = dm_bitset_parse_list(c, NULL, 0))) {
log_error("Could not parse member list while " log_error("Could not parse member list while "
"reading group aux_data"); "reading group aux_data");
return 0; return 0;
@ -3992,7 +3993,7 @@ int dm_stats_create_group(struct dm_stats *dms, const char *members,
return 0; return 0;
}; };
if (!(regions = dm_bitset_parse_list(members, NULL))) { if (!(regions = dm_bitset_parse_list(members, NULL, 0))) {
log_error("Could not parse list: '%s'", members); log_error("Could not parse list: '%s'", members);
return 0; return 0;
} }