diff -r 358041e239a2 -r 308e44d51626 src/csma/bindings/modulegen__gcc_ILP32.py --- a/src/csma/bindings/modulegen__gcc_ILP32.py Sun Aug 25 17:15:53 2013 -0700 +++ b/src/csma/bindings/modulegen__gcc_ILP32.py Tue Aug 27 19:08:05 2013 -0700 @@ -58,6 +58,8 @@ module.add_class('DataRate', import_from_module='ns.network') ## event-id.h (module 'core'): ns3::EventId [class] module.add_class('EventId', import_from_module='ns.core') + ## hash.h (module 'core'): ns3::Hasher [class] + module.add_class('Hasher', import_from_module='ns.core') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] module.add_class('Ipv4Address', import_from_module='ns.network') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] @@ -160,6 +162,8 @@ module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -299,11 +303,47 @@ nested_module = module.add_cpp_namespace('FatalImpl') register_types_ns3_FatalImpl(nested_module) + + ## Register a nested module for the namespace Hash + + nested_module = module.add_cpp_namespace('Hash') + register_types_ns3_Hash(nested_module) + def register_types_ns3_FatalImpl(module): root_module = module.get_root() +def register_types_ns3_Hash(module): + root_module = module.get_root() + + ## hash-function.h (module 'core'): ns3::Hash::Implementation [class] + module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter >']) + typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr') + typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*') + typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&') + typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr') + typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*') + typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&') + + ## Register a nested module for the namespace Function + + nested_module = module.add_cpp_namespace('Function') + register_types_ns3_Hash_Function(nested_module) + + +def register_types_ns3_Hash_Function(module): + root_module = module.get_root() + + ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class] + module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation']) + ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class] + module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation']) + ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class] + module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation']) + ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class] + module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation']) + def register_methods(root_module): register_Ns3Address_methods(root_module, root_module['ns3::Address']) register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper']) @@ -322,6 +362,7 @@ register_Ns3CsmaDeviceRec_methods(root_module, root_module['ns3::CsmaDeviceRec']) register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate']) register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) + register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher']) register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) @@ -365,6 +406,7 @@ register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) @@ -426,6 +468,11 @@ register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue']) register_Ns3BurstErrorModel_methods(root_module, root_module['ns3::BurstErrorModel']) register_Ns3CsmaNetDevice_methods(root_module, root_module['ns3::CsmaNetDevice']) + register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation']) + register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a']) + register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32']) + register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64']) + register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3']) return def register_Ns3Address_methods(root_module, cls): @@ -1154,6 +1201,35 @@ is_const=True) return +def register_Ns3Hasher_methods(root_module, cls): + ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Hasher const &', 'arg0')]) + ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor] + cls.add_constructor([]) + ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr hp) [constructor] + cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')]) + ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('char const *', 'buffer'), param('size_t const', 'size')]) + ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('std::string const', 's')]) + ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash64', + 'uint64_t', + [param('char const *', 'buffer'), param('size_t const', 'size')]) + ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function] + cls.add_method('GetHash64', + 'uint64_t', + [param('std::string const', 's')]) + ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function] + cls.add_method('clear', + 'ns3::Hasher &', + []) + return + def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -1419,6 +1495,11 @@ 'bool', [], is_const=True) + ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function] + cls.add_method('IsDocumentation', + 'bool', + [], + is_const=True) ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function] cls.add_method('IsEqual', 'bool', @@ -1458,16 +1539,36 @@ 'bool', [], is_const=True) + ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function] + cls.add_method('MakeAutoconfiguredAddress', + 'ns3::Ipv6Address', + [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], + is_static=True) ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function] cls.add_method('MakeAutoconfiguredAddress', 'ns3::Ipv6Address', [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], is_static=True) + ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function] + cls.add_method('MakeAutoconfiguredAddress', + 'ns3::Ipv6Address', + [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], + is_static=True) + ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function] + cls.add_method('MakeAutoconfiguredLinkLocalAddress', + 'ns3::Ipv6Address', + [param('ns3::Mac16Address', 'mac')], + is_static=True) ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function] cls.add_method('MakeAutoconfiguredLinkLocalAddress', 'ns3::Ipv6Address', [param('ns3::Mac48Address', 'mac')], is_static=True) + ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function] + cls.add_method('MakeAutoconfiguredLinkLocalAddress', + 'ns3::Ipv6Address', + [param('ns3::Mac64Address', 'mac')], + is_static=True) ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function] cls.add_method('MakeIpv4MappedAddress', 'ns3::Ipv6Address', @@ -2415,6 +2516,11 @@ 'std::string', [], is_const=True) + ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function] + cls.add_method('GetHash', + 'uint32_t', + [], + is_const=True) ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function] cls.add_method('GetName', 'std::string', @@ -2474,6 +2580,16 @@ 'bool', [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], is_const=True) + ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function] + cls.add_method('LookupByHash', + 'ns3::TypeId', + [param('uint32_t', 'hash')], + is_static=True) + ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function] + cls.add_method('LookupByHashFailSafe', + 'bool', + [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], + is_static=True) ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function] cls.add_method('LookupByName', 'ns3::TypeId', @@ -3161,6 +3277,18 @@ is_static=True) return +def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -3343,13 +3471,13 @@ 'bool', [], is_const=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] - cls.add_method('MAX', + ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function] + cls.add_method('Max', 'ns3::Time', [], is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] - cls.add_method('MIN', + ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function] + cls.add_method('Min', 'ns3::Time', [], is_static=True) @@ -3358,6 +3486,11 @@ 'void', [param('ns3::Time::Unit', 'resolution')], is_static=True) + ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function] + cls.add_method('StaticInit', + 'bool', + [], + is_static=True) ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function] cls.add_method('To', 'ns3::int64x64_t', @@ -5515,14 +5648,127 @@ visibility='protected') return +def register_Ns3HashImplementation_methods(root_module, cls): + ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')]) + ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor] + cls.add_constructor([]) + ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_pure_virtual=True, is_virtual=True) + ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash64', + 'uint64_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function] + cls.add_method('clear', + 'void', + [], + is_pure_virtual=True, is_virtual=True) + return + +def register_Ns3HashFunctionFnv1a_methods(root_module, cls): + ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')]) + ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor] + cls.add_constructor([]) + ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash64', + 'uint64_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function] + cls.add_method('clear', + 'void', + [], + is_virtual=True) + return + +def register_Ns3HashFunctionHash32_methods(root_module, cls): + ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')]) + ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor] + cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')]) + ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function] + cls.add_method('clear', + 'void', + [], + is_virtual=True) + return + +def register_Ns3HashFunctionHash64_methods(root_module, cls): + ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')]) + ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor] + cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')]) + ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash64', + 'uint64_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function] + cls.add_method('clear', + 'void', + [], + is_virtual=True) + return + +def register_Ns3HashFunctionMurmur3_methods(root_module, cls): + ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')]) + ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor] + cls.add_constructor([]) + ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash32', + 'uint32_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function] + cls.add_method('GetHash64', + 'uint64_t', + [param('char const *', 'buffer'), param('size_t const', 'size')], + is_virtual=True) + ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function] + cls.add_method('clear', + 'void', + [], + is_virtual=True) + return + def register_functions(root_module): module = root_module register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_Hash(module.get_submodule('Hash'), root_module) return def register_functions_ns3_FatalImpl(module, root_module): return +def register_functions_ns3_Hash(module, root_module): + register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module) + return + +def register_functions_ns3_Hash_Function(module, root_module): + return + def main(): out = FileCodeSink(sys.stdout) root_module = module_init()