comparison src/mc-alloc.c @ 5455:7ebbe334061e

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Fri, 14 Jan 2011 23:16:18 +0100
parents 308d34e9f07d b249c479f9e1
children 00e79bbbe48f
comparison
equal deleted inserted replaced
5454:03545aab8874 5455:7ebbe334061e
1144 static int 1144 static int
1145 get_used_list_index (size_t size) 1145 get_used_list_index (size_t size)
1146 { 1146 {
1147 if (size <= USED_LIST_MIN_OBJECT_SIZE) 1147 if (size <= USED_LIST_MIN_OBJECT_SIZE)
1148 { 1148 {
1149 // printf ("size %d -> index %d\n", size, 0); 1149 /* printf ("size %d -> index %d\n", size, 0); */
1150 return 0; 1150 return 0;
1151 } 1151 }
1152 if (size <= (size_t) USED_LIST_UPPER_THRESHOLD) 1152 if (size <= (size_t) USED_LIST_UPPER_THRESHOLD)
1153 { 1153 {
1154 // printf ("size %d -> index %d\n", size, 1154 /* printf ("size %d -> index %d\n", size, */
1155 // ((size - USED_LIST_MIN_OBJECT_SIZE - 1) 1155 /* ((size - USED_LIST_MIN_OBJECT_SIZE - 1) */
1156 // / USED_LIST_LIN_STEP) + 1); 1156 /* / USED_LIST_LIN_STEP) + 1); */
1157 return ((size - USED_LIST_MIN_OBJECT_SIZE - 1) 1157 return ((size - USED_LIST_MIN_OBJECT_SIZE - 1)
1158 / USED_LIST_LIN_STEP) + 1; 1158 / USED_LIST_LIN_STEP) + 1;
1159 } 1159 }
1160 // printf ("size %d -> index %d\n", size, N_USED_PAGE_LISTS - 1); 1160 /* printf ("size %d -> index %d\n", size, N_USED_PAGE_LISTS - 1); */
1161 return N_USED_PAGE_LISTS - 1; 1161 return N_USED_PAGE_LISTS - 1;
1162 } 1162 }
1163 1163
1164 /* Returns the size of the used heap list according to given index. */ 1164 /* Returns the size of the used heap list according to given index. */
1165 static size_t 1165 static size_t