F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mobility: (fixes #276) Make EnableAsciiAll connect in failsafe way

Browse Source
This commit is contained in:
Tom Henderson
2020-10-15 11:33:48 -07:00
parent 5b0866813c
commit c8eda79fb2
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mobility/helper/mobility-helper.cc
View File

@@ -236,8 +236,8 @@ MobilityHelper::EnableAscii (Ptr<OutputStreamWrapper> stream, uint32_t nodeid)
{
std::ostringstream oss;
oss << "/NodeList/" << nodeid << "/$ns3::MobilityModel/CourseChange";
Config::ConnectWithoutContext (oss.str (),
MakeBoundCallback (&MobilityHelper::CourseChanged, stream));
Config::ConnectWithoutContextFailSafe (oss.str (),
MakeBoundCallback (&MobilityHelper::CourseChanged, stream));
}
void
MobilityHelper::EnableAscii (Ptr<OutputStreamWrapper> stream, NodeContainer n)

21
src/mobility/helper/mobility-helper.h
View File

@@ -224,26 +224,29 @@ public:
* \param stream an output stream wrapper
* \param nodeid the id of the node to generate ascii output for.
*
* Enable ascii output on the mobility model associated to the
* specified nodeid and dump that to the specified stdc++ output
* stream.
* Enable ascii output to record course changes from the mobility model
* associated with the specified nodeid and dump that to the specified output
* stream. If the Node does not have a MobilityModel aggregated,
* this method will not produce any output.
*/
static void EnableAscii (Ptr<OutputStreamWrapper> stream, uint32_t nodeid);
/**
* \param stream an output stream wrapper
* \param n node container
*
* Enable ascii output on the mobility model associated each of
* the nodes in the input container and dump that to the
* specified stdc++ output stream.
* Enable ascii output to record course changes from the mobility models
* associated to the the nodes in the input container and dump that to the
* specified output stream. Nodes that do not have a MobilityModel
* aggregated will not result in any output.
*/
static void EnableAscii (Ptr<OutputStreamWrapper> stream, NodeContainer n);
/**
* \param stream an output stream wrapper
*
* Enable ascii output on the mobility model associated
* every node in the system and dump that to the specified
* stdc++ output stream.
* Enable ascii output to record course changes from the mobility models
* associated to every node in the system and dump that to the specified
* output stream. Nodes that do not have a MobilityModel aggregated
* will not result in any output.
*/
static void EnableAsciiAll (Ptr<OutputStreamWrapper> stream);
/**