diff options
Diffstat (limited to 'mmss/mmss.cpp')
| -rw-r--r-- | mmss/mmss.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mmss/mmss.cpp b/mmss/mmss.cpp index c3a4bc2..0e3b230 100644 --- a/mmss/mmss.cpp +++ b/mmss/mmss.cpp @@ -26,6 +26,7 @@ #include "mmss.hpp" +#include <algorithm> #include <cassert> #include <cstdio> @@ -44,7 +45,7 @@ static inline int timeout_min(int a, int b) { else if (b < 0) return a; else - return min(a, b); + return std::min(a, b); } @@ -52,10 +53,6 @@ static int get_queue_timeout(const context_t *mmss) { return timeout_min(mmss->packet_queue.timeout(), mmss->scheduled_queue.timeout()); } -uint64_t now(const context_t *mmss) { - return mmss->now; -} - void main(int argc, char *argv[]) { if (argc != 2) { std::fprintf(stderr, "usage: %s protocol_module\n", argv[0]); @@ -96,7 +93,7 @@ void main(int argc, char *argv[]) { add_iface(node3, net1, "mmss1", &addr4); while (true) { - if (mmss.now > 1000000000) + if (mmss.now() > 1000000000) break; int timeout = get_queue_timeout(&mmss); @@ -110,7 +107,7 @@ void main(int argc, char *argv[]) { assert(!mmss.packet_queue.get()); assert(!mmss.scheduled_queue.get()); - mmss.now += timeout; + mmss.time += timeout; timeout = get_queue_timeout(&mmss); } |