batch size in prog int test

Author: siamumar

exec/TinyGarblePI.cpp

@@ -15,6 +15,7 @@ int main(int argc, char** argv) {
 	string netlist_address;
 	string server_ip;
 	int program;
+	int bs_mal = 100000;
 
 	Timer T;
 	memMeter M;
@@ -26,6 +27,8 @@ int main(int argc, char** argv) {
 	("party,k", po::value<int>(&party)->default_value(1), "party id: 1 for garbler, 2 for evaluator")  //
 	("port,p", po::value<int>(&port)->default_value(1234), "socket port")  //
 	("server_ip,s", po::value<string>(&server_ip)->default_value("127.0.0.1"), "server's IP.")  //
+	("batch_size,b", po::value<int>(&bs_mal)->default_value(100000),"pre-processing bacth size for malicious setting\n\
+	default:choose adaptively\nused for setting maximum available memory") //
 	("sh", "semi-honest setting (default is malicious)") ;
 
 	po::variables_map vm;
@@ -58,8 +61,8 @@ int main(int argc, char** argv) {
 		unit_test(TGPI_SH);		
 	}
 	else {
-		cout << "testing program interface in malicious setting" << endl;
-		TGPI = new TinyGarblePI(io, party, 100000, 100000);
+		cout << "testing program interface in malicious setting with batch size " << bs_mal << endl;
+		TGPI = new TinyGarblePI(io, party, bs_mal, bs_mal);
 		io->flush();
 		unit_test(TGPI);
 	}

exec/exec_common.h

@@ -21,12 +21,15 @@ void mat_mult(uint64_t i, uint64_t j, uint64_t k, auto &A, auto &B, auto &C, int
 	}
 }
 
-uint64_t test_index = 0;
+uint64_t test_index = 0, test_passed = 0;
 void verify_n_report(string test, auto res, auto ref){
     cout << "[<#>] test " << test_index++ << ": " << test;
-    if (res == ref) cout << ": success!";
+    if (res == ref){
+		test_passed++;
+		cout << ": success!";
+	}
     else cout << ": fail! excpected: " << ref << " computed: " << res;
-    cout  << endl;
+	cout << "(" << test_passed << "/" << test_index << ")" << endl;
 }
 
 #endif //EXEC_COMMON_H

exec/millionaire.cpp

@@ -8,15 +8,7 @@
 using namespace std;
 namespace po = boost::program_options;
 
-#define SEC_SH 0
-
-void millionaire(NetIO* io, int party){	
-#if SEC_SH
-	TinyGarblePI_SH* TGPI = new TinyGarblePI_SH(io, party);
-#else
-	TinyGarblePI* TGPI = new TinyGarblePI(io, party);
-#endif
-	io->flush();
+void millionaire(auto TGPI){	
 
 	uint64_t bit_width = 64;
     int64_t a = 0, b = 0;
@@ -44,7 +36,7 @@ void millionaire(NetIO* io, int party){
     int64_t res = TGPI->reveal(res_x, 1, false);
 
 #if !SEC_SH
-    if (party == BOB) //authenticated garbling allows only evaluator to compute the result
+    if (TGPI->party == BOB) //authenticated garbling allows only evaluator to compute the result
 #endif
         if (res == 1) cout << "BOB is richer" << endl;
         else cout << "ALICE is richer" << endl;
@@ -60,14 +52,14 @@ int main(int argc, char** argv) {
 	int party = 1, port = 1234;
 	string netlist_address;
 	string server_ip;
-	int program;
 
 	po::options_description desc{"Yao's Millionair's Problem \nAllowed options"};
 	desc.add_options()  //
 	("help,h", "produce help message")  //
 	("party,k", po::value<int>(&party)->default_value(1), "party id: 1 for garbler, 2 for evaluator")  //
 	("port,p", po::value<int>(&port)->default_value(1234), "socket port")  //
-	("server_ip,s", po::value<string>(&server_ip)->default_value("127.0.0.1"), "server's IP.");
+	("server_ip,s", po::value<string>(&server_ip)->default_value("127.0.0.1"), "server's IP.")
+	("sh", "semi-honest setting (default is malicious)");
 
 	po::variables_map vm;
 	try {
@@ -86,8 +78,22 @@ int main(int argc, char** argv) {
 
 	NetIO* io = new NetIO(party==ALICE ? nullptr:server_ip.c_str(), port, true);
 	io->set_nodelay();
-
-    millionaire(io, party);
+	
+	TinyGarblePI_SH* TGPI_SH;
+	TinyGarblePI* TGPI; 
+	
+	if (vm.count("sh")){
+		cout << "testing program interface in semi-honest setting" << endl;
+		TGPI_SH = new TinyGarblePI_SH(io, party);
+		io->flush();
+		millionaire(TGPI_SH);		
+	}
+	else {
+		cout << "Millionair's Problem in malicious setting" << endl;
+		TGPI = new TinyGarblePI(io, party, 192, 64);
+		io->flush();
+		millionaire(TGPI);
+	}
 
 	delete io;
 

test/test_TinyGarble.sh.in

@@ -20,7 +20,7 @@ if [ ! -f "$emploc/comp_nbit_ncc_syn.emp.bin" ]; then
 fi
 
 if [ $1 ] && [ $1 = "--pi" ]; then
-	${loc}/TinyGarblePI $2 < test/rand.txt > /dev/null & ${loc}/TinyGarblePI $2 -k 2 < test/rand.txt
+	${loc}/TinyGarblePI "$@" < test/rand.txt > /dev/null & ${loc}/TinyGarblePI "$@" -k 2 < test/rand.txt
 else
 	empfile=comp_nbit_ncc_syn.emp.bin
 	ref=3