xfr: improve xfr message size logging

src/knot/nameserver/axfr.c

@@ -234,9 +234,10 @@ int axfr_query_process(knot_pkt_t *pkt, struct query_data *qdata)
 		return NS_PROC_FULL; /* Check for more. */
 	case KNOT_EOK:    /* Last response. */
 		gettimeofday(&now, NULL);
-		AXFROUT_LOG(LOG_INFO, "Finished in %.02fs (%u messages, ~%.01f"
-		           "kB).", time_diff(&axfr->proc.tstamp, &now) / 1000.0,
-		           axfr->proc.npkts, axfr->proc.nbytes / 1024.0);
+		AXFROUT_LOG(LOG_INFO, "Finished in %.02fs (%u messages, "
+		            "%s%.*f %s).",
+		            time_diff(&axfr->proc.tstamp, &now) / 1000.0,
+		            axfr->proc.npkts, SIZE_PARAMS(axfr->proc.nbytes));
 		return NS_PROC_DONE;
 		break;
 	default:          /* Generic error. */
@@ -315,9 +316,9 @@ static int axfr_answer_finalize(struct answer_data *adata)
 	           zone_contents_serial(old_contents),
 	           zone_contents_serial(proc->contents));
 
-	AXFRIN_LOG(LOG_INFO, "Finished in %.02fs (%u messages, ~%.01fkB).",
-	         time_diff(&proc->tstamp, &now) / 1000.0,
-	         proc->npkts, proc->nbytes / 1024.0);
+	AXFRIN_LOG(LOG_INFO, "Finished in %.02fs (%u messages, %s%.*f %s).",
+	           time_diff(&proc->tstamp, &now) / 1000.0,
+	           proc->npkts, SIZE_PARAMS(proc->nbytes));
 
 	/* Do not free new contents with cleanup. */
 	zone_contents_deep_free(&old_contents);

src/knot/nameserver/axfr.h

@@ -32,6 +32,12 @@
 struct query_data;
 struct answer_data;
 
+/*! \brief This macro helps with data size formatting during xfr logging. */
+#define SIZE_PARAMS(value) (value) < 1024 ? "" : "~", \
+                           (value) < 1024 ? 0 : 1, \
+                           (value) < 1024 ? (float)(value) : (value) / 1024.0, \
+                           (value) < 1024 ? "B" : "KiB"
+
 /*! \brief Generic transfer processing state. */
 struct xfr_proc {
 	list_t nodes;    /* Items to process (ptrnode_t). */

src/knot/nameserver/ixfr.c

@@ -344,9 +344,9 @@ static int ixfrin_finalize(struct answer_data *adata)
 
 	struct timeval now = {0};
 	gettimeofday(&now, NULL);
-	IXFRIN_LOG(LOG_INFO, "Finished in %.02fs (%u messages, ~%.01fkB).",
+	IXFRIN_LOG(LOG_INFO, "Finished in %.02fs (%u messages, %s%.*f %s).",
 	           time_diff(&ixfr->proc.tstamp, &now) / 1000.0,
-	           ixfr->proc.npkts, ixfr->proc.nbytes / 1024.0);
+	           ixfr->proc.npkts, SIZE_PARAMS(ixfr->proc.nbytes));
 
 	return KNOT_EOK;
 }
@@ -612,9 +612,10 @@ int ixfr_query(knot_pkt_t *pkt, struct query_data *qdata)
 		return NS_PROC_FULL; /* Check for more. */
 	case KNOT_EOK:    /* Last response. */
 		gettimeofday(&now, NULL);
-		IXFROUT_LOG(LOG_INFO, "Finished in %.02fs (%u messages, ~%.01fkB).",
+		IXFROUT_LOG(LOG_INFO, "Finished in %.02fs (%u messages, "
+		            "%s%.*f %s).",
 		            time_diff(&ixfr->proc.tstamp, &now) / 1000.0,
-		            ixfr->proc.npkts, ixfr->proc.nbytes / 1024.0);
+		            ixfr->proc.npkts, SIZE_PARAMS(ixfr->proc.nbytes));
 		ret = NS_PROC_DONE;
 		break;
 	default:          /* Generic error. */