| OLD | NEW | 
|---|
| 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. | 
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without | 
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are | 
| 4 // met: | 4 // met: | 
| 5 // | 5 // | 
| 6 //     * Redistributions of source code must retain the above copyright | 6 //     * Redistributions of source code must retain the above copyright | 
| 7 //       notice, this list of conditions and the following disclaimer. | 7 //       notice, this list of conditions and the following disclaimer. | 
| 8 //     * Redistributions in binary form must reproduce the above | 8 //     * Redistributions in binary form must reproduce the above | 
| 9 //       copyright notice, this list of conditions and the following | 9 //       copyright notice, this list of conditions and the following | 
| 10 //       disclaimer in the documentation and/or other materials provided | 10 //       disclaimer in the documentation and/or other materials provided | 
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 447 | 447 | 
| 448   TestRetainedObjectInfo info; | 448   TestRetainedObjectInfo info; | 
| 449   global_handles->AddObjectGroup(NULL, 0, &info); | 449   global_handles->AddObjectGroup(NULL, 0, &info); | 
| 450   ASSERT(info.has_been_disposed()); | 450   ASSERT(info.has_been_disposed()); | 
| 451 | 451 | 
| 452   global_handles->AddImplicitReferences( | 452   global_handles->AddImplicitReferences( | 
| 453         Handle<HeapObject>::cast(object).location(), NULL, 0); | 453         Handle<HeapObject>::cast(object).location(), NULL, 0); | 
| 454 } | 454 } | 
| 455 | 455 | 
| 456 | 456 | 
| 457 #ifdef __linux__ | 457 // Here is a memory use test that uses /proc, and is therefore Linux-only.  We | 
|  | 458 // do not care how much memory the simulator uses, since it is only there for | 
|  | 459 // debugging purposes. | 
|  | 460 #if defined(__linux__) && !defined(USE_SIMULATOR) | 
| 458 | 461 | 
| 459 | 462 | 
| 460 static uintptr_t ReadLong(char* buffer, intptr_t* position, int base) { | 463 static uintptr_t ReadLong(char* buffer, intptr_t* position, int base) { | 
| 461   char* end_address = buffer + *position; | 464   char* end_address = buffer + *position; | 
| 462   uintptr_t result = strtoul(buffer + *position, &end_address, base); | 465   uintptr_t result = strtoul(buffer + *position, &end_address, base); | 
| 463   CHECK(result != ULONG_MAX || errno != ERANGE); | 466   CHECK(result != ULONG_MAX || errno != ERANGE); | 
| 464   CHECK(end_address > buffer + *position); | 467   CHECK(end_address > buffer + *position); | 
| 465   *position = end_address - buffer; | 468   *position = end_address - buffer; | 
| 466   return result; | 469   return result; | 
| 467 } | 470 } | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 525   intptr_t initial_memory = MemoryInUse(); | 528   intptr_t initial_memory = MemoryInUse(); | 
| 526   // Only Linux has the proc filesystem and only if it is mapped.  If it's not | 529   // Only Linux has the proc filesystem and only if it is mapped.  If it's not | 
| 527   // there we just skip the test. | 530   // there we just skip the test. | 
| 528   if (initial_memory >= 0) { | 531   if (initial_memory >= 0) { | 
| 529     InitializeVM(); | 532     InitializeVM(); | 
| 530     intptr_t booted_memory = MemoryInUse(); | 533     intptr_t booted_memory = MemoryInUse(); | 
| 531     CHECK_LE(booted_memory - initial_memory, 16 * 1024 * 1024); | 534     CHECK_LE(booted_memory - initial_memory, 16 * 1024 * 1024); | 
| 532   } | 535   } | 
| 533 } | 536 } | 
| 534 | 537 | 
| 535 #endif  // __linux__ | 538 #endif  // __linux__ and !USE_SIMULATOR | 
| OLD | NEW | 
|---|