lib/libmpi/MpiHost: print dotted notation of node IP address in startProcesses()

nieklinnenbank · nieklinnenbank · commit fabaae00a180 · 2021-01-13T22:02:09.000+01:00
diff --git a/lib/libmpi/MpiHost.cpp b/lib/libmpi/MpiHost.cpp
@@ -402,8 +402,8 @@ MpiHost::Result MpiHost::parseHostsFile(const char *hostsfile)
         }
         m_packetBuffers.insertAt(idx, lst);
 
-        NOTICE("m_nodes[" << idx << "]: ip = " << *nodeLine[0] << ", port = " << *nodeLine[1] <<
-               ", core = " << *nodeLine[2]);
+        DEBUG("m_nodes[" << idx << "]: ip = " << *nodeLine[0] << ", port = " << *nodeLine[1] <<
+              ", core = " << *nodeLine[2]);
     }
 
     // Cleanup
@@ -441,7 +441,10 @@ MpiHost::Result MpiHost::startProcesses(int argc,
 
     for (Size i = 1; i < m_nodes.count(); i++)
     {
-        NOTICE("nodes[" << i << "] = " << m_nodes[i]->ipAddress <<
+        in_addr nodeAddr;
+        nodeAddr.s_addr = m_nodes[i]->ipAddress;
+
+        NOTICE("nodes[" << i << "] = " << inet_ntoa(nodeAddr) <<
                ":" << m_nodes[i]->udpPort << ":" << m_nodes[i]->coreId);
 
         // Construct packet to send

Original file line number	Diff line number	Diff line change
`@@ -402,8 +402,8 @@ MpiHost::Result MpiHost::parseHostsFile(const char *hostsfile)`
`402`	`402`	`}`
`403`	`403`	`m_packetBuffers.insertAt(idx, lst);`
`404`	`404`
`405`		`- NOTICE("m_nodes[" << idx << "]: ip = " << nodeLine[0] << ", port = " << nodeLine[1] <<`
`406`		`- ", core = " << *nodeLine[2]);`
	`405`	`+ DEBUG("m_nodes[" << idx << "]: ip = " << nodeLine[0] << ", port = " << nodeLine[1] <<`
	`406`	`+ ", core = " << *nodeLine[2]);`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`// Cleanup`
`@@ -441,7 +441,10 @@ MpiHost::Result MpiHost::startProcesses(int argc,`
`441`	`441`
`442`	`442`	`for (Size i = 1; i < m_nodes.count(); i++)`
`443`	`443`	`{`
`444`		`- NOTICE("nodes[" << i << "] = " << m_nodes[i]->ipAddress <<`
	`444`	`+ in_addr nodeAddr;`
	`445`	`+ nodeAddr.s_addr = m_nodes[i]->ipAddress;`
	`446`	`+`
	`447`	`+ NOTICE("nodes[" << i << "] = " << inet_ntoa(nodeAddr) <<`
`445`	`448`	`":" << m_nodes[i]->udpPort << ":" << m_nodes[i]->coreId);`
`446`	`449`
`447`	`450`	`// Construct packet to send`