Attachment #342 for bug #375

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

(-)a/bindings/python/ns3_module_simulator.py (-5 lines)

Lines 291-301	Link Here

291

                   'ns3::Time',

291

                   'ns3::Time',

292

[],

292

[],

293

                   is_static=True)

293

                   is_static=True)

294

    ## simulator.h: static void ns3::Simulator::Run() [member function]

295

    cls.add_method('Run',

296

                   'void',

297

[],

298

                   is_static=True, unblock_threads=True)

299

    ## simulator.h: static void ns3::Simulator::RunOneEvent() [member function]

294

    ## simulator.h: static void ns3::Simulator::RunOneEvent() [member function]

300

    cls.add_method('RunOneEvent',

295

    cls.add_method('RunOneEvent',

301

                   'void',

296

                   'void',




    return Py_None;
}


PyObject *
_wrap_Simulator_Run(PyNs3Simulator *PYBINDGEN_UNUSED(dummy), PyObject *args, PyObject *kwargs,
                    PyObject **return_exception)
{
    const char *keywords[] = {"signal_check_frequency", NULL};
    int signal_check_frequency = 100;
    
    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "|i", (char **) keywords, &signal_check_frequency)) {
        PyObject *exc_type, *traceback;
        PyErr_Fetch(&exc_type, return_exception, &traceback);
        Py_XDECREF(exc_type);
        Py_XDECREF(traceback);
        return NULL;
    }

    PyThreadState *py_thread_state = NULL;

    if (signal_check_frequency == -1)
    {
        if (PyEval_ThreadsInitialized ())
            py_thread_state = PyEval_SaveThread();
        ns3::Simulator::Run();
        if (py_thread_state)
            PyEval_RestoreThread(py_thread_state);
    } else {
        while (!ns3::Simulator::IsFinished())
        {        
            if (PyEval_ThreadsInitialized())
                py_thread_state = PyEval_SaveThread();

            for (int n = signal_check_frequency; n > 0; --n)
            {        
                ns3::Simulator::RunOneEvent();
            }
            
            if (py_thread_state)
                PyEval_RestoreThread(py_thread_state);
            PyErr_CheckSignals();
            if (PyErr_Occurred())
                return NULL;
        }
    }
    Py_INCREF(Py_None);
    return Py_None;
}


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

Lines 285-290	Link Here

285

286

    ## Simulator::ScheduleDestroy(callback, ...user..args...)

286

    ## Simulator::ScheduleDestroy(callback, ...user..args...)

287

    Simulator.add_custom_method_wrapper("ScheduleDestroy", "_wrap_Simulator_ScheduleDestroy",

287

    Simulator.add_custom_method_wrapper("ScheduleDestroy", "_wrap_Simulator_ScheduleDestroy",

288

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

289

290

    Simulator.add_custom_method_wrapper("Run", "_wrap_Simulator_Run",

288

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

291

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

289

292

290

293

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

Lines 150-160	Link Here

150

            and pygccxml_definition.name.startswith('Schedule'):

150

            and pygccxml_definition.name.startswith('Schedule'):

151

        global_annotations['ignore'] = None

151

        global_annotations['ignore'] = None

152

153

    # unblock python threads for Simulator::Run

153

    # manually wrapped

154

    if isinstance(pygccxml_definition, member_function_t) \

154

    if isinstance(pygccxml_definition, member_function_t) \

155

            and pygccxml_definition.parent.name == 'Simulator' \

155

            and pygccxml_definition.parent.name == 'Simulator' \

156

            and pygccxml_definition.name == 'Run':

156

            and pygccxml_definition.name == 'Run':

157

        global_annotations['unblock_threads'] = True

157

        global_annotations['ignore'] = True

158

159

160

    ## classes

160

    ## classes




    app = onoff.Install(ns3.NodeContainer(terminals.Get(0)))
    # Start the application
    app.Start(ns3.Seconds(1.0))
    #app.Stop(ns3.Seconds(10.0))

    # Create an optional packet sink to receive these packets
    sink = ns3.PacketSinkHelper("ns3::UdpSocketFactory",

                       ns3.AddressValue(ns3.InetSocketAddress(ns3.Ipv4Address("10.1.1.1"), port)))
    app = onoff.Install(ns3.NodeContainer(terminals.Get(3)))
    app.Start(ns3.Seconds(1.1))
    #app.Stop(ns3.Seconds(10.0))

    app = sink.Install(ns3.NodeContainer(terminals.Get(0)))
    app.Start (ns3.Seconds (0.0))

    # and can be read by the "tcpdump -r" command(use "-tt" option to
    # display timestamps correctly)
    #
    #ns3.CsmaHelper.EnablePcapAll("csma-bridge")

    #
    # Now, do the actual simulation.
    #
    #print "Run Simulation."
    #import threading
    ns3.Simulator.Stop(ns3.Seconds(100))
    ns3.Simulator.Run(signal_check_frequency=100)
    ns3.Simulator.Destroy()
    #print "Done."


(-)a/src/simulator/default-simulator-impl.cc (-1 / +1 lines)

Lines 124-130	Link Here

124

bool

124

bool

125

DefaultSimulatorImpl::IsFinished (void) const

125

DefaultSimulatorImpl::IsFinished (void) const

126

127

  return m_events->IsEmpty ();

127

  return m_events->IsEmpty () || m_stop;

128

129

130

uint64_t

130

uint64_t

Return to bug 375