Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ames, mesa: revert static receive buffer allocation #755

Merged
merged 1 commit into from
Dec 20, 2024
Merged

ames, mesa: revert static receive buffer allocation #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions pkg/vere/io/ames.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

#include <arpa/inet.h>

static c3_y pac_y[4096];

#define FINE_PAGE 4096 // packets per page
#define FINE_FRAG 1024 // bytes per fragment packet
#define FINE_PATH_MAX 384 // longest allowed scry path
Expand Down Expand Up @@ -254,6 +252,7 @@ _ames_pact_free(u3_pact* pac_u)
u3_pier_bail(u3_king_stub());
}

c3_free(pac_u->hun_y);
c3_free(pac_u);
}

Expand Down Expand Up @@ -697,7 +696,7 @@ _fine_etch_response(u3_pact* pac_u)
pre_w = _ames_prel_size(&pac_u->hed_u);
pur_w = _fine_purr_size(&pac_u->pur_u);
pac_u->len_w = HEAD_SIZE + pre_w + pur_w;
pac_u->hun_y = pac_y;
pac_u->hun_y = c3_calloc(pac_u->len_w);

// skip the header until we know what the mug should be
//
Expand Down Expand Up @@ -736,14 +735,14 @@ _lane_scry_path(u3_noun who)
/* _ames_send_cb(): send callback.
*/
static void
_ames_send_cb(u3_pact* pac_u, c3_i sas_i)
_ames_send_cb(uv_udp_send_t* req_u, c3_i sas_i)
{
u3_pact* pac_u = (u3_pact*)req_u;
u3_ames* sam_u = pac_u->sam_u;

if ( sas_i >= 0 ) {
if ( !sas_i ) {
net_o = c3y;
}

else if ( c3y == net_o ) {
u3l_log("ames: send fail: %s", uv_strerror(sas_i));
net_o = c3n;
Expand Down Expand Up @@ -777,11 +776,15 @@ _ames_send(u3_pact* pac_u)

{
uv_buf_t buf_u = uv_buf_init((c3_c*)pac_u->hun_y, pac_u->len_w);
c3_i sas_i = uv_udp_try_send(&u3_Host.wax_u,
&buf_u, 1,
(const struct sockaddr*)&add_u);

_ames_send_cb(pac_u, sas_i);
c3_i sas_i = uv_udp_send(&pac_u->snd_u,
&u3_Host.wax_u,
&buf_u, 1,
(const struct sockaddr*)&add_u,
_ames_send_cb);

if ( sas_i ) {
_ames_send_cb(&pac_u->snd_u, sas_i);
}
}
}
}
Expand Down Expand Up @@ -1341,7 +1344,7 @@ _ames_ef_send(u3_ames* sam_u, u3_noun lan, u3_noun pac)
pac_u->sam_u = sam_u;
pac_u->lan_u = lan_u;
pac_u->len_w = u3r_met(3, pac);
pac_u->hun_y = pac_y;
pac_u->hun_y = c3_malloc(pac_u->len_w);

u3r_bytes(0, pac_u->len_w, pac_u->hun_y, pac);

Expand Down Expand Up @@ -1974,7 +1977,7 @@ _ames_try_forward(u3_pact* pac_u)
old_y = pac_u->hun_y;

pac_u->len_w += 6;
pac_u->hun_y = pac_y;
pac_u->hun_y = c3_calloc(pac_u->len_w);

cur_w = 0;

Expand Down Expand Up @@ -2032,6 +2035,7 @@ _ames_hear(u3_ames* sam_u,
sam_u->sun_u.tid_y, len_w) )
{
_stun_on_response(sam_u, hun_y, len_w);
c3_free(hun_y);
}
else {
struct sockaddr_in* add_u = (struct sockaddr_in*)adr_u;
Expand All @@ -2049,6 +2053,7 @@ _ames_hear(u3_ames* sam_u,
sam_u->sat_u.hed_d);
}

c3_free(hun_y);
return;
}

Expand Down
8 changes: 7 additions & 1 deletion pkg/vere/io/mesa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,8 @@ _ames_alloc(uv_handle_t* had_u,
uv_buf_t* buf
)
{
*buf = uv_buf_init(pac_c, 4096);
void* ptr_v = c3_malloc(4096);
*buf = uv_buf_init(ptr_v, 4096);
}

/* u3_mesa_decode_lane(): deserialize noun to lane; 0.0.0.0:0 if invalid
Expand Down Expand Up @@ -2934,8 +2935,10 @@ _mesa_hear(u3_mesa* sam_u,
if ( err_c ) {
u3l_log("mesa: hear: sift failed: %s", err_c);
_mesa_free_pict(pic_u);
c3_free(hun_y);
return;
}
c3_free(hun_y);

struct sockaddr_in* add_u = (struct sockaddr_in*)adr_u;
u3_lane lan_u;
Expand Down Expand Up @@ -2967,13 +2970,16 @@ static void _mesa_recv_cb(uv_udp_t* wax_u,
if ( u3C.wag_w & u3o_verbose ) {
u3l_log("mesa: recv: fail: %s", uv_strerror(nrd_i));
}
c3_free(buf_u->base);
}
else if ( 0 == nrd_i ) {
c3_free(buf_u->base);
}
else if ( flg_i & UV_UDP_PARTIAL ) {
if ( u3C.wag_w & u3o_verbose ) {
u3l_log("mesa: recv: fail: message truncated");
}
c3_free(buf_u->base);
}
else {
_mesa_hear(wax_u->data, adr_u, (c3_w)nrd_i, (c3_y*)buf_u->base);
Expand Down