libflow: add parameter measurement_boundary to end_measurement()

Introduce parameter measurement_boundary to end_measurement(),
pass true in f3write.c and f3read.c since they make measurements
on files (i.e., a file is a measurement boundary), and pass
false for everyone else.

Reaching a boundary forces any leftover processed_blocks and
acc_delay_ns to be committed to the global statistics.
This prevents measurement data from bleeding across boundaries.

Author: AltraMayor

src/f3brew.c

@@ -296,7 +296,7 @@ static void write_blocks(struct device *dev, struct flow *fw,
 		measure(fw, blocks_to_write, NULL);
 		first_pos = next_pos;
 	}
-	end_measurement(fw);
+	end_measurement(fw, false);
 	dbuf_free(&dbuf);
 }
 
@@ -452,7 +452,7 @@ static void read_blocks(struct device *dev, struct flow *fw,
 		measure(fw, blocks_to_read, NULL);
 		first_pos = next_pos;
 	}
-	end_measurement(fw);
+	end_measurement(fw, false);
 	dbuf_free(&dbuf);
 
 	if (range.state != bs_unknown)

src/f3read.c

@@ -291,7 +291,7 @@ static void validate_file(struct flow *fw, struct dynamic_buffer *dbuf,
 			break;
 		}
 	}
-	end_measurement(fw);
+	end_measurement(fw, true);
 	assert(!clock_gettime(CLOCK_MONOTONIC, &file_t2));
 
 	print_status(stats);

src/f3write.c

@@ -259,7 +259,7 @@ static int create_and_fill_file(struct flow *fw, struct dynamic_buffer *dbuf,
 		if (saved_errno != 0)
 			break;
 	}
-	end_measurement(fw);
+	end_measurement(fw, true);
 	assert(!clock_gettime(CLOCK_MONOTONIC, &file_t2));
 	close(fd);
 	free(full_fn);

src/libflow.c

@@ -457,13 +457,19 @@ void measure(struct flow *fw, uint64_t processed_blocks,
 	__start_measurement(fw);
 }
 
-void end_measurement(struct flow *fw)
+void end_measurement(struct flow *fw, bool measurement_boundary)
 {
 	if (fw->processed_blocks > 0) {
-		/* Track progress in between files. */
+		/* Track progress in between measurement boundaries. */
 		struct timespec t2;
 		assert(!clock_gettime(CLOCK_MONOTONIC, &t2));
 		fw->acc_delay_ns += diff_timespec_ns(&fw->t1, &t2);
+		if (measurement_boundary) {
+			fw->measured_blocks += fw->processed_blocks;
+			fw->measured_time_ns += fw->acc_delay_ns;
+			fw->processed_blocks = 0;
+			fw->acc_delay_ns = 0;
+		}
 	}
 	clear_progress(fw); /* Erase progress information. */
 }

src/libflow.h

@@ -120,7 +120,7 @@ void start_measurement(struct flow *fw);
 void measure(struct flow *fw, uint64_t processed_blocks,
 	struct fw_measurement *m);
 void clear_progress(struct flow *fw);
-void end_measurement(struct flow *fw);
+void end_measurement(struct flow *fw, bool measurement_boundary);
 
 void print_avg_seq_speed(const struct flow *fw, const char *speed_type,
 	bool use_sectors);

src/libprobe.c

@@ -79,7 +79,7 @@ static int write_random_blocks(struct device *dev, const uint64_t pos[],
 			return true;
 		measure(&rwi->randw_fw, 1, NULL);
 	}
-	end_measurement(&rwi->randw_fw);
+	end_measurement(&rwi->randw_fw, false);
 	return false;
 }
 
@@ -128,7 +128,7 @@ static int write_blocks(struct device *dev,
 		measure(&rwi->seqw_fw, blocks_to_write, NULL);
 		first_pos = next_pos;
 	}
-	end_measurement(&rwi->seqw_fw);
+	end_measurement(&rwi->seqw_fw, false);
 	return false;
 }
 
@@ -231,11 +231,11 @@ static int find_first_x_block(struct device *dev,
 			/* Found the first x_block. */
 			*pfirst_x_block_idx = i;
 			*pstate = bs;
-			end_measurement(&rwi->randr_fw);
+			end_measurement(&rwi->randr_fw, false);
 			return false;
 		}
 	}
-	end_measurement(&rwi->randr_fw);
+	end_measurement(&rwi->randr_fw, false);
 
 not_found:
 	*pfirst_x_block_idx = n_blocks;