Skip to content

Commit

Permalink
Renamed ObjectMemory to Memory.
Browse files Browse the repository at this point in the history
The Memory class will consolidate all aspects of managed memory in the
Rubinius machine, not just 'Object' memory. There is a counterpart of
Memory, as SystemMemory, to manage requesting memory from the underlying
system (most likely the OS).
brixen committed Feb 7, 2016
1 parent 6bb4288 commit 8f4c978
Showing 153 changed files with 269 additions and 269 deletions.
2 changes: 1 addition & 1 deletion vm/arguments.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "arguments.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "state.hpp"
#include "vm.hpp"

2 changes: 1 addition & 1 deletion vm/builtin/access_variable.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "arguments.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/access_variable.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/alias.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/alias.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/array.cpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#include "configuration.hpp"
#include "dispatch.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/array.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/atomic.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/atomic.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/autoload.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "helpers.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/autoload.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/basic_object.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/basic_object.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/bignum.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "configuration.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/array.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/block_as_method.cpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#include "call_frame.hpp"
#include "configuration.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/block_as_method.hpp"
#include "builtin/block_environment.hpp"
6 changes: 3 additions & 3 deletions vm/builtin/block_environment.cpp
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#include "instruments/tooling.hpp"
#include "object_utils.hpp"
#include "on_stack.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/block_environment.hpp"
#include "builtin/class.hpp"
@@ -224,7 +224,7 @@ namespace rubinius {
/* The references in args are not visible to the GC and
* there's not a simple mechanism to manage that now.
*/
ObjectMemory::GCInhibit inhibitor(state);
Memory::GCInhibit inhibitor(state);

if(!(obj = obj->send(state, call_frame, G(sym_to_ary)))) {
return false;
@@ -284,7 +284,7 @@ namespace rubinius {
/* The references in args are not visible to the GC and
* there's not a simple mechanism to manage that now.
*/
ObjectMemory::GCInhibit inhibitor(state);
Memory::GCInhibit inhibitor(state);

kw_result = dispatch.send(state, call_frame, args);
}
2 changes: 1 addition & 1 deletion vm/builtin/byte_array.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "alloc.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/byte_array.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/call_custom_cache.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/call_custom_cache.hpp"
#include "builtin/call_unit.hpp"
4 changes: 2 additions & 2 deletions vm/builtin/call_site.cpp
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#include "global_cache.hpp"
#include "lookup_data.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/class.hpp"
#include "builtin/call_custom_cache.hpp"
@@ -57,7 +57,7 @@ namespace rubinius {
/* The references in args are not visible to the GC and
* there's not a simple mechanism to manage that now.
*/
ObjectMemory::GCInhibit inhibitor(state);
Memory::GCInhibit inhibitor(state);

ret = G(rubinius)->send(state, call_frame, state->symbol("bind_call"), ary);
}
2 changes: 1 addition & 1 deletion vm/builtin/call_unit.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "arguments.hpp"
#include "call_frame.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/call_unit.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/call_unit_adapter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/call_unit_adapter.hpp"
#include "builtin/call_unit.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/channel.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "object_utils.hpp"
#include "on_stack.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "thread_phase.hpp"

#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/character.cpp
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#include "transcoder.h"

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/byte_array.hpp"
#include "builtin/character.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/class.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "configuration.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/array.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/class.hpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#define RBX_BUILTIN_CLASS_HPP

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/object.hpp"
#include "builtin/fixnum.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/code_db.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "signature.h"

#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"
#include "ontology.hpp"
#include "marshal.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/compact_lookup_table.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/array.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/compiled_code.cpp
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#include "configuration.hpp"
#include "instruments/timing.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/call_site.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/compiled_code.hpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#define RBX_BUILTIN_COMPILEDCODE_HPP

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/constant_scope.hpp"
#include "builtin/executable.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/constant_cache.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/constant_cache.hpp"
#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/constant_cache.hpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#define RBX_BUILTIN_CONSTANT_CACHE_HPP

#include "machine_code.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/constant_scope.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/constant_scope.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "call_frame.hpp"

#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/constant_scope.hpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#define RBX_BUILTIN_STATICSCOPE_HPP

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/module.hpp"
#include "builtin/object.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/constant_table.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/array.hpp"
#include "builtin/autoload.hpp"
4 changes: 2 additions & 2 deletions vm/builtin/data.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/data.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/diagnostics.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/class.hpp"
#include "builtin/diagnostics.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/dir.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/dir.hpp"
#include "builtin/array.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/encoding.cpp
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "alloc.hpp"
#include "configuration.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"
#include "on_stack.hpp"

2 changes: 1 addition & 1 deletion vm/builtin/exception.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "call_frame.hpp"
#include "configuration.hpp"
#include "object_utils.hpp"
6 changes: 3 additions & 3 deletions vm/builtin/executable.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "arguments.hpp"
#include "call_frame.hpp"
#include "dispatch.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/class.hpp"
@@ -60,7 +60,7 @@ namespace rubinius {
return dispatch.send(state, call_frame, args);
}

void Executable::add_inliner(STATE, ObjectMemory* om, CompiledCode* code) {
void Executable::add_inliner(STATE, Memory* om, CompiledCode* code) {
if(!inliners_ || inliners_ == (Inliners*)cNil) {
inliners_ = new Inliners(state, om);
}
@@ -106,7 +106,7 @@ namespace rubinius {
}
}

Inliners::Inliners(STATE, ObjectMemory* om) {
Inliners::Inliners(STATE, Memory* om) {
om->add_code_resource(state, this);
}

6 changes: 3 additions & 3 deletions vm/builtin/executable.hpp
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@ namespace rubinius {

class MachineCode;
class CompiledCode;
class ObjectMemory;
class Memory;

class Inliners : public memory::CodeResource {
std::vector<CompiledCode*> inliners_;

public:
Inliners(STATE, ObjectMemory* om);
Inliners(STATE, Memory* om);

std::vector<CompiledCode*>& inliners() {
return inliners_;
@@ -101,7 +101,7 @@ namespace rubinius {

bool resolve_primitive(STATE);

void add_inliner(STATE, ObjectMemory* om, CompiledCode* code);
void add_inliner(STATE, Memory* om, CompiledCode* code);
void clear_inliners(STATE);

class Info : public TypeInfo {
2 changes: 1 addition & 1 deletion vm/builtin/ffi_pointer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ffi_util.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "windows_compat.h"

#include "builtin/array.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/fiber.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "arguments.hpp"
#include "call_frame.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/array.hpp"
#include "builtin/class.hpp"
4 changes: 2 additions & 2 deletions vm/builtin/find_object.cpp
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
#include "builtin/system.hpp"
#include "memory/gc.hpp"
#include "memory/walker.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"
#include "on_stack.hpp"
#include "thread_phase.hpp"
@@ -257,7 +257,7 @@ namespace rubinius {
Array* arg, Object* callable,
CallFrame* calling_environment)
{
ObjectMemory::GCInhibit inhibitor(state->memory());
Memory::GCInhibit inhibitor(state->memory());

// Support an aux mode, where callable is an array and we just append
// objects to it rather than #call it.
2 changes: 1 addition & 1 deletion vm/builtin/float.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "configuration.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/array.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/fsevent.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "thread_phase.hpp"

#include "builtin/class.hpp"
2 changes: 1 addition & 1 deletion vm/builtin/heap_dump.cpp
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
#include "builtin/variable_scope.hpp"
#include "memory/gc.hpp"
#include "memory/walker.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include <fcntl.h>
2 changes: 1 addition & 1 deletion vm/builtin/integer.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "configuration.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/bignum.hpp"
Loading

0 comments on commit 8f4c978

Please sign in to comment.