Tag the 2 lower bits, formatting

Author: MarkReedZ

src/engine_uring.cpp

@@ -89,10 +89,10 @@ struct connection_t;
 struct engine_t;
 struct automata_t;
 
+static constexpr std::size_t uring_acpt_tag_k{0};
 static constexpr std::size_t uring_recv_tag_k{1};
 static constexpr std::size_t uring_send_tag_k{2};
 static constexpr std::size_t uring_stat_tag_k{3};
-static constexpr std::size_t uring_acpt_tag_k{4};
 
 enum class stage_t {
     waiting_to_accept_k = 0,
@@ -764,8 +764,8 @@ template <std::size_t max_count_ak> std::size_t engine_t::pop_completed(complete
         if (!uring_cqe->user_data)
             continue;
 
-        events[completed].connection_ptr = (connection_t*)(uring_cqe->user_data & 0x0fffffffffffffff);
-        events[completed].type = (uring_cqe->user_data >> 60) & 0xF;// & 0xf000000000000000;
+        events[completed].connection_ptr = (connection_t*)(uring_cqe->user_data & ~0x3);
+        events[completed].type = uring_cqe->user_data & 0x3;
         events[completed].stage = events[completed].connection_ptr->stage;
         events[completed].result = uring_cqe->res;
         ++completed;
@@ -800,7 +800,7 @@ bool engine_t::consider_accepting_new_connection() noexcept {
     uring_sqe = io_uring_get_sqe(&uring);
     io_uring_prep_accept_direct(uring_sqe, socket, &connection.client_address, &connection.client_address_len, 0,
                                 IORING_FILE_INDEX_ALLOC);
-    io_uring_sqe_set_data(uring_sqe, (void*)((uring_acpt_tag_k<<60) | uint64_t(&connection)));
+    io_uring_sqe_set_data(uring_sqe, (void*)(uring_acpt_tag_k | uint64_t(&connection)));
 
     // Accepting new connections can be time-less.
     // io_uring_sqe_set_flags(uring_sqe, IOSQE_IO_LINK);
@@ -830,7 +830,7 @@ void engine_t::submit_stats_heartbeat() noexcept {
 
     uring_sqe = io_uring_get_sqe(&uring);
     io_uring_prep_timeout(uring_sqe, &connection.next_wakeup, 0, 0);
-    io_uring_sqe_set_data(uring_sqe, (void*)((uring_stat_tag_k<<60) | uint64_t(&connection)));
+    io_uring_sqe_set_data(uring_sqe, (void*)(uring_stat_tag_k | uint64_t(&connection)));
     uring_result = io_uring_submit(&uring);
     submission_mutex.unlock();
 }
@@ -902,7 +902,7 @@ void automata_t::send_next() noexcept {
         uring_sqe->flags |= IOSQE_FIXED_FILE;
         uring_sqe->buf_index = engine.connections.offset_of(connection) * 2u + 1u;
     }
-    io_uring_sqe_set_data(uring_sqe, (void*)((uring_send_tag_k<<60) | uint64_t(&connection)));
+    io_uring_sqe_set_data(uring_sqe, (void*)(uring_send_tag_k | uint64_t(&connection)));
     io_uring_sqe_set_flags(uring_sqe, 0);
     uring_result = io_uring_submit(&engine.uring);
     engine.submission_mutex.unlock();
@@ -928,7 +928,7 @@ void automata_t::receive_next() noexcept {
     uring_sqe = io_uring_get_sqe(&engine.uring);
     io_uring_prep_read_fixed(uring_sqe, int(connection.descriptor), (void*)pipes.next_input_address(),
                              pipes.next_input_length(), 0, engine.connections.offset_of(connection) * 2u);
-    io_uring_sqe_set_data(uring_sqe, (void*)((uring_recv_tag_k<<60) | uint64_t(&connection)));
+    io_uring_sqe_set_data(uring_sqe, (void*)(uring_recv_tag_k | uint64_t(&connection)));
     io_uring_sqe_set_flags(uring_sqe, IOSQE_IO_LINK);
 
     // More than other operations this depends on the information coming from the client.
@@ -947,13 +947,13 @@ void automata_t::receive_next() noexcept {
 void automata_t::operator()() noexcept {
 
     if (is_corrupted())
-        if ( connection.stage != stage_t::waiting_to_close_k )
+        if (connection.stage != stage_t::waiting_to_close_k)
             return close_gracefully();
 
     switch (connection.stage) {
 
     case stage_t::waiting_to_accept_k:
-        if ( type != uring_acpt_tag_k ) {
+        if (type != uring_acpt_tag_k) {
             return;
         }
 
@@ -973,7 +973,7 @@ void automata_t::operator()() noexcept {
 
     case stage_t::expecting_reception_k:
 
-        if ( type != uring_recv_tag_k ) {
+        if (type != uring_recv_tag_k) {
             return;
         }
         // From documentation:

src/helpers/parse.hpp

@@ -67,7 +67,6 @@ inline std::variant<named_callback_t, default_error_t> find_callback(named_callb
     if (!doc.is_object())
         return default_error_t{-32600, "The JSON sent is not a valid request object."};
 
-
     // We don't support JSON-RPC before version 2.0.
     sj::simdjson_result<sjd::element> version = doc["jsonrpc"];
     if (!version.is_string() || version.get_string().value_unsafe() != "2.0")