Skip to content

Commit

Permalink
Merge branch 'loop_refactoring' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacopodl
jacopodl committed Sep 18, 2023
2 parents 244db3e + 9c71f93 commit 4bf908a
Show file tree
Hide file tree
Showing 15 changed files with 423 additions and 444 deletions.
116 changes: 58 additions & 58 deletions argon/vm/io/socket/psocket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ using namespace argon::vm::loop;
using namespace argon::vm::datatype;
using namespace argon::vm::io::socket;

CallbackReturnStatus AcceptCallBack(Event *event) {
CallbackStatus AcceptCallBack(Event *event) {
sockaddr_storage addr{};
socklen_t addrlen;
int remote;
Expand All @@ -35,24 +35,24 @@ CallbackReturnStatus AcceptCallBack(Event *event) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

auto *ret = SocketNew(sock->family, sock->type, sock->protocol, remote);
if (ret == nullptr)
return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;

argon::vm::FiberSetAsyncResult(event->fiber, (ArObject *) ret);

Release(ret);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

CallbackReturnStatus ConnectResultCallBack(Event *event) {
CallbackStatus ConnectResultCallBack(Event *event) {
auto *sock = (Socket *) event->initiator;
socklen_t len = sizeof(int);
int error;
Expand All @@ -64,15 +64,15 @@ CallbackReturnStatus ConnectResultCallBack(Event *event) {
if (error == 0) {
argon::vm::FiberSetAsyncResult(event->fiber, (ArObject *) sock);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

ErrorFromErrno(error);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

CallbackReturnStatus ConnectCallBack(Event *event) {
CallbackStatus ConnectCallBack(Event *event) {
event->callback = ConnectResultCallBack;

if (connect(((const Socket *) event->initiator)->sock, (sockaddr *) event->buffer.data,
Expand All @@ -82,16 +82,16 @@ CallbackReturnStatus ConnectCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

CallbackReturnStatus RecvCallBack(Event *event) {
CallbackStatus RecvCallBack(Event *event) {
auto *sock = (const Socket *) event->initiator;

auto bytes = recv(sock->sock,
Expand All @@ -105,10 +105,10 @@ CallbackReturnStatus RecvCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

event->buffer.length = bytes;
Expand All @@ -117,17 +117,17 @@ CallbackReturnStatus RecvCallBack(Event *event) {
if (buffer == nullptr) {
argon::vm::memory::Free(event->buffer.data);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

argon::vm::FiberSetAsyncResult(event->fiber, (ArObject *) buffer);

Release(buffer);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

CallbackReturnStatus RecvAllCallBack(Event *event) {
CallbackStatus RecvAllCallBack(Event *event) {
auto *sock = (const Socket *) event->initiator;
auto delta = event->buffer.allocated - event->buffer.length;

Expand All @@ -141,10 +141,10 @@ CallbackReturnStatus RecvAllCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

event->buffer.length += bytes;
Expand All @@ -154,32 +154,32 @@ CallbackReturnStatus RecvAllCallBack(Event *event) {
if (buffer == nullptr) {
argon::vm::memory::Free(event->buffer.data);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

argon::vm::FiberSetAsyncResult(event->fiber, (ArObject *) buffer);

Release(buffer);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

auto *tmp = (unsigned char *) argon::vm::memory::Realloc(event->buffer.data,
event->buffer.allocated + kRecvAllIncSize);
if (tmp == nullptr) {
argon::vm::memory::Free(event->buffer.data);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

event->buffer.data = tmp;

event->buffer.allocated += kRecvAllIncSize;

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

CallbackReturnStatus RecvFromCallBack(Event *event) {
CallbackStatus RecvFromCallBack(Event *event) {
sockaddr_storage storage{};
socklen_t addrlen = sizeof(sockaddr_storage);

Expand All @@ -197,10 +197,10 @@ CallbackReturnStatus RecvFromCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

event->buffer.length = bytes;
Expand All @@ -209,7 +209,7 @@ CallbackReturnStatus RecvFromCallBack(Event *event) {
if (remote_addr == nullptr) {
argon::vm::memory::Free(event->buffer.data);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

auto *data = BytesNewHoldBuffer(event->buffer.data, event->buffer.allocated, event->buffer.length, true);
Expand All @@ -218,7 +218,7 @@ CallbackReturnStatus RecvFromCallBack(Event *event) {

Release(remote_addr);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

auto *ret = TupleNew("oo", data, remote_addr);
Expand All @@ -231,13 +231,13 @@ CallbackReturnStatus RecvFromCallBack(Event *event) {

Release(ret);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

CallbackReturnStatus RecvIntoCallBack(Event *event) {
CallbackStatus RecvIntoCallBack(Event *event) {
auto *sock = (const Socket *) event->initiator;

auto bytes = recv(sock->sock,
Expand All @@ -251,10 +251,10 @@ CallbackReturnStatus RecvIntoCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

event->buffer.length = bytes;
Expand All @@ -268,13 +268,13 @@ CallbackReturnStatus RecvIntoCallBack(Event *event) {

Release(buffer);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

CallbackReturnStatus RecvRawCallBack(Event *event) {
CallbackStatus RecvRawCallBack(Event *event) {
auto *sock = (const Socket *) event->initiator;

auto bytes = recv(sock->sock,
Expand All @@ -288,18 +288,18 @@ CallbackReturnStatus RecvRawCallBack(Event *event) {

event->user_callback(event, event->aux, (int) bytes);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

event->buffer.length = bytes;

return event->user_callback(event, event->aux, 0);
}

CallbackReturnStatus SendCallBack(Event *event) {
CallbackStatus SendCallBack(Event *event) {
auto *sock = (const Socket *) event->initiator;

auto bytes = send(sock->sock,
Expand All @@ -314,10 +314,10 @@ CallbackReturnStatus SendCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

auto *buffer = IntNew(bytes);
Expand All @@ -330,13 +330,13 @@ CallbackReturnStatus SendCallBack(Event *event) {

Release(buffer);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

CallbackReturnStatus SendRawCallBack(Event *event) {
CallbackStatus SendRawCallBack(Event *event) {
auto *sock = (const Socket *) event->initiator;

auto bytes = send(sock->sock,
Expand All @@ -350,18 +350,18 @@ CallbackReturnStatus SendRawCallBack(Event *event) {

event->user_callback(event, event->aux, (int) bytes);

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

event->buffer.length = bytes;

return event->user_callback(event, event->aux, 0);
}

CallbackReturnStatus SendRecvCallBack(Event *event) {
CallbackStatus SendRecvCallBack(Event *event) {
auto *sock = (Socket *) event->initiator;

auto bytes = send(sock->sock,
Expand All @@ -373,10 +373,10 @@ CallbackReturnStatus SendRecvCallBack(Event *event) {
if (errno != EAGAIN) {
ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

if (!RecvCB(sock,
Expand All @@ -385,19 +385,19 @@ CallbackReturnStatus SendRecvCallBack(Event *event) {
event->buffer.data,
event->buffer.allocated,
0))
return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;

return CallbackReturnStatus::SUCCESS_NO_WAKEUP;
return CallbackStatus::CONTINUE;
}

CallbackReturnStatus SendToCallBack(Event *event) {
CallbackStatus SendToCallBack(Event *event) {
sockaddr_storage storage{};
socklen_t addrlen;

auto *sock = (const Socket *) event->initiator;

if (!AddrToSockAddr(event->aux, &storage, &addrlen, sock->family))
return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;

auto bytes = sendto(sock->sock,
event->buffer.arbuf.buffer,
Expand All @@ -410,10 +410,10 @@ CallbackReturnStatus SendToCallBack(Event *event) {

ErrorFromSocket();

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

return CallbackReturnStatus::RETRY;
return CallbackStatus::RETRY;
}

auto *buffer = IntNew(bytes);
Expand All @@ -425,10 +425,10 @@ CallbackReturnStatus SendToCallBack(Event *event) {

Release(buffer);

return CallbackReturnStatus::SUCCESS;
return CallbackStatus::SUCCESS;
}

return CallbackReturnStatus::FAILURE;
return CallbackStatus::FAILURE;
}

bool argon::vm::io::socket::Accept(Socket *sock) {
Expand Down
1 change: 1 addition & 0 deletions argon/vm/io/socket/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <netinet/in.h>
#include <sys/socket.h>

#include <argon/vm/loop/event.h>
#include <argon/vm/loop/evloop.h>

#endif
Expand Down
Loading

0 comments on commit 4bf908a

Please sign in to comment.