Merge branch 'g-collection' of https://github.com/bachelor-group-66-systemf/churf into g-collection
This commit is contained in:
commit
4d427ea00e
4 changed files with 163 additions and 0 deletions
|
|
@ -12,6 +12,7 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
#define HEAP_SIZE 320//65536
|
||||
#define FREE_THRESH (uint) 0
|
||||
=======
|
||||
|
|
@ -28,6 +29,11 @@
|
|||
#define FREE_THRESH (uint) 100000 //1000
|
||||
#define DEBUG
|
||||
>>>>>>> 74e0282 (Added Hash map marking)
|
||||
=======
|
||||
#define HEAP_SIZE 160000//65536
|
||||
#define FREE_THRESH (uint) 5
|
||||
// #define HEAP_DEBUG
|
||||
>>>>>>> 7e93aab6268ac896dea03dcd045b8bc249f2576c
|
||||
|
||||
namespace GC
|
||||
{
|
||||
|
|
@ -81,11 +87,16 @@ namespace GC
|
|||
|
||||
std::vector<Chunk *> m_allocated_chunks;
|
||||
std::vector<Chunk *> m_freed_chunks;
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
std::list<Chunk *> m_free_list;
|
||||
=======
|
||||
std::unordered_map<uintptr_t, Chunk*> m_chunk_table;
|
||||
>>>>>>> 74e0282 (Added Hash map marking)
|
||||
=======
|
||||
std::list<Chunk *> m_free_list;
|
||||
std::unordered_map<uintptr_t, Chunk*> m_chunk_table;
|
||||
>>>>>>> 7e93aab6268ac896dea03dcd045b8bc249f2576c
|
||||
|
||||
static bool profiler_enabled();
|
||||
// static Chunk *get_at(std::vector<Chunk *> &list, size_t n);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue