X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d7a2a1e71722771ee54eae5615044d6fdbe5189..d27569cf3d838674e1325b58e2b9184b5b700bf5:/teshsuite/surf/trace_usage/trace_usage.cpp diff --git a/teshsuite/surf/trace_usage/trace_usage.cpp b/teshsuite/surf/trace_usage/trace_usage.cpp index 6b04385abd..07441cf392 100644 --- a/teshsuite/surf/trace_usage/trace_usage.cpp +++ b/teshsuite/surf/trace_usage/trace_usage.cpp @@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); class DummyTestResource : public simgrid::surf::Resource { public: - DummyTestResource(const char *name) : Resource(nullptr,name) {} + explicit DummyTestResource(const char* name) : Resource(nullptr, name, nullptr) {} bool isUsed() override {return false;} void apply_event(tmgr_trace_iterator_t it, double value) override {} }; @@ -28,22 +28,23 @@ int main(int argc, char **argv) simgrid::trace_mgr::future_evt_set *fes = new simgrid::trace_mgr::future_evt_set(); tmgr_trace_t trace_A = tmgr_trace_new_from_file("trace_A.txt"); tmgr_trace_t trace_B = tmgr_trace_new_from_file("trace_B.txt"); - double next_event_date = -1.0; double value = -1.0; - simgrid::surf::Resource *resource = NULL; + simgrid::surf::Resource *resource = nullptr; simgrid::surf::Resource *hostA = new DummyTestResource("Host A"); simgrid::surf::Resource *hostB = new DummyTestResource("Host B"); fes->add_trace(trace_A, 1.0, hostA); fes->add_trace(trace_B, 0.0, hostB); - while ((next_event_date = fes->next_date()) != -1.0) { + double next_event_date = fes->next_date(); + while (next_event_date > -1.0) { XBT_INFO("%g:", next_event_date); while (fes->pop_leq(next_event_date, &value, &resource)) { XBT_INFO(" %s: %g", resource->getName(), value); } if (next_event_date > 100) break; + next_event_date = fes->next_date(); } delete fes;