<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Hi huyao,<div><br></div><div>With merging there is always a chance of conflict, but all conflicts are resolvable (or at least you can abort or revert back, if it is something serious). That was my primary reason to recommend writing extensions and scenarios outside NS-3 and ndnSIM repos (like here <a href="https://github.com/cawka/ndnSIM-examples">https://github.com/cawka/ndnSIM-examples</a>, here <a href="https://github.com/cawka/ndnSIM-ddos-interest-flooding">https://github.com/cawka/ndnSIM-ddos-interest-flooding</a> and other example repos).</div><div><br></div><div>In this particular case, I don't believe that you're going to have conflicts, if you were using relatively new ndnSIM code (what ndnSIM commit your code is based). I basically made trivial changes that are not related to ndn-forwarding-strategy.cc.</div><div><br></div><div>You should be able to pull code for NS-3 repo (this is different from ndnSIM repo), where the addition is just one file that gives you ability to monitor CS in visualizer. So, there should not be any kind of problem here with merging.</div><div><br></div><div>---</div><div>Alex</div><div><br><div><div>On Apr 10, 2013, at 5:15 AM, yao hu <<a href="mailto:huyao0107@gmail.com">huyao0107@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr">Hi Alex,<div><br></div><div style="">Thanks very much for your work! </div><div style="">Now I have made some change to some files including model/fw/ndn-forwarding-strategy.cc and it seems it works well. What should I do next in order to update my ns-3 and ndnsim to the latest version without using github (because of concerns about conflict.. it annoys a lot..:( ).</div>
<div style=""><br></div><div style="">Thanks a lot~</div><div style=""><br></div><div style="">Regards,</div><div style="">huyao</div><div style=""><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">2013/4/9 Alex Afanasyev <span dir="ltr"><<a href="mailto:alexander.afanasyev@ucla.edu" target="_blank">alexander.afanasyev@ucla.edu</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi huyao,<br>
<br>
I just added this ability to NS-3/ndnSIM. You need to update your NS-3 and ndnSIM code to the latest version from github.<br>
<br>
For now it shows only names of the content objects that are in cache. Let me known if you want to see some more information there.<br>
<br>
---<br>
Alex<br>
<div><div class="h5"><br>
On Apr 8, 2013, at 8:22 AM, yao hu <<a href="mailto:huyao0107@gmail.com">huyao0107@gmail.com</a>> wrote:<br>
<br>
> Hi Alex,<br>
><br>
> Is there a simple way to see the real-time contents or entries in CS like FIB and PIT in visulizer on some node when simulation runs?<br>
><br>
> Thanks for your reply!!<br>
><br>
> Regards,<br>
> huyao<br>
</div></div>> _______________________________________________<br>
> ndnSIM mailing list<br>
> <a href="mailto:ndnSIM@lists.cs.ucla.edu">ndnSIM@lists.cs.ucla.edu</a><br>
> <a href="http://www.lists.cs.ucla.edu/mailman/listinfo/ndnsim" target="_blank">http://www.lists.cs.ucla.edu/mailman/listinfo/ndnsim</a><br>
<br>
</blockquote></div><br></div>
_______________________________________________<br>ndnSIM mailing list<br><a href="mailto:ndnSIM@lists.cs.ucla.edu">ndnSIM@lists.cs.ucla.edu</a><br>http://www.lists.cs.ucla.edu/mailman/listinfo/ndnsim<br></blockquote></div><br></div></body></html>