nickorlow/anthracite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

faster nonblocking io
Some checks failed
Docker Build & Publish / build (push) Failing after 1h24m16s
Details

Browse source
This commit is contained in:
Nicholas Orlowsky 2025-02-23 17:06:32 -05:00
parent 6c5feb8675
commit c07f3ebf81
8 changed files with 66 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/socket/socket.cpp
View file

@ -4,18 +4,26 @@
#include <malloc.h>
#include <netinet/in.h>
#include <string>
#include <sys/epoll.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <unistd.h>
#include <vector>
#include <unistd.h>
#include <fcntl.h>
#include "assert.h"
#include <netinet/in.h>
#include <netinet/tcp.h>
namespace anthracite::socket {
const struct timeval anthracite_socket::timeout_tv = { .tv_sec = 5, .tv_usec = 0 };
anthracite_socket::anthracite_socket(int port, int max_queue)
anthracite_socket::anthracite_socket(int port, int max_queue, bool nonblocking)
: server_socket(::socket(AF_INET, SOCK_STREAM, 0))
, client_ip("")
, _nonblocking(nonblocking)
{
struct sockaddr_in address {};
address.sin_family = AF_INET;
@ -26,25 +34,28 @@ anthracite_socket::anthracite_socket(int port, int max_queue)
setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &reuse_opt, sizeof(reuse_opt));
bind(server_socket, reinterpret_cast<struct sockaddr*>(&address), sizeof(address));
if (_nonblocking) {
fcntl(server_socket, F_SETFL, O_NONBLOCK);
}
listen(server_socket, max_queue);
}
bool anthracite_socket::wait_for_conn()
{
client_ip = "";
//struct timeval tv = { .tv_sec = 1, .tv_usec = 0 };
//fd_set read_fd;
//FD_ZERO(&read_fd);
//FD_SET(server_socket, &read_fd);
//if (select(server_socket + 1, &read_fd, NULL, NULL, &wait_timeout)) {
client_socket = accept(server_socket, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_len);
client_socket = accept(server_socket, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_len);
if (client_socket > 0) {
if (_nonblocking) {
fcntl(client_socket, F_SETFL, O_NONBLOCK);
}
std::array<char, INET_ADDRSTRLEN> ip_str { 0 };
inet_ntop(AF_INET, &client_addr.sin_addr, ip_str.data(), INET_ADDRSTRLEN);
client_ip = std::string(ip_str.data());
return true;
//} else {
// return false;
//}
} else {
return false;
}
}
const std::string& anthracite_socket::get_client_ip()
@ -52,8 +63,7 @@ const std::string& anthracite_socket::get_client_ip()
return client_ip;
}
void anthracite_socket::close_conn()
{
void anthracite_socket::close_conn() {
close(client_socket);
client_socket = -1;
}
@ -66,13 +76,21 @@ void anthracite_socket::send_message(std::string& msg)
send(client_socket, &msg[0], msg.length(), 0);
}
bool anthracite_socket::has_client() {
return client_socket > 0;
}
std::string anthracite_socket::recv_message(int buffer_size)
{
if (client_socket == -1) {
return "";
}
setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &timeout_tv, sizeof timeout_tv);
//setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &timeout_tv, sizeof timeout_tv);
int nodelay_opt = 1;
assert(setsockopt(client_socket, SOL_TCP, TCP_NODELAY, &nodelay_opt, sizeof(nodelay_opt)) == 0);
std::vector<char> response(buffer_size + 1);
ssize_t result = recv(client_socket, response.data(), buffer_size + 1, 0);

4
lib/socket/socket.hpp
View file

@ -14,6 +14,7 @@ namespace anthracite::socket {
class anthracite_socket {
protected:
bool _nonblocking;
struct timeval wait_timeout = { .tv_sec = 1, .tv_usec = 0};
int server_socket;
int client_socket {};
@ -24,10 +25,11 @@ protected:
static const int MAX_QUEUE_LENGTH = 100;
public:
anthracite_socket(int port, int max_queue = MAX_QUEUE_LENGTH);
anthracite_socket(int port, int max_queue = MAX_QUEUE_LENGTH, bool nonblocking = false);
virtual const std::string& get_client_ip() final;
virtual bool has_client();
virtual bool wait_for_conn();
virtual void close_conn();
virtual void send_message(std::string& msg);