@@ -38,7 +38,11 @@ namespace rubinius { stats::GCStats::get()->allocate_mature.start(); #endif +#ifdef USE_DLMALLOC obj = reinterpret_cast<Object*>(malloc_.allocate(bytes)); +#else + obj = reinterpret_cast<Object*>(malloc(bytes)); +#endif entries.push_back(obj); @@ -68,7 +72,11 @@ namespace rubinius { allocated_objects--; allocated_bytes -= obj->size_in_bytes(object_memory->state); +#ifdef USE_DLMALLOC malloc_.release(reinterpret_cast<void*>(obj)); +#else + free(reinterpret_cast<void*>(obj)); +#endif } Object* MarkSweepGC::copy_object(Object* orig) { vm/gc/marksweep.cpp @@ -8,7 +8,11 @@ #include <list> #include "call_frame_list.hpp" + +#ifdef USE_DLMALLOC #include "util/dlmalloc_cpp.hpp" +#endif + #define MS_COLLECTION_BYTES 10485760 @@ -25,7 +29,10 @@ namespace rubinius { private: MarkStack mark_stack_; + +#ifdef USE_DLMALLOC DLMalloc malloc_; +#endif public: /* Data members */ vm/gc/marksweep.hpp 9b1bd2e3d43dcada42840f8fb8cea55c119fcc0b Evan Phoenix ephoenix@engineyard.com http://github.com/evanphx/rubinius/commit/477d74c939fbe9e6f3e144cfe87e938bf599fa1d 477d74c939fbe9e6f3e144cfe87e938bf599fa1d 2009-03-27T20:30:57-07:00 2009-03-27T20:30:57-07:00 Use dlmalloc optiionally b4f641af3bbaf80c6f27b9a72fe374d427964e0f Evan Phoenix ephoenix@engineyard.com