kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment of stringfields on the SPARC architecture

Browse Source 
(closes issue #17789)
 Reported by: Ian Mason
 Patches: 
       20100806__issue17789__2.diff.txt uploaded by tilghman (license 14)
 Tested by: Ian_Mason


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@281085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-08-06 18:57:10 +00:00
parent cdd1943c89
commit ab050f313d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/utils.c
View File

@@ -1615,7 +1615,8 @@ ast_string_field __ast_string_field_alloc_space(struct ast_string_field_mgr *mgr
size_t space = (*pool_head)->size - (*pool_head)->used; size_t space = (*pool_head)->size - (*pool_head)->used;
size_t to_alloc = needed + sizeof(ast_string_field_allocation); size_t to_alloc = needed + sizeof(ast_string_field_allocation);
if (__builtin_expect(to_alloc > space, 0)) { /* This +1 accounts for alignment on SPARC */
if (__builtin_expect(to_alloc + 1 > space, 0)) {
size_t new_size = (*pool_head)->size; size_t new_size = (*pool_head)->size;
while (new_size < to_alloc) { while (new_size < to_alloc) {
@@ -1632,6 +1633,13 @@ ast_string_field __ast_string_field_alloc_space(struct ast_string_field_mgr *mgr
} }
result = (*pool_head)->base + (*pool_head)->used; result = (*pool_head)->base + (*pool_head)->used;
#ifdef __sparc__
/* SPARC requires that the allocation field be aligned. */
if ((long) result % sizeof(ast_string_field_allocation)) {
result++;
(*pool_head)->used++;
}
#endif
(*pool_head)->used += to_alloc; (*pool_head)->used += to_alloc;
(*pool_head)->active += needed; (*pool_head)->active += needed;
result += sizeof(ast_string_field_allocation); result += sizeof(ast_string_field_allocation);
@@ -1706,6 +1714,12 @@ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
} }
} else { } else {
target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation); target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation);
#ifdef __sparc__
if ((long) target % sizeof(ast_string_field_allocation)) {
target++;
space--;
}
#endif
available = space - sizeof(ast_string_field_allocation); available = space - sizeof(ast_string_field_allocation);
} }