minor changes

duoram-online/duoram.cpp

@@ -204,8 +204,8 @@ int main(const int argc, const char * argv[])
 		boost::asio::write(sockets_[0], boost::asio::buffer(&ri, sizeof(ri)));
 		boost::asio::read(sockets_[0], boost::asio::buffer(&ri_recv, sizeof(ri_recv)));
 		
-	std::cout << "ri = " << ri << std::endl;
- if(party) ri = 2 - ri_recv;
+	 
+  if(party) ri = 2 - ri_recv;
 
 		#ifdef VERBOSE
 			boost::asio::write(sockets_[0], boost::asio::buffer(&ri, sizeof(ri)));
@@ -319,7 +319,9 @@ int main(const int argc, const char * argv[])
 	// WRITES END.
 
   #ifdef ThreeParty
-		std::cout << std::endl << std::endl << "============== WRITES END ==============" << std::endl << std::endl;
+   #ifdef VERBOSE
+		   std::cout << std::endl << std::endl << "============== WRITES END ==============" << std::endl << std::endl;
+   #endif
  	auto start_ind_reads = std::chrono::steady_clock::now();
 		size_t *  WritePb_ind_reads = new size_t[number_of_ind_reads];
 		size_t *  WritePb_ind_reads_recv = new size_t[number_of_ind_reads];
@@ -358,11 +360,14 @@ int main(const int argc, const char * argv[])
  auto end_ind_reads = std::chrono::steady_clock::now();
  std::chrono::duration<double> elapsed_seconds_ind_reads = end_ind_reads - start_ind_reads;
  printf("elapsed_seconds_ind_reads = %f\n",elapsed_seconds_ind_reads.count());
-	std::cout << std::endl << std::endl << "============== INDEPENDENT READS END  ==============" << std::endl << std::endl;
-	auto start_dep_reads = std::chrono::steady_clock::now();
+	#ifdef VERBOSE
+ std::cout << std::endl << std::endl << "============== INDEPENDENT READS END  ==============" << std::endl << std::endl;
+	#endif
+ auto start_dep_reads = std::chrono::steady_clock::now();
 	
- 
+ #ifdef VERBOSE
 	std::cout << std::endl << std::endl << "============== DEPENDENT READS START  ==============" << std::endl << std::endl;
+ #endif
 	DB_t * read_out_dependent_reads = new DB_t[number_of_dep_reads];
 	 
  for(size_t r = 0; r < number_of_dep_reads; ++r)
@@ -374,10 +379,12 @@ int main(const int argc, const char * argv[])
 		  #endif
   }
 		
-	auto end_dep_reads = std::chrono::steady_clock::now();
-	std::chrono::duration<double> elapsed_seconds_dep_reads = end_dep_reads - start_dep_reads;
-	printf("elapsed_seconds_dep_reads = %f\n",elapsed_seconds_dep_reads.count()); 
-	std::cout << std::endl << std::endl << "============== DEPENDENT READS END  ==============" << std::endl << std::endl;
+	 auto end_dep_reads = std::chrono::steady_clock::now();
+	 std::chrono::duration<double> elapsed_seconds_dep_reads = end_dep_reads - start_dep_reads;
+	 printf("elapsed_seconds_dep_reads = %f\n",elapsed_seconds_dep_reads.count()); 
+  #ifdef VERBOSE
+	 std::cout << std::endl << std::endl << "============== DEPENDENT READS END  ==============" << std::endl << std::endl;
+ #endif
 
 	 
  #endif

duoram-online/readvectors.h

@@ -5,12 +5,12 @@ void concatanate_index(char const * filename, char tmp[100], size_t index)
 }
 
 
-int read_final_correction_word(bool party, DB_t& FCW_read)
+int read_final_correction_word(bool party, DB_t& FCW_read, int i = 0)
 {
   if(!party)
 		{
    char tmp[100];
-   concatanate_index("preprocflags/FCW0", tmp, 0);
+   concatanate_index("preprocflags/FCW0", tmp, i);
 			int const in0 { open(tmp, O_RDONLY ) };
 	 	size_t r = read(in0, &FCW_read,   sizeof(FCW_read));	
    if(r < 0) perror("Read error");
@@ -19,7 +19,7 @@ int read_final_correction_word(bool party, DB_t& FCW_read)
   if(party)
 		{
    char tmp[100];
-   concatanate_index("preprocflags/FCW1", tmp, 0);
+   concatanate_index("preprocflags/FCW1", tmp, i);
 		 int const in0 { open(tmp, O_RDONLY ) };
 	 	size_t r = read(in0, &FCW_read,   sizeof(FCW_read));	
  		if(r < 0) perror("Read error");
@@ -28,22 +28,22 @@ int read_final_correction_word(bool party, DB_t& FCW_read)
   return 0;
 }
 
-int read_flags_for_reading(bool party, size_t db_nitems)
+int read_flags_for_reading(bool party, size_t db_nitems, int i = 0)
 {
 	if(!party)
 	{
    char tmp[100];
-   concatanate_index("preprocflags/party0_read_flags_b", tmp, 0);
+   concatanate_index("preprocflags/party0_read_flags_b", tmp, i);
 	 	int const in0 { open(tmp, O_RDONLY ) };
 	 	size_t r = read(in0, reading_b,  db_nitems * sizeof(reading_b[0]));	
    if(r < 0) perror("Read error");
   
-   concatanate_index("preprocflags/party0_read_flags_c", tmp, 0);
+   concatanate_index("preprocflags/party0_read_flags_c", tmp, i);
    int const in1 { open( tmp, O_RDONLY ) };
 	 	r = read(in1, reading_c,  db_nitems * sizeof(reading_c[0]));
    if(r < 0) perror("Read error");
 
-   concatanate_index("preprocflags/party0_read_flags_d", tmp, 0);
+   concatanate_index("preprocflags/party0_read_flags_d", tmp, i);
 	  int const in2 { open( tmp, O_RDONLY ) };
 	  r = read(in2, reading_d,  db_nitems * sizeof(reading_d[0]));	
    if(r < 0) perror("Read error");
@@ -53,17 +53,17 @@ int read_flags_for_reading(bool party, size_t db_nitems)
 	{
    char tmp[100];
   
-   concatanate_index("preprocflags/party1_read_flags_b", tmp, 0);
+   concatanate_index("preprocflags/party1_read_flags_b", tmp, i);
 		 int const in0 { open(tmp, O_RDONLY ) };
 	 	size_t r = read(in0, reading_b,  db_nitems * sizeof(reading_b[0]));	
 	 	if(r < 0) perror("Read error");
 
-   concatanate_index("preprocflags/party1_read_flags_c", tmp, 0);
+   concatanate_index("preprocflags/party1_read_flags_c", tmp, i);
  	 int const in1 { open(tmp, O_RDONLY ) };
 		 r = read(in1, reading_c,  db_nitems * sizeof(reading_c[0]));
 		 if(r < 0) perror("Read error");
     
-   concatanate_index("preprocflags/party1_read_flags_d", tmp, 0);
+   concatanate_index("preprocflags/party1_read_flags_d", tmp, i);
 		 int const in2 { open(tmp, O_RDONLY ) };
 		 r = read(in2, reading_d,  db_nitems * sizeof(reading_d[0]));	
    if(r < 0) perror("Read error");
@@ -73,22 +73,22 @@ int read_flags_for_reading(bool party, size_t db_nitems)
 	return 0;	
 }
 
-int read_flags_for_writing(bool party, size_t db_nitems)
+int read_flags_for_writing(bool party, size_t db_nitems, int i = 0)
 {
 	if(!party)
 	{
     char tmp[100];
-    concatanate_index("preprocflags/party0_write_flags_b", tmp, 0);
+    concatanate_index("preprocflags/party0_write_flags_b", tmp, i);
 	   int const in0_w { open(tmp, O_RDONLY ) };
     size_t r = read(in0_w, writing_b,  db_nitems * sizeof(writing_b[0]));	
     if(r < 0) perror("Read error");
 
-    concatanate_index("preprocflags/party0_write_flags_c", tmp, 0);	   
+    concatanate_index("preprocflags/party0_write_flags_c", tmp,i);	   
 	   int const in1_w { open( tmp, O_RDONLY ) };
     r = read(in1_w, writing_c,  db_nitems * sizeof(writing_c[0]));
     if(r < 0) perror("Read error");
 	
-    concatanate_index("preprocflags/party0_write_flags_d", tmp, 0);
+    concatanate_index("preprocflags/party0_write_flags_d", tmp,i);
 	   int const in2_w { open( tmp, O_RDONLY ) };
    	r = read(in2_w, writing_d,  db_nitems * sizeof(writing_d[0]));	
     if(r < 0) perror("Read error");
@@ -97,17 +97,17 @@ int read_flags_for_writing(bool party, size_t db_nitems)
 	if(party)
 	{
    char tmp[100];
-   concatanate_index("preprocflags/party1_write_flags_b", tmp, 0);
+   concatanate_index("preprocflags/party1_write_flags_b", tmp,i);
  		int const in0_w { open( tmp, O_RDONLY ) };
 	 	size_t r = read(in0_w, writing_b,  db_nitems * sizeof(writing_b[0]));	
 	 	if(r < 0) perror("Read error");
 
-   concatanate_index("preprocflags/party1_write_flags_c", tmp, 0);
+   concatanate_index("preprocflags/party1_write_flags_c", tmp, i);
    int const in1_w { open(tmp, O_RDONLY ) };
 		 r = read(in1_w, writing_c,  db_nitems * sizeof(writing_c[0]));
    if(r < 0) perror("Read error");
 
-		 concatanate_index("preprocflags/party1_write_flags_d", tmp, 0);
+		 concatanate_index("preprocflags/party1_write_flags_d", tmp, i);
 		 int const in2_w { open( tmp, O_RDONLY ) };
 		 r = read(in2_w, writing_d,  db_nitems * sizeof(writing_d[0]));	
 	  if(r < 0) perror("Read error");
@@ -116,25 +116,25 @@ int read_flags_for_writing(bool party, size_t db_nitems)
 	 return 0;	
 }
 
- int read_flags_for_refreshing(size_t db_nitems)
+ int read_flags_for_refreshing(size_t db_nitems, int i = 0)
  {
    char tmp[100];
-   concatanate_index("preprocflags/P2_party0_write_flags_c", tmp, 0);
+   concatanate_index("preprocflags/P2_party0_write_flags_c", tmp, i);
    int const in1_w { open(tmp, O_RDONLY ) };
    size_t r = read(in1_w, writing_c,  db_nitems * sizeof(writing_c[0]));
    if(r < 0) perror("Read error");
    
-   concatanate_index("preprocflags/P2_party1_write_flags_d", tmp, 0);
+   concatanate_index("preprocflags/P2_party1_write_flags_d", tmp, i);
    int const in2_w { open(tmp, O_RDONLY ) };
    r = read(in2_w, writing_d,  db_nitems * sizeof(writing_d[0])); 
    if(r < 0) perror("Read error");
 
-   concatanate_index("preprocflags/P2_party0_write_c", tmp, 0);
+   concatanate_index("preprocflags/P2_party0_write_c", tmp, i);
    int const in1_w_ { open(tmp, O_RDONLY ) };
    r = read(in1_w_, c,  db_nitems * sizeof(c[0]));
    if(r < 0) perror("Read error");
    
-   concatanate_index("preprocflags/P2_party1_write_d", tmp, 0);
+   concatanate_index("preprocflags/P2_party1_write_d", tmp, i);
    int const in2_w_ { open(tmp, O_RDONLY ) };
    r = read(in2_w_, d,  db_nitems * sizeof(d[0]));  
    if(r < 0) perror("Read error");
@@ -142,15 +142,15 @@ int read_flags_for_writing(bool party, size_t db_nitems)
    return 0;
  }
 
-int read_flags_for_generating_cancellation_terms(size_t db_nitems)
+int read_flags_for_generating_cancellation_terms(size_t db_nitems, int i = 0)
 {
     char tmp[100];
-    concatanate_index("preprocflags/P2_party1_read_flags_d", tmp, 0);
+    concatanate_index("preprocflags/P2_party1_read_flags_d", tmp, i);
     int const in2 { open(tmp, O_RDONLY ) };
     size_t r = read(in2, reading_d,  db_nitems * sizeof(reading_d[0])); 
     if(r < 0) perror("Read error");
 
-    concatanate_index("preprocflags/P2_party0_read_flags_c", tmp, 0);
+    concatanate_index("preprocflags/P2_party0_read_flags_c", tmp, i);
     int const in2_ { open(tmp, O_RDONLY ) };
     r = read(in2_, reading_c,  db_nitems * sizeof(reading_c[0])); 
     if(r < 0) perror("Read error");
@@ -159,34 +159,41 @@ int read_flags_for_generating_cancellation_terms(size_t db_nitems)
 }
 
 
-int read_flags_for_updating(bool party, size_t db_nitems)
+int read_flags_for_updating(bool party, size_t db_nitems, int i = 0)
 {
+  char tmp[100];
 	if(!party)
 	{
-		 int const in0_w_ { open( "preprocflags/party0_write_b0", O_RDONLY ) };
-		 size_t r = read(in0_w_, b,  db_nitems * sizeof(b[0]));	
+    concatanate_index("preprocflags/party0_write_b", tmp, i);
+		int const in0_w_ { open(tmp, O_RDONLY ) };
+		size_t r = read(in0_w_, b,  db_nitems * sizeof(b[0]));	
 	  if(r < 0) perror("Read error");
  	
-   int const in1_w_ { open( "preprocflags/party0_write_c0", O_RDONLY ) };
-		 r = read(in1_w_, c,  db_nitems * sizeof(c[0]));
-   if(r < 0) perror("Read error");
-		 
-   int const in2_w_ { open( "preprocflags/party0_write_d0", O_RDONLY ) };
-		 r = read(in2_w_, d,  db_nitems * sizeof(d[0]));	
+    concatanate_index("preprocflags/party0_write_c", tmp, i);
+    int const in1_w_ { open(tmp, O_RDONLY ) };
+		r = read(in1_w_, c,  db_nitems * sizeof(c[0]));
+    if(r < 0) perror("Read error");
+
+    concatanate_index("preprocflags/party0_write_d", tmp, i); 
+   int const in2_w_ { open(tmp, O_RDONLY ) };
+	 r = read(in2_w_, d,  db_nitems * sizeof(d[0]));	
    if(r < 0) perror("Read error");
 	}
 
 	if(party)
 	{
- 	int const in0_w_ { open( "preprocflags/party1_write_b0", O_RDONLY ) };
+     concatanate_index("preprocflags/party1_write_b", tmp, i);
+ 	int const in0_w_ { open( tmp, O_RDONLY ) };
 	 size_t r = read(in0_w_, b,  db_nitems * sizeof(b[0]));	
   if(r < 0) perror("Read error");
  	
-  int const in1_w_ { open( "preprocflags/party1_write_c0", O_RDONLY ) };
+  concatanate_index("preprocflags/party1_write_c", tmp, i);
+  int const in1_w_ { open(tmp, O_RDONLY ) };
 		r = read(in1_w_, c,  db_nitems * sizeof(c[0]));
   if(r < 0) perror("Read error");
-		
-  int const in2_w_ { open( "preprocflags/party1_write_d0", O_RDONLY ) };
+
+  concatanate_index("preprocflags/party1_write_d", tmp, i); 	
+  int const in2_w_ { open(tmp, O_RDONLY ) };
 		 r = read(in2_w_, d,  db_nitems * sizeof(d[0]));	
   if(r < 0) perror("Read error");
 	}