Changes in uspace/app/tester/mm/common.c [1b3e854:38c773e7] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/tester/mm/common.c
r1b3e854 r38c773e7 135 135 } 136 136 137 static void check_consistency(const char *loc)138 {139 /* Check heap consistency */140 void *prob = heap_check();141 if (prob != NULL) {142 TPRINTF("\nError: Heap inconsistency at %p in %s.\n",143 prob, loc);144 TSTACKTRACE();145 error_flag = true;146 }147 }148 149 137 /** Checked malloc 150 138 * … … 165 153 /* Allocate the chunk of memory */ 166 154 data = malloc(size); 167 check_consistency("checked_malloc");168 155 if (data == NULL) 169 156 return NULL; … … 173 160 TPRINTF("\nError: Allocated block overlaps with another " 174 161 "previously allocated block.\n"); 175 TSTACKTRACE();176 162 error_flag = true; 177 163 } … … 212 198 if (block->addr == NULL) { 213 199 free(block); 214 check_consistency("alloc_block");215 200 return NULL; 216 201 } … … 243 228 /* Free the memory */ 244 229 free(block->addr); 245 check_consistency("free_block (a)");246 230 free(block); 247 check_consistency("free_block (b)");248 231 } 249 232 … … 274 257 pos < end; pos++) 275 258 *pos = block_expected_value(block, pos); 276 277 check_consistency("fill_block");278 259 } 279 260 … … 292 273 if (*pos != block_expected_value(block, pos)) { 293 274 TPRINTF("\nError: Corrupted content of a data block.\n"); 294 TSTACKTRACE();295 275 error_flag = true; 296 276 return; … … 316 296 if (entry == NULL) { 317 297 TPRINTF("\nError: Corrupted list of allocated memory blocks.\n"); 318 TSTACKTRACE();319 298 error_flag = true; 320 299 } … … 346 325 if (addr == NULL) { 347 326 free(area); 348 check_consistency("map_area (a)");349 327 return NULL; 350 328 } … … 353 331 if (area->addr == (void *) -1) { 354 332 free(area); 355 check_consistency("map_area (b)");356 333 return NULL; 357 334 } … … 384 361 385 362 free(area); 386 check_consistency("unmap_area");387 363 } 388 364 … … 413 389 pos < end; pos++) 414 390 *pos = area_expected_value(area, pos); 415 416 check_consistency("fill_area"); 417 } 391 }
Note:
See TracChangeset
for help on using the changeset viewer.