Skip to content

Commit 0506aa6

Browse files
author
Krish
committed
lint changes
1 parent 54591b1 commit 0506aa6

File tree

3 files changed

+26
-29
lines changed

3 files changed

+26
-29
lines changed

source/s3_auto_ranged_get.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,10 +967,11 @@ static void s_s3_auto_ranged_get_request_finished(
967967
object_range_start,
968968
object_range_end);
969969
}
970-
970+
971971
/* Calculate weight for download: weight = object_size / (part_size * part_size) */
972972
if (object_size > 0 && meta_request->part_size > 0) {
973-
meta_request->weight = (double)object_size / ((double)meta_request->part_size * (double)meta_request->part_size);
973+
meta_request->weight =
974+
(double)object_size / ((double)meta_request->part_size * (double)meta_request->part_size);
974975
/* Add this meta request's weight to client's total weight */
975976
aws_atomic_fetch_add(&meta_request->client->stats.total_weight, (size_t)meta_request->weight);
976977
}

source/s3_client.c

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static uint32_t s_get_dynamic_max_active_connections(struct aws_s3_client *clien
232232

233233
/* Load sum of all meta request requirements */
234234
size_t total_size = aws_atomic_load_int(&client->stats.total_required_connections);
235-
235+
236236
/* Overflow protection: Cap at uint32_t max if sum exceeds it */
237237
uint32_t total;
238238
if (total_size > UINT32_MAX) {
@@ -262,7 +262,7 @@ static uint32_t s_get_dynamic_max_active_connections(struct aws_s3_client *clien
262262

263263
/* Apply system FD limit (checked dynamically) */
264264
uint32_t system_fd_limit = s_get_system_fd_limit();
265-
265+
266266
/* Additional overflow protection: if system limit is 0 (getrlimit failed) */
267267
if (system_fd_limit == 0) {
268268
AWS_LOGF_WARN(
@@ -271,7 +271,7 @@ static uint32_t s_get_dynamic_max_active_connections(struct aws_s3_client *clien
271271
(void *)client,
272272
system_fd_limit);
273273
}
274-
274+
275275
new_max = aws_min_u32(new_max, system_fd_limit);
276276

277277
/* Apply hysteresis to prevent rapid changes */
@@ -331,7 +331,7 @@ uint32_t aws_s3_client_get_max_active_connections(
331331
if (meta_request) {
332332
if (meta_request->max_active_connections_override) {
333333
/* Apply the meta request level override the max active connections, but less than the client side settings.
334-
*/
334+
*/
335335
max_active_connections = aws_min_u32(meta_request->max_active_connections_override, max_active_connections);
336336
}
337337
if (meta_request->fio_opts.should_stream && meta_request->fio_opts.disk_throughput_gbps > 0) {
@@ -1939,10 +1939,10 @@ static void s_s3_client_process_work_default(struct aws_s3_client *client) {
19391939
uint32_t total_approx_requests = num_requests_network_io + num_requests_stream_queued_waiting +
19401940
num_requests_streaming_response + num_requests_being_prepared +
19411941
client->threaded_data.request_queue_size;
1942-
1942+
19431943
/* Load required connections from atomic counter for logging */
19441944
uint32_t required_connections = (uint32_t)aws_atomic_load_int(&client->stats.total_required_connections);
1945-
1945+
19461946
AWS_LOGF(
19471947
s_log_level_client_stats,
19481948
AWS_LS_S3_CLIENT_STATS,
@@ -2239,8 +2239,7 @@ void aws_s3_client_update_meta_requests_threaded(struct aws_s3_client *client) {
22392239
*/
22402240
while (!aws_linked_list_empty(&client->threaded_data.meta_requests)) {
22412241

2242-
struct aws_linked_list_node *meta_request_node =
2243-
aws_linked_list_begin(&client->threaded_data.meta_requests);
2242+
struct aws_linked_list_node *meta_request_node = aws_linked_list_begin(&client->threaded_data.meta_requests);
22442243
struct aws_s3_meta_request *meta_request =
22452244
AWS_CONTAINER_OF(meta_request_node, struct aws_s3_meta_request, client_process_work_threaded_data);
22462245

@@ -2278,8 +2277,7 @@ void aws_s3_client_update_meta_requests_threaded(struct aws_s3_client *client) {
22782277
++client->threaded_data.num_requests_being_prepared;
22792278
++meta_request->client_process_work_threaded_data.num_request_being_prepared;
22802279

2281-
num_requests_in_flight =
2282-
(uint32_t)aws_atomic_fetch_add(&client->stats.num_requests_in_flight, 1) + 1;
2280+
num_requests_in_flight = (uint32_t)aws_atomic_fetch_add(&client->stats.num_requests_in_flight, 1) + 1;
22832281

22842282
/**
22852283
* When upload with streaming, the prepare stage will not read into buffer.
@@ -2293,8 +2291,7 @@ void aws_s3_client_update_meta_requests_threaded(struct aws_s3_client *client) {
22932291
aws_atomic_fetch_add(&client->stats.num_requests_streaming_request_body, 1);
22942292
}
22952293

2296-
s_acquire_mem_and_prepare_request(
2297-
client, request, s_s3_client_prepare_callback_queue_request, client);
2294+
s_acquire_mem_and_prepare_request(client, request, s_s3_client_prepare_callback_queue_request, client);
22982295
}
22992296
} else {
23002297
s_s3_client_remove_meta_request_threaded(client, meta_request);
@@ -2397,19 +2394,20 @@ void aws_s3_client_update_connections_threaded(struct aws_s3_client *client) {
23972394
/* Calculate allowed connections for this meta request based on weight ratio */
23982395
bool should_allocate_connection = false;
23992396
uint32_t current_connections = (uint32_t)aws_atomic_load_int(&meta_request->num_requests_network);
2400-
2397+
24012398
if (meta_request->weight > 0.0) {
24022399
size_t total_weight = aws_atomic_load_int(&client->stats.total_weight);
24032400
if (total_weight > 0) {
24042401
/* Calculate: (meta_request->weight / client->total_weight) * 300 */
24052402
double weight_ratio = meta_request->weight / (double)total_weight;
24062403
uint32_t allowed_connections = (uint32_t)(weight_ratio * client_max_active_connections);
2407-
2404+
24082405
/* Apply max_active_connections_override if set */
24092406
if (meta_request->max_active_connections_override > 0) {
2410-
allowed_connections = aws_min_u32(allowed_connections, meta_request->max_active_connections_override);
2407+
allowed_connections =
2408+
aws_min_u32(allowed_connections, meta_request->max_active_connections_override);
24112409
}
2412-
2410+
24132411
should_allocate_connection = (current_connections < allowed_connections);
24142412
} else {
24152413
/* No total weight yet, allow allocation */
@@ -2419,7 +2417,7 @@ void aws_s3_client_update_connections_threaded(struct aws_s3_client *client) {
24192417
/* No weight calculated yet (e.g., download before discovery), allow allocation */
24202418
should_allocate_connection = true;
24212419
}
2422-
2420+
24232421
if (should_allocate_connection) {
24242422
s_s3_client_create_connection_for_request(client, request);
24252423
} else {

source/s3_meta_request.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,21 +160,18 @@ static void s_validate_meta_request_checksum_on_finish(
160160
/**
161161
* Calculate the number of connections required for a meta request to achieve target throughput.
162162
* This is used for dynamic connection scaling.
163-
*
163+
*
164164
* Currently calculates based on: target_throughput / throughput_per_connection
165165
* Uses different throughput constants for S3 vs S3 Express.
166166
* TODO: Consider payload size, number of parts, and part size for more accurate calculation.
167167
*/
168-
uint32_t s_calculate_meta_request_connections(
169-
struct aws_s3_client *client,
170-
struct aws_s3_meta_request *meta_request) {
168+
uint32_t s_calculate_meta_request_connections(struct aws_s3_client *client, struct aws_s3_meta_request *meta_request) {
171169
AWS_PRECONDITION(client);
172170
AWS_PRECONDITION(meta_request);
173171

174172
/* Select appropriate throughput per connection based on S3 Express vs regular S3 */
175-
double throughput_per_connection = meta_request->is_express
176-
? g_s3express_throughput_per_connection_gbps
177-
: g_s3_throughput_per_connection_gbps;
173+
double throughput_per_connection =
174+
meta_request->is_express ? g_s3express_throughput_per_connection_gbps : g_s3_throughput_per_connection_gbps;
178175

179176
/* Calculate connections needed: target_throughput / throughput_per_connection */
180177
double ideal_connections = client->throughput_target_gbps / throughput_per_connection;
@@ -620,12 +617,13 @@ static void s_s3_meta_request_destroy(void *user_data) {
620617
if (meta_request->weight > 0.0) {
621618
aws_atomic_fetch_sub(&meta_request->client->stats.total_weight, (size_t)meta_request->weight);
622619
}
623-
620+
624621
/* Subtract this meta request's connection requirements from client's total */
625622
if (meta_request->required_connections > 0) {
626-
aws_atomic_fetch_sub(&meta_request->client->stats.total_required_connections, (size_t)meta_request->required_connections);
623+
aws_atomic_fetch_sub(
624+
&meta_request->client->stats.total_required_connections, (size_t)meta_request->required_connections);
627625
}
628-
626+
629627
if (meta_request->buffer_pool_optimized) {
630628
aws_s3_buffer_pool_release_special_size(meta_request->client->buffer_pool, meta_request->part_size);
631629
}

0 commit comments

Comments
 (0)