eliminate event loop constructor

awslabs · Nov 12, 2024 · 51e2d5a · 51e2d5a
1 parent e22131a
commit 51e2d5a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 32 deletions.
diff --git a/include/aws/io/event_loop.h b/include/aws/io/event_loop.h
@@ -241,16 +241,6 @@ struct aws_event_loop *aws_event_loop_new_base(
 AWS_IO_API
 void aws_event_loop_clean_up_base(struct aws_event_loop *event_loop);
 
-/**
- * @internal - Don't use outside of testing.
- * 
- * Creates an instance of the event loop implementation from the options.
- */
-AWS_IO_API
-struct aws_event_loop *aws_event_loop_new_with_options(
-    struct aws_allocator *alloc,
-    const struct aws_event_loop_options *options);
-
 /**
  * @internal - Don't use outside of testing.
  *

diff --git a/include/aws/io/private/event_loop_impl.h b/include/aws/io/private/event_loop_impl.h
@@ -192,9 +192,7 @@ struct aws_event_loop *aws_event_loop_new_default(struct aws_allocator *alloc, a
  * Please note the event loop type defined in the options will be ignored.
  */
 AWS_IO_API
-struct aws_event_loop *aws_event_loop_new_default_with_options(
-    struct aws_allocator *alloc,
-    const struct aws_event_loop_options *options);
+struct aws_event_loop *aws_event_loop_new(struct aws_allocator *alloc, const struct aws_event_loop_options *options);
 
 /**
  * Initializes common event-loop data structures.

diff --git a/source/event_loop.c b/source/event_loop.c
@@ -28,26 +28,12 @@ struct aws_event_loop *aws_event_loop_new_default(struct aws_allocator *alloc, a
         .type = AWS_EVENT_LOOP_PLATFORM_DEFAULT,
     };
 
-    return aws_event_loop_new_with_options(alloc, &options);
-}
-
-struct aws_event_loop *aws_event_loop_new_default_with_options(
-    struct aws_allocator *alloc,
-    const struct aws_event_loop_options *options) {
-    struct aws_event_loop_options local_options = {
-        .thread_options = options->thread_options,
-        .clock = options->clock,
-        .type = AWS_EVENT_LOOP_PLATFORM_DEFAULT,
-    };
-
-    return aws_event_loop_new_with_options(alloc, &local_options);
+    return aws_event_loop_new(alloc, &options);
 }
 
 static enum aws_event_loop_type aws_event_loop_get_default_type(void);
 static int aws_event_loop_type_validate_platform(enum aws_event_loop_type type);
-struct aws_event_loop *aws_event_loop_new_with_options(
-    struct aws_allocator *alloc,
-    const struct aws_event_loop_options *options) {
+struct aws_event_loop *aws_event_loop_new(struct aws_allocator *alloc, const struct aws_event_loop_options *options) {
 
     enum aws_event_loop_type type = options->type;
     if (type == AWS_EVENT_LOOP_PLATFORM_DEFAULT) {
@@ -246,7 +232,7 @@ static struct aws_event_loop *s_default_new_event_loop(
     void *user_data) {
 
     (void)user_data;
-    return aws_event_loop_new_default_with_options(allocator, options);
+    return aws_event_loop_new(allocator, options);
 }
 
 struct aws_event_loop_group *aws_event_loop_group_new(

diff --git a/tests/socket_handler_test.c b/tests/socket_handler_test.c
@@ -994,7 +994,7 @@ static struct aws_event_loop *s_default_new_event_loop(
     void *user_data) {
 
     (void)user_data;
-    return aws_event_loop_new_default_with_options(allocator, options);
+    return aws_event_loop_new(allocator, options);
 }
 
 static int s_statistic_test_clock_fn(uint64_t *timestamp) {

diff --git a/tests/tls_handler_test.c b/tests/tls_handler_test.c
@@ -1890,7 +1890,7 @@ static struct aws_event_loop *s_default_new_event_loop(
     void *user_data) {
 
     (void)user_data;
-    return aws_event_loop_new_default_with_options(allocator, options);
+    return aws_event_loop_new(allocator, options);
 }
 
 static int s_statistic_test_clock_fn(uint64_t *timestamp) {