switch repr to Class(objectname). fix python operation tests.

diff --git a/examples/python/operation-io/operation-io.tesh b/examples/python/operation-io/operation-io.tesh
index d796363..b217012 100644 (file)
--- a/examples/python/operation-io/operation-io.tesh
+++ b/examples/python/operation-io/operation-io.tesh
@@ -1,12 +1,12 @@
 #!/usr/bin/env tesh
 
 $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-io.py --platform ${platfdir}/hosts_with_disks.xml
-> [1.0] Operation exec1 finished (1)
-> [1.25] Operation write finished (1)
-> [1.35] Operation read finished (1)
-> [2.0] Operation exec1 finished (2)
-> [2.25] Operation write finished (2)
-> [2.35] Operation exec2 finished (1)
-> [2.35] Operation read finished (2)
-> [3.35] Operation exec2 finished (2)
+> [1.0] Operation ExecOp(exec1) finished (1)
+> [1.25] Operation IoOp(write) finished (1)
+> [1.35] Operation IoOp(read) finished (1)
+> [2.0] Operation ExecOp(exec1) finished (2)
+> [2.25] Operation IoOp(write) finished (2)
+> [2.35] Operation ExecOp(exec2) finished (1)
+> [2.35] Operation IoOp(read) finished (2)
+> [3.35] Operation ExecOp(exec2) finished (2)
 

diff --git a/examples/python/operation-simple/operation-simple.tesh b/examples/python/operation-simple/operation-simple.tesh
index 7cb0499..fcea020 100644 (file)
--- a/examples/python/operation-simple/operation-simple.tesh
+++ b/examples/python/operation-simple/operation-simple.tesh
@@ -1,9 +1,9 @@
 #!/usr/bin/env tesh
 
 $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-simple.py --platform ${platfdir}/small_platform.xml
-> [10.194199500484224] Operation exec1 finished (1)
-> [11.714617112501687] Operation comm finished (1)
-> [20.388399000968448] Operation exec1 finished (2)
-> [21.90881661298591] Operation comm finished (2)
-> [24.82146412938331] Operation exec2 finished (1)
-> [37.92831114626493] Operation exec2 finished (2)
+> [10.194199500484224] Operation ExecOp(exec1) finished (1)
+> [11.714617112501687] Operation CommOp(comm) finished (1)
+> [20.388399000968448] Operation ExecOp(exec1) finished (2)
+> [21.90881661298591] Operation CommOp(comm) finished (2)
+> [24.82146412938331] Operation ExecOp(exec2) finished (1)
+> [37.92831114626493] Operation ExecOp(exec2) finished (2)

diff --git a/examples/python/operation-switch-host/operation-switch-host.tesh b/examples/python/operation-switch-host/operation-switch-host.tesh
index a74c06d..ced340b 100644 (file)
--- a/examples/python/operation-switch-host/operation-switch-host.tesh
+++ b/examples/python/operation-switch-host/operation-switch-host.tesh
@@ -1,15 +1,15 @@
 #!/usr/bin/env tesh
 
 $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-switch-host.py --platform ${platfdir}/small_platform.xml
-> [1.5204176120174615] Operation comm0 finished (1)
-> [2.873012467069035] Operation comm0 finished (2)
-> [4.393430079086497] Operation comm0 finished (3)
-> [5.74602493413807] Operation comm0 finished (4)
-> [14.62726462889908] Operation exec1 finished (1)
-> [15.979859483950655] Operation exec2 finished (1)
-> [16.14768224091654] Operation comm1 finished (1)
-> [17.33245433900223] Operation comm2 finished (1)
-> [27.7341116457807] Operation exec1 finished (2)
-> [29.086706500832275] Operation exec2 finished (2)
-> [29.25452925779816] Operation comm1 finished (2)
-> [30.43930135588385] Operation comm2 finished (2)
\ No newline at end of file
+> [1.5204176120174615] Operation CommOp(comm0) finished (1)
+> [2.873012467069035] Operation CommOp(comm0) finished (2)
+> [4.393430079086497] Operation CommOp(comm0) finished (3)
+> [5.74602493413807] Operation CommOp(comm0) finished (4)
+> [14.62726462889908] Operation ExecOp(exec1) finished (1)
+> [15.979859483950655] Operation ExecOp(exec2) finished (1)
+> [16.14768224091654] Operation CommOp(comm1) finished (1)
+> [17.33245433900223] Operation CommOp(comm2) finished (1)
+> [27.7341116457807] Operation ExecOp(exec1) finished (2)
+> [29.086706500832275] Operation ExecOp(exec2) finished (2)
+> [29.25452925779816] Operation CommOp(comm1) finished (2)
+> [30.43930135588385] Operation CommOp(comm2) finished (2)

diff --git a/examples/python/operation-variable-load/operation-variable-load.tesh b/examples/python/operation-variable-load/operation-variable-load.tesh
index 4420174..70ecefe 100644 (file)
--- a/examples/python/operation-variable-load/operation-variable-load.tesh
+++ b/examples/python/operation-variable-load/operation-variable-load.tesh
@@ -2,17 +2,18 @@
 
 $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/operation-variable-load.py --platform ${platfdir}/small_platform.xml
 > --- Small load ---
-> [1.5204176120174615] Operation comm finished (1)
-> [14.62726462889908] Operation exec finished (1)
-> [101.52041761201747] Operation comm finished (2)
-> [114.62726462889908] Operation exec finished (2)
-> [201.52041761201744] Operation comm finished (3)
-> [214.62726462889907] Operation exec finished (3)
+> [1.5204176120174615] Operation CommOp(comm) finished (1)
+> [14.62726462889908] Operation ExecOp(exec) finished (1)
+> [101.52041761201747] Operation CommOp(comm) finished (2)
+> [114.62726462889908] Operation ExecOp(exec) finished (2)
+> [201.52041761201744] Operation CommOp(comm) finished (3)
+> [214.62726462889907] Operation ExecOp(exec) finished (3)
 > --- Heavy load ---
-> [1301.5204176120174] Operation comm finished (4)
-> [1303.0408352240347] Operation comm finished (5)
-> [1304.561252836052] Operation comm finished (6)
-> [1314.627264628899] Operation exec finished (4)
-> [1327.7341116457806] Operation exec finished (5)
-> [1340.8409586626622] Operation exec finished (6)
+> [1301.5204176120174] Operation CommOp(comm) finished (4)
+> [1303.0408352240347] Operation CommOp(comm) finished (5)
+> [1304.561252836052] Operation CommOp(comm) finished (6)
+> [1314.627264628899] Operation ExecOp(exec) finished (4)
+> [1327.7341116457806] Operation ExecOp(exec) finished (5)
+> [1340.8409586626622] Operation ExecOp(exec) finished (6)
+
 

diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp
index 4458bd7..0b7fd84 100644 (file)
--- a/src/bindings/python/simgrid_python.cpp
+++ b/src/bindings/python/simgrid_python.cpp
@@ -324,7 +324,7 @@ PYBIND11_MODULE(simgrid, m)
       .def_property_readonly("name", &simgrid::s4u::NetZone::get_name,
                              "The name of this network zone (read-only property).")
       .def(
-          "__repr__", [](const simgrid::s4u::NetZone net) { return "<simgrid.NetZone " + net.get_name() + ">"; },
+          "__repr__", [](const simgrid::s4u::NetZone net) { return "NetZone(" + net.get_name() + ")"; },
           "Textual representation of the NetZone");
 
   /* Class ClusterCallbacks */
@@ -475,7 +475,7 @@ PYBIND11_MODULE(simgrid, m)
           },
           "")
       .def(
-          "__repr__", [](const Host* h) { return "<simgrid.Host " + h->get_name() + ">"; },
+          "__repr__", [](const Host* h) { return "Host(" + h->get_name() + ")"; },
           "Textual representation of the Host");
 
   py::enum_<simgrid::s4u::Host::SharingPolicy>(host, "SharingPolicy")
@@ -500,7 +500,7 @@ PYBIND11_MODULE(simgrid, m)
       .def("seal", &simgrid::s4u::Disk::seal, py::call_guard<py::gil_scoped_release>(), "Seal this disk")
       .def_property_readonly("name", &simgrid::s4u::Disk::get_name, "The name of this disk (read-only property).")
       .def(
-          "__repr__", [](const Disk* d) { return "<simgrid.Disk " + d->get_name() + ">"; },
+          "__repr__", [](const Disk* d) { return "Disk(" + d->get_name() + ")"; },
           "Textual representation of the Disk");
   py::enum_<simgrid::s4u::Disk::SharingPolicy>(disk, "SharingPolicy")
       .value("NONLINEAR", simgrid::s4u::Disk::SharingPolicy::NONLINEAR)
@@ -599,7 +599,7 @@ PYBIND11_MODULE(simgrid, m)
                              "The bandwidth (in bytes per second) (read-only property).")
       .def_property_readonly("latency", &Link::get_latency, "The latency (in seconds) (read-only property).")
       .def(
-          "__repr__", [](const Link* l) { return "<simgrid.Link " + l->get_name() + ">"; },
+          "__repr__", [](const Link* l) { return "Link(" + l->get_name() + ")"; },
           "Textual representation of the Link");
   py::enum_<Link::SharingPolicy>(link, "SharingPolicy")
       .value("NONLINEAR", Link::SharingPolicy::NONLINEAR)
@@ -643,7 +643,7 @@ PYBIND11_MODULE(simgrid, m)
   py::class_<simgrid::s4u::Mailbox, std::unique_ptr<Mailbox, py::nodelete>>(
       m, "Mailbox", "Mailbox. See the C++ documentation for details.")
       .def(
-          "__repr__", [](const Mailbox* self) { return "<simgrid.Mailbox " + self->get_name() + ">"; },
+          "__repr__", [](const Mailbox* self) { return "Mailbox(" + self->get_name() + ")"; },
           "Textual representation of the Mailbox")
       .def_static("by_name", &Mailbox::by_name, py::call_guard<py::gil_scoped_release>(), py::arg("name"),
                   "Retrieve a Mailbox from its name")
@@ -911,7 +911,7 @@ PYBIND11_MODULE(simgrid, m)
       .def_static("kill_all", &Actor::kill_all, py::call_guard<py::gil_scoped_release>(),
                   "Kill all actors but the caller.")
       .def(
-          "__repr__", [](const ActorPtr a) { return "<simgrid.Actor " + a->get_name() + ">"; },
+          "__repr__", [](const ActorPtr a) { return "Actor(" + a->get_name() + ")"; },
           "Textual representation of the Actor");
 
   /* Enum Class IoOpType */
@@ -962,7 +962,7 @@ PYBIND11_MODULE(simgrid, m)
       .def("on_this_end", py::overload_cast<const std::function<void(Operation*)>&>(&Operation::on_this_end),
            py::arg("func"), "Add a callback called when this operation ends.")
       .def(
-          "__repr__", [](const OperationPtr op) { return "<simgrid.Operation " + op->get_name() + ">"; },
+          "__repr__", [](const OperationPtr op) { return "Operation(" + op->get_name() + ")"; },
           "Textual representation of the Operation");
 
   /* Class CommOp */
@@ -978,7 +978,7 @@ PYBIND11_MODULE(simgrid, m)
                     "The destination of the communication.")
       .def_property("bytes", &CommOp::get_bytes, &CommOp::set_bytes, "The amount of bytes to send.")
       .def(
-          "__repr__", [](const CommOpPtr c) { return "<simgrid.CommOp " + c->get_name() + ">"; },
+          "__repr__", [](const CommOpPtr c) { return "CommOp(" + c->get_name() + ")"; },
           "Textual representation of the CommOp");
 
   /* Class ExecOp */
@@ -991,7 +991,7 @@ PYBIND11_MODULE(simgrid, m)
       .def_property("host", &ExecOp::get_host, &ExecOp::set_host, "The host of the execution.")
       .def_property("flops", &ExecOp::get_flops, &ExecOp::set_flops, "The amount of flops to execute.")
       .def(
-          "__repr__", [](const ExecOpPtr e) { return "<simgrid.ExecOp " + e->get_name() + ">"; },
+          "__repr__", [](const ExecOpPtr e) { return "ExecOp(" + e->get_name() + ")"; },
           "Textual representation of the ExecOp");
 
   /* Class IoOp */
@@ -1005,6 +1005,6 @@ PYBIND11_MODULE(simgrid, m)
       .def_property("bytes", &IoOp::get_bytes, &IoOp::set_bytes, "The amount of bytes to process.")
       .def_property("type", &IoOp::get_bytes, &IoOp::set_bytes, "The type of IO.")
       .def(
-          "__repr__", [](const IoOpPtr io) { return "<simgrid.IoOp " + io->get_name() + ">"; },
+          "__repr__", [](const IoOpPtr io) { return "IoOp(" + io->get_name() + ")"; },
           "Textual representation of the IoOp");
 }