Merge branch 'metrics_mqtt3' of github.com:awslabs/aws-c-mqtt into metrics_mqtt5

Author: xiazhvera

include/aws/mqtt/client.h

@@ -706,7 +706,7 @@ int aws_mqtt_client_connection_get_stats(
 AWS_MQTT_API
 int aws_mqtt_client_connection_set_metrics(
     struct aws_mqtt_client_connection *connection,
-    const struct aws_mqtt_iot_sdk_metrics *metrics);
+    const struct aws_mqtt_iot_metrics *metrics);
 
 AWS_EXTERN_C_END
 AWS_POP_SANE_WARNING_LEVEL

include/aws/mqtt/mqtt.h

@@ -122,7 +122,7 @@ struct aws_mqtt_metadata_entry {
 /**
  * IoT SDK metrics configuration structure
  */
-struct aws_mqtt_iot_sdk_metrics {
+struct aws_mqtt_iot_metrics {
     /**
      * Library name string (SDK attribute)
      */

include/aws/mqtt/private/client_impl.h

@@ -16,6 +16,7 @@
 
 #include <aws/common/hash_table.h>
 #include <aws/common/mutex.h>
+#include <aws/common/rw_lock.h>
 #include <aws/common/task_scheduler.h>
 
 #include <aws/io/channel.h>
@@ -28,15 +29,19 @@ struct aws_mqtt_client_connection_311_impl;
 
 #define MQTT_CLIENT_CALL_CALLBACK(client_ptr, callback)                                                                \
     do {                                                                                                               \
+        aws_rw_lock_rlock(&(client_ptr)->callback_lock);                                                               \
         if ((client_ptr)->callback) {                                                                                  \
             (client_ptr)->callback((&client_ptr->base), (client_ptr)->callback##_ud);                                  \
         }                                                                                                              \
+        aws_rw_lock_runlock(&(client_ptr)->callback_lock);                                                             \
     } while (false)
 #define MQTT_CLIENT_CALL_CALLBACK_ARGS(client_ptr, callback, ...)                                                      \
     do {                                                                                                               \
+        aws_rw_lock_rlock(&(client_ptr)->callback_lock);                                                               \
         if ((client_ptr)->callback) {                                                                                  \
             (client_ptr)->callback((&client_ptr->base), __VA_ARGS__, (client_ptr)->callback##_ud);                     \
         }                                                                                                              \
+        aws_rw_lock_runlock(&(client_ptr)->callback_lock);                                                             \
     } while (false)
 
 #if ASSERT_LOCK_HELD
@@ -278,6 +283,9 @@ struct aws_mqtt_client_connection_311_impl {
     aws_mqtt_on_operation_statistics_fn *on_any_operation_statistics;
     void *on_any_operation_statistics_ud;
 
+    /* Read-write lock to protect callbacks from being modified during callback execution */
+    struct aws_rw_lock callback_lock;
+
     /* listener callbacks */
     struct aws_mqtt311_callback_set_manager callback_manager;
 
@@ -369,7 +377,7 @@ struct aws_mqtt_client_connection_311_impl {
     /**
      * IoT SDK metrics configuration
      */
-    struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage;
+    struct aws_mqtt_iot_metrics_storage *metrics_storage;
 };
 
 struct aws_channel_handler_vtable *aws_mqtt_get_client_channel_vtable(void);

include/aws/mqtt/private/client_impl_shared.h

@@ -122,7 +122,7 @@ struct aws_mqtt_client_connection_vtable {
 
     int (*get_stats_fn)(void *impl, struct aws_mqtt_connection_operation_statistics *stats);
 
-    int (*set_metrics_fn)(void *impl, const struct aws_mqtt_iot_sdk_metrics *metrics);
+    int (*set_metrics_fn)(void *impl, const struct aws_mqtt_iot_metrics *metrics);
 
     enum aws_mqtt311_impl_type (*get_impl_type)(const void *impl);
 

…/aws/mqtt/private/mqtt_iot_sdk_metrics.h …lude/aws/mqtt/private/mqtt_iot_metrics.hinclude/aws/mqtt/private/mqtt_iot_sdk_metrics.h renamed to include/aws/mqtt/private/mqtt_iot_metrics.h include/aws/mqtt/private/mqtt_iot_sdk_metrics.h renamed to include/aws/mqtt/private/mqtt_iot_metrics.h

@@ -3,29 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-#ifndef AWS_MQTT_IOT_SDK_METRICS_H
-#define AWS_MQTT_IOT_SDK_METRICS_H
+#ifndef AWS_MQTT_IOT_METRICS_H
+#define AWS_MQTT_IOT_METRICS_H
 
 #include <aws/mqtt/mqtt.h>
 
-/* Storage for `aws_mqtt_iot_sdk_metrics`. */
-struct aws_mqtt_iot_sdk_metrics_storage {
+/* Storage for `aws_mqtt_iot_metrics`. */
+struct aws_mqtt_iot_metrics_storage {
     struct aws_allocator *allocator;
 
-    struct aws_mqtt_iot_sdk_metrics storage_view;
-
-    struct aws_array_list metadata_entries;
+    struct aws_mqtt_iot_metrics storage_view;
 
     struct aws_byte_cursor library_name;
 
     struct aws_byte_buf storage;
 };
 
-AWS_MQTT_API struct aws_mqtt_iot_sdk_metrics_storage *aws_mqtt_iot_sdk_metrics_storage_new(
+AWS_MQTT_API struct aws_mqtt_iot_metrics_storage *aws_mqtt_iot_metrics_storage_new(
     struct aws_allocator *allocator,
-    const struct aws_mqtt_iot_sdk_metrics *metrics_options);
+    const struct aws_mqtt_iot_metrics *metrics_options);
 
-AWS_MQTT_API void aws_mqtt_iot_sdk_metrics_storage_destroy(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage);
+AWS_MQTT_API void aws_mqtt_iot_metrics_storage_destroy(struct aws_mqtt_iot_metrics_storage *metrics_storage);
 
 /**
  * Builds a new username by appending SDK metrics to the original username.
@@ -43,17 +41,17 @@ AWS_MQTT_API
 int aws_mqtt_append_sdk_metrics_to_username(
     struct aws_allocator *allocator,
     const struct aws_byte_cursor *original_username,
-    const struct aws_mqtt_iot_sdk_metrics *metrics,
+    const struct aws_mqtt_iot_metrics *metrics,
     struct aws_byte_buf *output_username,
     size_t *out_full_username_size);
 
 /**
- * Validates all string fields in aws_mqtt_iot_sdk_metrics
+ * Validates all string fields in aws_mqtt_iot_metrics
  *
  * @param metrics The metrics structure to validate
  * @return AWS_OP_SUCCESS if metrics is not null and all metrics value are valid, AWS_OP_ERR otherwise
  */
 AWS_MQTT_API
-int aws_mqtt_validate_iot_sdk_metrics(const struct aws_mqtt_iot_sdk_metrics *metrics);
+int aws_mqtt_validate_iot_metrics(const struct aws_mqtt_iot_metrics *metrics);
 
-#endif /* AWS_MQTT_IOT_SDK_METRICS_H */
+#endif /* AWS_MQTT_IOT_METRICS_H */