From baec259febd894885bc7aea369e63e46fb331f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sat, 27 Nov 2021 18:35:19 +0100
Subject: [PATCH] ws: use file naming more in line with other impls; other
 small fixes

---
 aquatic_ws/src/glommio/mod.rs                        | 10 +++++-----
 aquatic_ws/src/glommio/{handlers.rs => request.rs}   |  0
 aquatic_ws/src/glommio/{network.rs => socket.rs}     |  0
 aquatic_ws/src/lib.rs                                |  2 +-
 aquatic_ws/src/mio/mod.rs                            |  8 ++++----
 aquatic_ws/src/mio/{handlers.rs => request.rs}       |  0
 aquatic_ws/src/mio/{network => socket}/connection.rs |  0
 aquatic_ws/src/mio/{network => socket}/mod.rs        |  0
 aquatic_ws/src/mio/{network => socket}/utils.rs      |  0
 aquatic_ws/src/tasks.rs                              |  6 ------
 10 files changed, 10 insertions(+), 16 deletions(-)
 rename aquatic_ws/src/glommio/{handlers.rs => request.rs} (100%)
 rename aquatic_ws/src/glommio/{network.rs => socket.rs} (100%)
 rename aquatic_ws/src/mio/{handlers.rs => request.rs} (100%)
 rename aquatic_ws/src/mio/{network => socket}/connection.rs (100%)
 rename aquatic_ws/src/mio/{network => socket}/mod.rs (100%)
 rename aquatic_ws/src/mio/{network => socket}/utils.rs (100%)
 delete mode 100644 aquatic_ws/src/tasks.rs

diff --git a/aquatic_ws/src/glommio/mod.rs b/aquatic_ws/src/glommio/mod.rs
index ed6c495..20b86cf 100644
--- a/aquatic_ws/src/glommio/mod.rs
+++ b/aquatic_ws/src/glommio/mod.rs
@@ -1,6 +1,6 @@
 pub mod common;
-pub mod handlers;
-pub mod network;
+pub mod request;
+pub mod socket;
 
 use std::{
     fs::File,
@@ -19,7 +19,7 @@ use glommio::{channels::channel_mesh::MeshBuilder, prelude::*};
 
 const SHARED_CHANNEL_SIZE: usize = 1024;
 
-pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
+pub fn run(config: Config, state: State) -> anyhow::Result<()> {
     let num_peers = config.socket_workers + config.request_workers;
 
     let request_mesh_builder = MeshBuilder::partial(num_peers, SHARED_CHANNEL_SIZE);
@@ -49,7 +49,7 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
                 WorkerIndex::SocketWorker(i),
             );
 
-            network::run_socket_worker(
+            socket::run_socket_worker(
                 config,
                 state,
                 tls_config,
@@ -79,7 +79,7 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
                 WorkerIndex::RequestWorker(i),
             );
 
-            handlers::run_request_worker(config, state, request_mesh_builder, response_mesh_builder)
+            request::run_request_worker(config, state, request_mesh_builder, response_mesh_builder)
                 .await
         });
 
diff --git a/aquatic_ws/src/glommio/handlers.rs b/aquatic_ws/src/glommio/request.rs
similarity index 100%
rename from aquatic_ws/src/glommio/handlers.rs
rename to aquatic_ws/src/glommio/request.rs
diff --git a/aquatic_ws/src/glommio/network.rs b/aquatic_ws/src/glommio/socket.rs
similarity index 100%
rename from aquatic_ws/src/glommio/network.rs
rename to aquatic_ws/src/glommio/socket.rs
diff --git a/aquatic_ws/src/lib.rs b/aquatic_ws/src/lib.rs
index 3ae27b6..2a4f0d9 100644
--- a/aquatic_ws/src/lib.rs
+++ b/aquatic_ws/src/lib.rs
@@ -34,7 +34,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
 
         cfg_if!(
             if #[cfg(feature = "with-glommio")] {
-                ::std::thread::spawn(move || glommio::run_inner(config, state));
+                ::std::thread::spawn(move || glommio::run(config, state));
             } else {
                 ::std::thread::spawn(move || mio::run(config, state));
             }
diff --git a/aquatic_ws/src/mio/mod.rs b/aquatic_ws/src/mio/mod.rs
index b002ef3..e7ea249 100644
--- a/aquatic_ws/src/mio/mod.rs
+++ b/aquatic_ws/src/mio/mod.rs
@@ -14,8 +14,8 @@ use parking_lot::Mutex;
 use privdrop::PrivDrop;
 
 pub mod common;
-pub mod handlers;
-pub mod network;
+pub mod request;
+pub mod socket;
 
 use crate::config::Config;
 use common::*;
@@ -85,7 +85,7 @@ pub fn start_workers(config: Config, state: State) -> anyhow::Result<()> {
                     WorkerIndex::SocketWorker(i),
                 );
 
-                network::run_socket_worker(
+                socket::run_socket_worker(
                     config,
                     state,
                     i,
@@ -144,7 +144,7 @@ pub fn start_workers(config: Config, state: State) -> anyhow::Result<()> {
                     WorkerIndex::RequestWorker(i),
                 );
 
-                handlers::run_request_worker(
+                request::run_request_worker(
                     config,
                     state,
                     in_message_receiver,
diff --git a/aquatic_ws/src/mio/handlers.rs b/aquatic_ws/src/mio/request.rs
similarity index 100%
rename from aquatic_ws/src/mio/handlers.rs
rename to aquatic_ws/src/mio/request.rs
diff --git a/aquatic_ws/src/mio/network/connection.rs b/aquatic_ws/src/mio/socket/connection.rs
similarity index 100%
rename from aquatic_ws/src/mio/network/connection.rs
rename to aquatic_ws/src/mio/socket/connection.rs
diff --git a/aquatic_ws/src/mio/network/mod.rs b/aquatic_ws/src/mio/socket/mod.rs
similarity index 100%
rename from aquatic_ws/src/mio/network/mod.rs
rename to aquatic_ws/src/mio/socket/mod.rs
diff --git a/aquatic_ws/src/mio/network/utils.rs b/aquatic_ws/src/mio/socket/utils.rs
similarity index 100%
rename from aquatic_ws/src/mio/network/utils.rs
rename to aquatic_ws/src/mio/socket/utils.rs
diff --git a/aquatic_ws/src/tasks.rs b/aquatic_ws/src/tasks.rs
deleted file mode 100644
index e4139fa..0000000
--- a/aquatic_ws/src/tasks.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use aquatic_common::access_list::{AccessListMode, AccessListQuery};
-use histogram::Histogram;
-
-use crate::common::*;
-use crate::config::Config;
-