ckdb - show reload lines per second for each individual file

src/ckdb.c

@@ -6267,7 +6267,7 @@ static bool reload_from(tv_t *start, const tv_t *finish)
 	bool finished = false, ret = true, ok, apipe = false;
 	char *filename = NULL;
 	uint64_t count, total;
-	tv_t now, begin;
+	tv_t now, begin, file_begin;
 	double diff;
 	FILE *fp = NULL;
 	int file_N_limit;
@@ -6296,6 +6296,7 @@ static bool reload_from(tv_t *start, const tv_t *finish)
 
 	setnow(&now);
 	copy_tv(&begin, &now);
+	copy_tv(&file_begin, &now);
 	tvs_to_buf(&now, run, sizeof(run));
 	snprintf(reload_buf, MAX_READ, "reload.%s.s0", run);
 	LOGQUE(reload_buf, true);
@@ -6348,10 +6349,15 @@ static bool reload_from(tv_t *start, const tv_t *finish)
 			}
 		}
 
-		LOGWARNING("%s(): %sread %"PRIu64" line%s from %s",
+		setnow(&now);
+		diff = tvdiff(&now, &file_begin);
+		if (diff == 0)
+			diff = 1;
+
+		LOGWARNING("%s(): %sread %"PRIu64" line%s %.2f/s from %s",
 			   __func__,
 			   everyone_die ? "Terminate, aborting - " : "",
-			   count, count == 1 ? "" : "s",
+			   count, count == 1 ? "" : "s", (count / diff),
 			   filename);
 		total += count;
 		if (apipe) {
@@ -6404,8 +6410,10 @@ static bool reload_from(tv_t *start, const tv_t *finish)
 				}
 				filename = hour_filename(restorefrom, restorename, reload_timestamp.tv_sec);
 				ok = logopen(&filename, &fp, &apipe);
-				if (ok)
+				if (ok) {
+					setnow(&file_begin);
 					break;
+				}
 				errno = 0;
 				if (missing_count++ > 1)
 					free(missinglast);

src/ckdb.h

@@ -55,7 +55,7 @@
 
 #define DB_VLOCK "1"
 #define DB_VERSION "1.0.7"
-#define CKDB_VERSION DB_VERSION"-2.303"
+#define CKDB_VERSION DB_VERSION"-2.304"
 
 #define WHERE_FFL " - from %s %s() line %d"
 #define WHERE_FFL_HERE __FILE__, __func__, __LINE__