more and with reset

Author: TingDaoK

include/aws/s3/private/s3_request.h

@@ -74,6 +74,7 @@ struct aws_s3_request_metrics {
         int64_t body_read_start_timestamp_ns;
         int64_t body_read_end_timestamp_ns;
         int64_t body_read_duration_ns;
+        int64_t body_read_total_without_reset_ns;
         int64_t body_read_total_ns;
     } time_metrics;
 

include/aws/s3/s3_client.h

@@ -1474,7 +1474,9 @@ int aws_s3_request_metrics_get_body_read_duration_ns(
 int aws_s3_request_metrics_get_body_read_total_ns(
     const struct aws_s3_request_metrics *metrics,
     int64_t *body_read_total_ns);
-
+int aws_s3_request_metrics_get_body_read_total_without_reset_ns(
+    const struct aws_s3_request_metrics *metrics,
+    int64_t *body_read_total_without_reset_ns);
 /* Get the AWS CRT error code from request metrics. */
 AWS_S3_API
 int aws_s3_request_metrics_get_error_code(const struct aws_s3_request_metrics *metrics);

source/s3_parallel_input_stream.c

@@ -345,6 +345,11 @@ static int s_aws_s3_mmap_part_streaming_input_stream_read(struct aws_input_strea
     } else {
         impl->request->send_data.metrics->time_metrics.body_read_total_ns += duration;
     }
+    if (impl->request->send_data.metrics->time_metrics.body_read_total_without_reset_ns == -1) {
+        impl->request->send_data.metrics->time_metrics.body_read_total_without_reset_ns = duration;
+    } else {
+        impl->request->send_data.metrics->time_metrics.body_read_total_without_reset_ns += duration;
+    }
     aws_s3_meta_request_unlock_synced_data(impl->meta_request);
     /* END CRITICAL SECTION */
     if (impl->in_chunk_offset == impl->reading_chunk_buf->len) {
@@ -457,6 +462,9 @@ struct aws_input_stream *aws_input_stream_new_from_parallel_stream(
     impl->reading_chunk_buf = &impl->chunk_buf_2;
     impl->meta_request = meta_request;
     impl->request = request;
+    if (impl->request->send_data.metrics && impl->request->send_data.metrics->time_metrics.body_read_total_ns != -1) {
+        impl->request->send_data.metrics->time_metrics.body_read_total_ns = -1;
+    }
 
     /* Reset the input stream to start */
     aws_streaming_input_stream_reset(&impl->base);

source/s3_request.c

@@ -435,19 +435,30 @@ int aws_s3_request_metrics_get_body_read_start_timestamp_ns(
     const struct aws_s3_request_metrics *metrics,
     int64_t *body_read_start_timestamp_ns) {
     *body_read_start_timestamp_ns = metrics->time_metrics.body_read_start_timestamp_ns;
+    return AWS_OP_SUCCESS;
 }
 int aws_s3_request_metrics_get_body_read_end_timestamp_ns(
     const struct aws_s3_request_metrics *metrics,
     int64_t *body_read_end_timestamp_ns) {
     *body_read_end_timestamp_ns = metrics->time_metrics.body_read_end_timestamp_ns;
+    return AWS_OP_SUCCESS;
 }
 int aws_s3_request_metrics_get_body_read_duration_ns(
     const struct aws_s3_request_metrics *metrics,
     int64_t *body_read_duration_ns) {
     *body_read_duration_ns = metrics->time_metrics.body_read_duration_ns;
+    return AWS_OP_SUCCESS;
 }
 int aws_s3_request_metrics_get_body_read_total_ns(
     const struct aws_s3_request_metrics *metrics,
     int64_t *body_read_total_ns) {
     *body_read_total_ns = metrics->time_metrics.body_read_total_ns;
+    return AWS_OP_SUCCESS;
+}
+
+int aws_s3_request_metrics_get_body_read_total_without_reset_ns(
+    const struct aws_s3_request_metrics *metrics,
+    int64_t *body_read_total_without_reset_ns) {
+    *body_read_total_without_reset_ns = metrics->time_metrics.body_read_total_without_reset_ns;
+    return AWS_OP_SUCCESS;
 }