generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bionic: store property names as variable-length strings

Browse Source 
Names are immutable, so the fixed-sized arrays can be replaced with
variable-length ones to save memory (especially on internal tree nodes).

Change-Id: Iee77874b4b55b0f9c5e531d1334be7f7f40086d2
Signed-off-by: Greg Hackmann <ghackmann@google.com>
This commit is contained in:
Greg Hackmann 2013-06-21 13:02:38 -07:00
parent fb9b7b436f
commit 492ce95d9f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/system_properties.c
View File

@ -66,9 +66,9 @@ struct prop_area {
typedef struct prop_area prop_area; typedef struct prop_area prop_area;
struct prop_info { struct prop_info {
char name[PROP_NAME_MAX];
unsigned volatile serial; unsigned volatile serial;
char value[PROP_VALUE_MAX]; char value[PROP_VALUE_MAX];
char name[0];
}; };
typedef struct prop_info prop_info; typedef struct prop_info prop_info;
@ -92,7 +92,6 @@ typedef struct prop_info prop_info;
typedef volatile uint32_t prop_off_t; typedef volatile uint32_t prop_off_t;
struct prop_bt { struct prop_bt {
char name[PROP_NAME_MAX];
uint8_t namelen; uint8_t namelen;
uint8_t reserved[3]; uint8_t reserved[3];
@ -102,6 +101,8 @@ struct prop_bt {
prop_off_t right; prop_off_t right;
prop_off_t children; prop_off_t children;
char name[0];
}; };
typedef struct prop_bt prop_bt; typedef struct prop_bt prop_bt;
@ -277,7 +278,7 @@ static void *new_prop_obj(size_t size, prop_off_t *off)
static prop_bt *new_prop_bt(const char *name, uint8_t namelen, prop_off_t *off) static prop_bt *new_prop_bt(const char *name, uint8_t namelen, prop_off_t *off)
{ {
prop_off_t off_tmp; prop_off_t off_tmp;
prop_bt *bt = new_prop_obj(sizeof(prop_bt), &off_tmp); prop_bt *bt = new_prop_obj(sizeof(prop_bt) + namelen + 1, &off_tmp);
if (bt) { if (bt) {
memcpy(bt->name, name, namelen); memcpy(bt->name, name, namelen);
bt->name[namelen] = '\0'; bt->name[namelen] = '\0';
@ -293,7 +294,7 @@ static prop_info *new_prop_info(const char *name, uint8_t namelen,
const char *value, uint8_t valuelen, prop_off_t *off) const char *value, uint8_t valuelen, prop_off_t *off)
{ {
prop_off_t off_tmp; prop_off_t off_tmp;
prop_info *info = new_prop_obj(sizeof(prop_info), &off_tmp); prop_info *info = new_prop_obj(sizeof(prop_info) + namelen + 1, &off_tmp);
if (info) { if (info) {
memcpy(info->name, name, namelen); memcpy(info->name, name, namelen);
info->name[namelen] = '\0'; info->name[namelen] = '\0';