add a request ptr

Author: TingDaoK

include/aws/s3/private/s3_meta_request_impl.h

@@ -131,6 +131,8 @@ struct s3_data_read_metrics {
     uint64_t start_timestamp;
     uint64_t end_timestamp;
     aws_thread_id_t thread_id;
+    /* The pointer to the connection that request was made from */
+    void *request_ptr;
 };
 
 /**

include/aws/s3/private/s3_request.h

@@ -100,6 +100,7 @@ struct aws_s3_request_metrics {
         struct aws_string *ip_address;
         /* The pointer to the connection that request was made from */
         void *connection_id;
+        void *request_ptr;
         /* The aws_thread_id_t to the thread that request ran on */
         aws_thread_id_t thread_id;
         /* The stream-id, which is the idex when the stream was activated. */

include/aws/s3/s3_client.h

@@ -1481,6 +1481,11 @@ int aws_s3_request_metrics_get_body_read_total_without_reset_ns(
 AWS_S3_API
 int aws_s3_request_metrics_get_error_code(const struct aws_s3_request_metrics *metrics);
 
+/* Get the request pointer from request metrics. AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE will be raised if data not
+ * available */
+AWS_S3_API
+int aws_s3_request_metrics_get_request_ptr(const struct aws_s3_request_metrics *metrics, void **out_request_ptr);
+
 AWS_EXTERN_C_END
 AWS_POP_SANE_WARNING_LEVEL
 

source/s3_auto_ranged_put.c

@@ -1042,7 +1042,7 @@ 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,duration_ns,threadid\n");
+                fprintf(metrics_file, "index,offset,size,start_timestamp,duration_ns,threadid,requestptr\n");
                 // Write all metrics
                 for (size_t j = 0; j < metric_length; j++) {
                     struct s3_data_read_metrics m;
@@ -1052,13 +1052,14 @@ struct aws_future_http_message *s_s3_prepare_upload_part(struct aws_s3_request *
 
                     fprintf(
                         metrics_file,
-                        "%zu,%llu,%llu,%llu,%llu,%zu\n",
+                        "%zu,%llu,%llu,%llu,%llu,%zu,%p\n",
                         j,
                         (unsigned long long)m.offset,
                         (unsigned long long)m.size,
                         (unsigned long long)m.start_timestamp,
                         (unsigned long long)duration,
-                        (size_t)m.thread_id);
+                        (size_t)m.thread_id,
+                        m.request_ptr);
                 }
                 aws_array_list_clear(&meta_request->read_metrics_list);
                 fclose(metrics_file);

source/s3_meta_request.c

@@ -521,7 +521,7 @@ 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,duration_ns,threadid\n");
+        fprintf(metrics_file, "index,offset,size,start_timestamp,duration_ns,threadid,requestptr\n");
         // Write all metrics
         for (size_t j = 0; j < metric_length; j++) {
             struct s3_data_read_metrics m;
@@ -531,13 +531,14 @@ static void s_s3_meta_request_destroy(void *user_data) {
 
             fprintf(
                 metrics_file,
-                "%zu,%llu,%llu,%llu,%llu,%zu\n",
+                "%zu,%llu,%llu,%llu,%llu,%zu,%p\n",
                 j,
                 (unsigned long long)m.offset,
                 (unsigned long long)m.size,
                 (unsigned long long)m.start_timestamp,
                 (unsigned long long)duration,
-                (size_t)m.thread_id);
+                (size_t)m.thread_id,
+                m.request_ptr);
         }
         fclose(metrics_file);
 

source/s3_parallel_input_stream.c

@@ -327,6 +327,7 @@ static int s_aws_s3_mmap_part_streaming_input_stream_read(struct aws_input_strea
     read_length = aws_min_size(read_length, impl->reading_chunk_buf->len - impl->in_chunk_offset);
     impl->metrics.offset = impl->offset + impl->total_length_read;
     impl->metrics.size = read_length;
+    impl->metrics.request_ptr = impl->request;
 
     struct aws_byte_cursor chunk_cursor = aws_byte_cursor_from_buf(impl->reading_chunk_buf);
     aws_byte_cursor_advance(&chunk_cursor, impl->in_chunk_offset);

source/s3_request.c

@@ -181,6 +181,9 @@ struct aws_s3_request_metrics *aws_s3_request_metrics_new(
     metrics->req_resp_info_metrics.request_type = request->request_type;
     metrics->req_resp_info_metrics.operation_name = aws_string_new_from_string(allocator, request->operation_name);
 
+    /* Set the request pointer */
+    metrics->crt_info_metrics.request_ptr = (void *)request;
+
     metrics->time_metrics.start_timestamp_ns = -1;
     metrics->time_metrics.end_timestamp_ns = -1;
     metrics->time_metrics.total_duration_ns = -1;
@@ -462,3 +465,13 @@ int aws_s3_request_metrics_get_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;
 }
+
+int aws_s3_request_metrics_get_request_ptr(const struct aws_s3_request_metrics *metrics, void **out_request_ptr) {
+    AWS_PRECONDITION(metrics);
+    AWS_PRECONDITION(out_request_ptr);
+    if (metrics->crt_info_metrics.request_ptr == NULL) {
+        return aws_raise_error(AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE);
+    }
+    *out_request_ptr = metrics->crt_info_metrics.request_ptr;
+    return AWS_OP_SUCCESS;
+}