Skip to content

Use typed data API #37

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

Open
nobu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use typed data API #37

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15b09f8
Use Data_Make_Struct for parser allocation
nobu Jun 1, 2026
169d7ba
Use typed data for LLHttp parser
nobu Jun 1, 2026
11448f7
Match llhttp_data_cb signatures
nobu Jun 1, 2026
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
78 changes: 54 additions & 24 deletions mri/ext/llhttp/llhttp_ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ typedef struct {
ID on_header_value_complete;
} rb_llhttp_parser_data;

static void rb_llhttp_free(llhttp_t *parser) {
static void rb_llhttp_free(void *data) {
llhttp_t *parser = data;
rb_llhttp_parser_data *parserData = (rb_llhttp_parser_data*) parser->data;

// If `parserData` is not `0`, it (and settings) were initialized.
Expand All @@ -41,21 +42,50 @@ static void rb_llhttp_free(llhttp_t *parser) {
free(parser);
}

#ifdef TypedData_Make_Struct
static size_t rb_llhttp_memsize(const void *data) {
return data ? sizeof(llhttp_t) : 0;
}

static const rb_data_type_t rb_llhttp_type = {
"LLHttp::Parser",
{0, rb_llhttp_free, rb_llhttp_memsize,},
0, 0, 0,
};
#endif

static llhttp_t *rb_llhttp_get(VALUE self) {
llhttp_t *parser;

#ifdef TypedData_Make_Struct
TypedData_Get_Struct(self, llhttp_t, &rb_llhttp_type, parser);
#else
Data_Get_Struct(self, llhttp_t, parser);
#endif

return parser;
}

VALUE rb_llhttp_allocate(VALUE klass) {
llhttp_t *parser = (llhttp_t *)malloc(sizeof(llhttp_t));
llhttp_t *parser;
#ifdef TypedData_Make_Struct
VALUE self = TypedData_Make_Struct(klass, llhttp_t, &rb_llhttp_type, parser);
#else
VALUE self = Data_Make_Struct(klass, llhttp_t, 0, rb_llhttp_free, parser);
#endif

// Set data to false so we know when the parser has been initialized.
//
parser->data = 0;

return Data_Wrap_Struct(klass, 0, rb_llhttp_free, parser);
return self;
}

VALUE rb_llhttp_callback_call(VALUE delegate, ID method) {
return rb_funcall(delegate, method, 0);
}

void rb_llhttp_data_callback_call(VALUE delegate, ID method, char *data, size_t length) {
void rb_llhttp_data_callback_call(VALUE delegate, ID method, const char *data, size_t length) {
rb_funcall(delegate, method, 1, rb_str_new(data, length));
}

Expand Down Expand Up @@ -83,39 +113,39 @@ int rb_llhttp_on_chunk_header(llhttp_t *parser) {
return NUM2INT(rb_llhttp_callback_call(parserData->delegate, parserData->on_chunk_header));
}

int rb_llhttp_on_url(llhttp_t *parser, char *data, size_t length) {
int rb_llhttp_on_url(llhttp_t *parser, const char *data, size_t length) {
rb_llhttp_parser_data *parserData = (rb_llhttp_parser_data*) parser->data;

rb_llhttp_data_callback_call(parserData->delegate, parserData->on_url, data, length);

return 0;
}

int rb_llhttp_on_status(llhttp_t *parser, char *data, size_t length) {
int rb_llhttp_on_status(llhttp_t *parser, const char *data, size_t length) {
rb_llhttp_parser_data *parserData = (rb_llhttp_parser_data*) parser->data;

rb_llhttp_data_callback_call(parserData->delegate, parserData->on_status, data, length);

return 0;
}

int rb_llhttp_on_header_field(llhttp_t *parser, char *data, size_t length) {
int rb_llhttp_on_header_field(llhttp_t *parser, const char *data, size_t length) {
rb_llhttp_parser_data *parserData = (rb_llhttp_parser_data*) parser->data;

rb_llhttp_data_callback_call(parserData->delegate, parserData->on_header_field, data, length);

return 0;
}

int rb_llhttp_on_header_value(llhttp_t *parser, char *data, size_t length) {
int rb_llhttp_on_header_value(llhttp_t *parser, const char *data, size_t length) {
rb_llhttp_parser_data *parserData = (rb_llhttp_parser_data*) parser->data;

rb_llhttp_data_callback_call(parserData->delegate, parserData->on_header_value, data, length);

return 0;
}

int rb_llhttp_on_body(llhttp_t *parser, char *data, size_t length) {
int rb_llhttp_on_body(llhttp_t *parser, const char *data, size_t length) {
rb_llhttp_parser_data *parserData = (rb_llhttp_parser_data*) parser->data;

rb_llhttp_data_callback_call(parserData->delegate, parserData->on_body, data, length);
Expand Down Expand Up @@ -166,7 +196,7 @@ int rb_llhttp_on_header_value_complete(llhttp_t *parser) {
VALUE rb_llhttp_parse(VALUE self, VALUE data) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

enum llhttp_errno err = llhttp_execute(parser, RSTRING_PTR(data), RSTRING_LEN(data));

Expand All @@ -180,7 +210,7 @@ VALUE rb_llhttp_parse(VALUE self, VALUE data) {
VALUE rb_llhttp_finish(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

enum llhttp_errno err = llhttp_finish(parser);

Expand All @@ -194,7 +224,7 @@ VALUE rb_llhttp_finish(VALUE self) {
VALUE rb_llhttp_reset(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

llhttp_reset(parser);

Expand All @@ -204,47 +234,47 @@ VALUE rb_llhttp_reset(VALUE self) {
VALUE rb_llhttp_content_length(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

return ULL2NUM(parser->content_length);
}

VALUE rb_llhttp_method_name(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

return rb_str_new_cstr(llhttp_method_name(parser->method));
}

VALUE rb_llhttp_status_code(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

return UINT2NUM(parser->status_code);
}

VALUE rb_llhttp_http_major(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

return UINT2NUM(parser->http_major);
}

VALUE rb_llhttp_http_minor(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

return UINT2NUM(parser->http_minor);
}

VALUE rb_llhttp_keep_alive(VALUE self) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

int ret = llhttp_should_keep_alive(parser);

Expand All @@ -254,7 +284,7 @@ VALUE rb_llhttp_keep_alive(VALUE self) {
static VALUE rb_llhttp_init(VALUE self, VALUE type) {
llhttp_t *parser;

Data_Get_Struct(self, llhttp_t, parser);
parser = rb_llhttp_get(self);

llhttp_settings_t *settings = (llhttp_settings_t *)malloc(sizeof(llhttp_settings_t));
llhttp_settings_init(settings);
Expand Down Expand Up @@ -294,23 +324,23 @@ static VALUE rb_llhttp_init(VALUE self, VALUE type) {
}

if (rb_respond_to(parserData->delegate, parserData->on_url)) {
settings->on_url = (llhttp_data_cb)rb_llhttp_on_url;
settings->on_url = rb_llhttp_on_url;
}

if (rb_respond_to(parserData->delegate, parserData->on_status)) {
settings->on_status = (llhttp_data_cb)rb_llhttp_on_status;
settings->on_status = rb_llhttp_on_status;
}

if (rb_respond_to(parserData->delegate, parserData->on_header_field)) {
settings->on_header_field = (llhttp_data_cb)rb_llhttp_on_header_field;
settings->on_header_field = rb_llhttp_on_header_field;
}

if (rb_respond_to(parserData->delegate, parserData->on_header_value)) {
settings->on_header_value = (llhttp_data_cb)rb_llhttp_on_header_value;
settings->on_header_value = rb_llhttp_on_header_value;
}

if (rb_respond_to(parserData->delegate, parserData->on_body)) {
settings->on_body = (llhttp_data_cb)rb_llhttp_on_body;
settings->on_body = rb_llhttp_on_body;
}

if (rb_respond_to(parserData->delegate, parserData->on_chunk_complete)) {
Expand Down