[Porthos] Print comm, speed in MiB instead of MB.

mpc-msri · Apr 26, 2021 · 9d3c6ef · 9d3c6ef
1 parent da94a98
commit 9d3c6ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Porthos/src/connect.cpp b/Porthos/src/connect.cpp
@@ -205,8 +205,8 @@ void end_communication()
 {
 	cout << "------------------------------------" << endl;
 	cout << "Communication for execution, P" << partyNum << ": " 
-		 << (float)commObject.getSent()/1000000 << "MB (sent) " 
-		 << (float)commObject.getRecv()/1000000 << "MB (recv)" << endl;
+		 << (float)commObject.getSent()/(1024 * 1024) << "MiB (sent) " 
+		 << (float)commObject.getRecv()/(1024 * 1024) << "MiB (recv)" << endl;
 	cout << "#Calls, P" << partyNum << ": " 
 		 << commObject.getRoundsSent() << "(sends) " 
 		 << commObject.getRoundsRecv() << "(recvs)" << endl; 

diff --git a/Porthos/src/connect.h b/Porthos/src/connect.h
@@ -147,7 +147,7 @@ void sendVector(const vector<T> &vec,
 		cout << "porthosSecretType";
 	else 
 		cout << "smallType";
-	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesSent/(1.0*tt*1000000))<<" MBps."<<endl;
+	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesSent/(1.0*tt* (1024 *1024) ))<<" MiBps."<<endl;
 #endif
 }
 
@@ -182,7 +182,7 @@ void sendArr(T* arr,
 		cout << "porthosSecretType";
 	else 
 		cout << "smallType";
-	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesSent/(1.0*tt*1000000))<<" MBps."<<endl;
+	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesSent/(1.0*tt*(1024 *1024)))<<" MiBps."<<endl;
 #endif
 }
 
@@ -216,7 +216,7 @@ void receiveVector(vector<T> &vec,
 		cout << "porthosSecretType";
 	else 
 		cout << "smallType";
-	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesReceived/(1.0*tt*1000000))<<" MBps."<<endl;
+	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesReceived/(1.0*tt*(1024 *1024)))<<" MiBps."<<endl;
 #endif
 
 }
@@ -251,7 +251,7 @@ void receiveArr(T* arr,
 		cout << "porthosSecretType";
 	else 
 		cout << "smallType";
-	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesReceived/(1.0*tt*1000000))<<" MBps."<<endl;
+	cout<<" in time "<<tt<<" seconds at speed = "<<(bytesReceived/(1.0*tt*(1024 *1024)))<<" MiBps."<<endl;
 #endif
 }
 

diff --git a/Porthos/src/tools.cpp b/Porthos/src/tools.cpp
@@ -195,7 +195,7 @@ void aggregateCommunication()
 	if (partyNum == PARTY_A)
 	{
 		cout << "------------------------------------" << endl;
-		cout << "Total communication: " << (double)vec[0]/1000000 << "MB (sent) and " << (double)vec[1]/1000000 << "MB (recv)\n";
+		cout << "Total communication: " << (double)vec[0]/(1024 * 1024) << "MiB (sent) and " << (double)vec[1]/(1024 * 1024) << "MiB (recv)\n";
 		cout << "Total #calls: " << vec[2] << " (sends) and " << vec[3] << " (recvs)" << endl;
 		cout << "------------------------------------" << endl;
 	}