with thread id

Author: TingDaoK

include/aws/s3/private/s3_meta_request_impl.h

@@ -12,6 +12,7 @@
 #include <aws/common/mutex.h>
 #include <aws/common/ref_count.h>
 #include <aws/common/task_scheduler.h>
+#include <aws/common/thread.h>
 #include <aws/http/request_response.h>
 
 #include "aws/s3/private/s3_checksums.h"
@@ -129,6 +130,7 @@ struct s3_data_read_metrics {
     uint64_t size;
     uint64_t start_timestamp;
     uint64_t end_timestamp;
+    aws_thread_id_t thread_id;
 };
 
 /**

source/s3_auto_ranged_put.c

@@ -1033,26 +1033,23 @@ struct aws_future_http_message *s_s3_prepare_upload_part(struct aws_s3_request *
             /* write every read metric to a file */
             if (metrics_file) {
                 // Write CSV header
-                fprintf(metrics_file, "index,offset,size,start_timestamp,end_timestamp,duration_ns,throughput_mbps\n");
+                fprintf(metrics_file, "index,offset,size,start_timestamp,duration_ns,threadid\n");
                 // Write all metrics
                 for (size_t j = 0; j < metric_length; j++) {
                     struct s3_data_read_metrics m;
                     aws_array_list_get_at(&meta_request->read_metrics_list, &m, j);
 
                     uint64_t duration = m.end_timestamp - m.start_timestamp;
-                    double throughput_mbps =
-                        duration > 0 ? (double)(m.size * 8) / (duration / 1000.0) / 1000000.0 : 0.0;
 
                     fprintf(
                         metrics_file,
-                        "%zu,%llu,%llu,%llu,%llu,%llu,%.2f\n",
+                        "%zu,%llu,%llu,%llu,%llu,%zu\n",
                         j,
                         (unsigned long long)m.offset,
                         (unsigned long long)m.size,
                         (unsigned long long)m.start_timestamp,
-                        (unsigned long long)m.end_timestamp,
                         (unsigned long long)duration,
-                        throughput_mbps);
+                        (size_t)m.thread_id);
                 }
                 aws_array_list_clear(&meta_request->read_metrics_list);
                 fclose(metrics_file);

source/s3_meta_request.c

@@ -520,25 +520,23 @@ static void s_s3_meta_request_destroy(void *user_data) {
     /* write every read metric to a file */
     if (metrics_file) {
         // Write CSV header
-        fprintf(metrics_file, "index,offset,size,start_timestamp,end_timestamp,duration_ns,throughput_mbps\n");
+        fprintf(metrics_file, "index,offset,size,start_timestamp,duration_ns,threadid\n");
         // Write all metrics
         for (size_t j = 0; j < metric_length; j++) {
             struct s3_data_read_metrics m;
             aws_array_list_get_at(&meta_request->read_metrics_list, &m, j);
 
             uint64_t duration = m.end_timestamp - m.start_timestamp;
-            double throughput_mbps = duration > 0 ? (double)(m.size * 8) / (duration / 1000.0) / 1000000.0 : 0.0;
 
             fprintf(
                 metrics_file,
-                "%zu,%llu,%llu,%llu,%llu,%llu,%.2f\n",
+                "%zu,%llu,%llu,%llu,%llu,%zu\n",
                 j,
                 (unsigned long long)m.offset,
                 (unsigned long long)m.size,
                 (unsigned long long)m.start_timestamp,
-                (unsigned long long)m.end_timestamp,
                 (unsigned long long)duration,
-                throughput_mbps);
+                (size_t)m.thread_id);
         }
         fclose(metrics_file);
 

source/s3_parallel_input_stream.c

@@ -11,6 +11,7 @@
 #include <aws/common/file.h>
 #include <aws/common/string.h>
 #include <aws/common/task_scheduler.h>
+#include <aws/common/thread.h>
 
 #include <aws/io/event_loop.h>
 #include <aws/io/future.h>
@@ -282,6 +283,7 @@ static int s_aws_s3_mmap_part_streaming_input_stream_read(struct aws_input_strea
     /* Map the content */
     size_t read_length = aws_min_size(dest->capacity - dest->len, impl->total_length - impl->total_length_read);
     aws_high_res_clock_get_ticks(&impl->metrics.start_timestamp);
+    impl->metrics.thread_id = aws_thread_current_thread_id();
 
     if (impl->in_chunk_offset == SIZE_MAX) {
         /* The reading buf is invalid. Block until the loading buf is available. */