Attachment #304 for bug #289

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

(-)a/bindings/python/callbacks_list.py (+1 lines)

Lines 5-10	Link Here

    ['void', 'ns3::Ptr<ns3::Socket>', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['void', 'ns3::Ptr<ns3::Socket>', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['void', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['void', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['bool', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['bool', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['bool', 'std::string', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

    ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'],

    ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'],

    ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty'],

    ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty'],

    ['void', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'],

    ['void', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'],

(-)a/bindings/python/ns3_module_core.py (-3 / +7 lines)

Lines 12-18	Link Here

    ## callback.h: ns3::CallbackImplBase [class]

    ## callback.h: ns3::CallbackImplBase [class]

    module.add_class('CallbackImplBase', allow_subclassing=True, memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))

    module.add_class('CallbackImplBase', allow_subclassing=True, memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))

    ## command-line.h: ns3::CommandLine [class]

    ## command-line.h: ns3::CommandLine [class]

    module.add_class('CommandLine')

    module.add_class('CommandLine', allow_subclassing=True)

    ## system-mutex.h: ns3::CriticalSection [class]

    ## system-mutex.h: ns3::CriticalSection [class]

    module.add_class('CriticalSection')

    module.add_class('CriticalSection')

    ## global-value.h: ns3::GlobalValue [class]

    ## global-value.h: ns3::GlobalValue [class]

Lines 347-352	Link Here

347

    cls.add_constructor([param('ns3::CommandLine const &', 'arg0')])

347

    cls.add_constructor([param('ns3::CommandLine const &', 'arg0')])

348

    ## command-line.h: ns3::CommandLine::CommandLine() [constructor]

348

    ## command-line.h: ns3::CommandLine::CommandLine() [constructor]

349

    cls.add_constructor([])

349

    cls.add_constructor([])

350

    ## command-line.h: void ns3::CommandLine::AddValue(std::string const & name, std::string const & help, ns3::Callback<bool, std::string, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]

351

    cls.add_method('AddValue',

352

                   'void',

353

                   [param('std::string const &', 'name'), param('std::string const &', 'help'), param('ns3::Callback< bool, std::string, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])

350

    return

354

    return

351

355

352

def register_Ns3CriticalSection_methods(root_module, cls):

356

def register_Ns3CriticalSection_methods(root_module, cls):

Lines 1879-1885	Link Here

1879

    cls.add_method('ConnectWithoutContext',

1883

    cls.add_method('ConnectWithoutContext',

1880

                   'void',

1884

                   'void',

1881

                   [param('ns3::CallbackBase const &', 'cb')])

1885

                   [param('ns3::CallbackBase const &', 'cb')])

1882

    ## traced-value.h: void ns3::TracedValue<unsigned int>::Connect(ns3::CallbackBase const & cb, std::basic_string<char,std::char_traits<char>,std::allocator<char> > path) [member function]

1886

    ## traced-value.h: void ns3::TracedValue<unsigned int>::Connect(ns3::CallbackBase const & cb, std::string path) [member function]

1883

    cls.add_method('Connect',

1887

    cls.add_method('Connect',

1884

                   'void',

1888

                   'void',

1885

                   [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])

1889

                   [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])

Lines 1887-1893	Link Here

1887

    cls.add_method('DisconnectWithoutContext',

1891

    cls.add_method('DisconnectWithoutContext',

1888

                   'void',

1892

                   'void',

1889

                   [param('ns3::CallbackBase const &', 'cb')])

1893

                   [param('ns3::CallbackBase const &', 'cb')])

1890

    ## traced-value.h: void ns3::TracedValue<unsigned int>::Disconnect(ns3::CallbackBase const & cb, std::basic_string<char,std::char_traits<char>,std::allocator<char> > path) [member function]

1894

    ## traced-value.h: void ns3::TracedValue<unsigned int>::Disconnect(ns3::CallbackBase const & cb, std::string path) [member function]

1891

    cls.add_method('Disconnect',

1895

    cls.add_method('Disconnect',

1892

                   'void',

1896

                   'void',

1893

                   [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])

1897

                   [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])




#include "ns3/ref-count-base.h"
#include "ns3module.h"



    
    return (PyObject *) py_tid;
}


class CommandLinePythonValueSetter : public ns3::RefCountBase
{
    PyObject *m_namespace;
    std::string m_variable;
public:
    CommandLinePythonValueSetter (PyObject *ns, std::string const &variable) {
        Py_INCREF(ns);
        m_namespace = ns;
        m_variable = variable;
    }
    bool Parse (std::string value) {
        PyObject *pyvalue = PyString_FromStringAndSize (value.data(), value.size());
        PyObject_SetAttrString (m_namespace, m_variable.c_str(), pyvalue);
        if (PyErr_Occurred()) {
            PyErr_Print();
            return false;
        }
        return true;
    }
    virtual ~CommandLinePythonValueSetter () {
        Py_DECREF (m_namespace);
        m_namespace = NULL;
    }
    
};

PyObject *
_wrap_CommandLine_AddValue(PyNs3CommandLine *self, PyObject *args, PyObject *kwargs,
                           PyObject **return_exception)
{
    const char *name, *help, *variable = NULL;
    PyObject *py_namespace = NULL;
    const char *keywords[] = {"name", "help", "variable", "namespace", NULL};
    
    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "ss|sO", (char **) keywords, &name, &help, &variable, &py_namespace)) {
        PyObject *exc_type, *traceback;
        PyErr_Fetch(&exc_type, return_exception, &traceback);
        Py_XDECREF(exc_type);
        Py_XDECREF(traceback);
        return NULL;
    }
    
    if (variable == NULL) {
        variable = name;
    }
    if (py_namespace == NULL) {
        py_namespace = (PyObject *) self;
    }

    ns3::Ptr<CommandLinePythonValueSetter> setter = ns3::Create<CommandLinePythonValueSetter> (py_namespace, variable);
    self->obj->AddValue (name, help, ns3::MakeCallback (&CommandLinePythonValueSetter::Parse, setter));

    Py_INCREF(Py_None);
    return Py_None;
}


(-)a/bindings/python/ns3modulegen_core_customizations.py (-1 / +3 lines)

Lines 292-297	Link Here

292

    CommandLine = module['ns3::CommandLine']

292

    CommandLine = module['ns3::CommandLine']

293

    CommandLine.add_method('Parse', None, [ArgvParam(None, 'argv')],

293

    CommandLine.add_method('Parse', None, [ArgvParam(None, 'argv')],

294

                           is_static=False)

294

                           is_static=False)

295

    CommandLine.add_custom_method_wrapper("AddValue", "_wrap_CommandLine_AddValue",

296

                                          flags=["METH_VARARGS", "METH_KEYWORDS"])

295

297

296

298

297

def Object_customizations(module):

299

def Object_customizations(module):

Lines 523-527	Link Here

523

    TypeId = module['ns3::TypeId']

525

    TypeId = module['ns3::TypeId']

524

    TypeId.add_custom_method_wrapper("LookupByNameFailSafe", "_wrap_TypeId_LookupByNameFailSafe",

526

    TypeId.add_custom_method_wrapper("LookupByNameFailSafe", "_wrap_TypeId_LookupByNameFailSafe",

525

                                     flags=["METH_VARARGS", "METH_KEYWORDS", "METH_STATIC"])

527

                                     flags=["METH_VARARGS", "METH_KEYWORDS", "METH_STATIC"])

526

527

528

529

(-)a/bindings/python/ns3modulescan.py (+5 lines)

Lines 56-61	Link Here

        'automatic_type_narrowing': 'true',

        'automatic_type_narrowing': 'true',

        'allow_subclassing': 'false',

        'allow_subclassing': 'false',

},

},

    '::ns3::CommandLine': {

        'allow_subclassing': 'true', # needed so that AddValue is able to set attributes on the object

},

    'ns3::RandomVariable::RandomVariable(ns3::RandomVariableBase const & variable) [constructor]': {

    'ns3::RandomVariable::RandomVariable(ns3::RandomVariableBase const & variable) [constructor]': {

        'ignore': None,

        'ignore': None,

},

},

(-)a/bindings/python/wscript (+1 lines)

Lines 280-285	Link Here

280

   t1 > t2;

280

   t1 > t2;

281

282

283

284

"""

285

"""

285

    outfile.close()

286

    outfile.close()




    }
}

bool
CommandLine::CallbackItem::Parse (std::string value)
{
  NS_LOG_DEBUG ("CommandLine::CallbackItem::Parse \"" << value << "\"");
  return m_callback (value);
}

void
CommandLine::AddValue (const std::string &name,
                       const std::string &help,
                       Callback<bool, std::string> callback)
{
  NS_LOG_FUNCTION (this << name << help << "callback");
  CallbackItem *item = new CallbackItem ();
  item->m_name = name;
  item->m_help = help;
  item->m_callback = callback;
  m_items.push_back (item);
}


} // namespace ns3

#ifdef RUN_SELF_TESTS

(-)a/src/core/command-line.h (+20 lines)

Lines 23-28	Link Here

#include <string>

#include <string>

#include <sstream>

#include <sstream>

#include <list>

#include <list>

#include "ns3/callback.h"

namespace ns3 {

namespace ns3 {

Lines 56-61	Link Here

		 const std::string &help,

		 const std::string &help,

		 T &value);

		 T &value);

/**

   * \param name the name of the user-supplied argument

   * \param help some help text used by --PrintHelp

   * \param callback a callback function that will be invoked to parse

   * and collect the value.  This normally used by language bindings.

*/

  void AddValue (const std::string &name,

		 const std::string &help,

                 Callback<bool, std::string> callback);

/**

/**

   * \param argc the 'argc' variable: number of arguments (including the

   * \param argc the 'argc' variable: number of arguments (including the

   *        main program name as first element).

   *        main program name as first element).

Lines 82-87	Link Here

    virtual bool Parse (std::string value);

    virtual bool Parse (std::string value);

    T *m_valuePtr;

    T *m_valuePtr;

};

};

  class CallbackItem : public Item

100

  public:

101

    virtual bool Parse (std::string value);

102

    Callback<bool, std::string> m_callback;

103

};

104

  void HandleArgument (std::string name, std::string value) const;

105

  void HandleArgument (std::string name, std::string value) const;

  void PrintHelp (void) const;

106

  void PrintHelp (void) const;

  void PrintGlobals (void) const;

107

  void PrintGlobals (void) const;




        
        self.assertRaises(KeyError, ns3.TypeId.LookupByNameFailSafe, "__InvalidTypeName__")

    def testCommandLine(self):
        cmd = ns3.CommandLine()
        cmd.AddValue("Test1", "this is a test option")
        cmd.AddValue("Test2", "this is a test option")
        cmd.AddValue("Test3", "this is a test option", variable="test_xxx")
        cmd.Test1 = None
        cmd.Test2 = None
        cmd.test_xxx = None
        class Foo:
            pass
        foo = Foo()
        foo.test_foo = None
        cmd.AddValue("Test4", "this is a test option", variable="test_foo", namespace=foo)
        
        cmd.Parse(["python", "--Test1=value1", "--Test2=value2", "--Test3=123", "--Test4=xpto"])

        self.assertEqual(cmd.Test1, "value1")
        self.assertEqual(cmd.Test2, "value2")
        self.assertEqual(cmd.test_xxx, "123")
        self.assertEqual(foo.test_foo, "xpto")

if __name__ == '__main__':
    unittest.main()

Return to bug 289