Attachment #177 for bug #228

View | Details | Raw Unified | Return to bug 228
Collapse All | Expand All




    Object.add_helper_class_hook(helper_class_hook)

    ## Replace all class constructors with a generic constructor based on CreateObject<T> (AttributeList)
    module.header.writeln('''
namespace ns3 {
template <typename T>
Ptr<T> CreateObjectPython (PyObject *pyobj, const AttributeList &attributes)
{
  Ptr<T> p = Ptr<T> (new T (), false);
  p->set_pyobj (pyobj);
  p->SetTypeId (T::GetTypeId ());
  p->Object::Construct (attributes);
  return p;  
}

} // namespace ns3

''')
    
    for cls in module.classes:
        if not cls.is_subclass(Object):
            continue

            construct_code = '''
    if (self->ob_type != &%(PYTYPESTRUCT)s)
    {
        ns3::Ptr< %(HELPER_CLASS_NAME)s > obj = ns3::CreateObjectPython< %(HELPER_CLASS_NAME)s > ((PyObject *)self, attrList);
        obj->Ref ();
        self->obj = ns3::PeekPointer (obj);
        //((%(HELPER_CLASS_NAME)s*) self->obj)->set_pyobj((PyObject *)self);
    } else {
        PyErr_SetString(PyExc_TypeError, "Class cannot be constructed (unless subclassed)");
        {

            construct_code = '''
    if (self->ob_type != &%(PYTYPESTRUCT)s)
    {
        ns3::Ptr< %(HELPER_CLASS_NAME)s > obj = ns3::CreateObjectPython< %(HELPER_CLASS_NAME)s > ((PyObject *)self, attrList);
        obj->Ref ();
        self->obj = ns3::PeekPointer (obj);
        //((%(HELPER_CLASS_NAME)s*) self->obj)->set_pyobj((PyObject *)self);
    } else {
        ns3::Ptr< %(CONSTRUCT_NAME)s > obj = ns3::CreateObject< %(CONSTRUCT_NAME)s > (attrList);
        obj->Ref ();




   */
  AggregateIterator GetAggregateIterator (void) const;

  /**
   * \param tid an TypeId
   *
   * Invoked from ns3::CreateObject only.
   * Initialize the m_tid member variable to
   * keep track of the type of this object instance.
   */
  void SetTypeId (TypeId tid);
   /**
   * \param attributes the attribute values used to initialize 
   *        the member variables of this object's instance.
   *
   * Invoked from ns3::ObjectFactory::Create and ns3::CreateObject only.
   * Initialize all the member variables which were
   * registered with the associated TypeId.
   */
  void Construct (const AttributeList &attributes);

protected:
  /**
   * This method is called by Object::Dispose or by the object's 

   * its aggregates are deleted. If not, nothing is done.
   */
  void MaybeDelete (void) const;
  /**
   * \param tid an TypeId
   *
   * Invoked from ns3::CreateObject only.
   * Initialize the m_tid member variable to
   * keep track of the type of this object instance.
   */
  void SetTypeId (TypeId tid);
   /**
   * \param attributes the attribute values used to initialize 
   *        the member variables of this object's instance.
   *
   * Invoked from ns3::ObjectFactory::Create and ns3::CreateObject only.
   * Initialize all the member variables which were
   * registered with the associated TypeId.
   */
  void Construct (const AttributeList &attributes);

  /**
   * The reference count for this object. Each aggregate

Return to bug 228