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

Fix Unintended Action Override #491

Merged
merged 8 commits into from
Oct 19, 2024
Merged

Fix Unintended Action Override #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76394dd
remove _lf_get_token
Depetrol Oct 17, 2024
a13687f
update lingua-franca-ref
Depetrol Oct 17, 2024
a201f81
fix TokenSourceScalePrint.lf
Depetrol Oct 18, 2024
024092d
fix ArrayFree.lf
Depetrol Oct 18, 2024
237b84d
Revert "remove _lf_get_token"
Depetrol Oct 18, 2024
9fcab12
bring back token reuse
Depetrol Oct 18, 2024
0e84b71
simplify logic
Depetrol Oct 18, 2024
ba805e1
fix critical section
Depetrol Oct 18, 2024
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
26 changes: 12 additions & 14 deletions core/lf_token.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,22 +237,20 @@ lf_token_t* _lf_new_token(token_type_t* type, void* value, size_t length) {
}

lf_token_t* _lf_get_token(token_template_t* tmplt) {
if (tmplt->token != NULL) {
if (tmplt->token->ref_count == 1) {
LF_PRINT_DEBUG("_lf_get_token: Reusing template token: %p with ref_count %zu", (void*)tmplt->token,
tmplt->token->ref_count);
// Free any previous value in the token.
_lf_free_token_value(tmplt->token);
return tmplt->token;
} else {
// Liberate the token.
_lf_done_using(tmplt->token);
}
LF_CRITICAL_SECTION_ENTER(GLOBAL_ENVIRONMENT);
if (tmplt->token != NULL && tmplt->token->ref_count == 1) {
LF_PRINT_DEBUG("_lf_get_token: Reusing template token: %p with ref_count %zu", (void*)tmplt->token,
tmplt->token->ref_count);
// Free any previous value in the token.
_lf_free_token_value(tmplt->token);
LF_CRITICAL_SECTION_EXIT(GLOBAL_ENVIRONMENT);
return tmplt->token;
}
LF_CRITICAL_SECTION_EXIT(GLOBAL_ENVIRONMENT);
// If we get here, we need a new token.
tmplt->token = _lf_new_token((token_type_t*)tmplt, NULL, 0);
tmplt->token->ref_count = 1;
return tmplt->token;
lf_token_t* result = _lf_new_token((token_type_t*)tmplt, NULL, 0);
result->ref_count = 1;
return result;
}

void _lf_initialize_template(token_template_t* tmplt, size_t element_size) {
Expand Down
3 changes: 3 additions & 0 deletions include/api/reaction_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
/* The cast "*((void**) &out->value)" is a hack to make the code */ \
/* compile with non-token types where value is not a pointer. */ \
lf_token_t* token = _lf_initialize_token_with_value((token_template_t*)out, *((void**)&out->value), 1); \
out->token = token; \
} \
} while (0)

Expand All @@ -97,6 +98,7 @@
do { \
lf_set_present(out); \
lf_token_t* token = _lf_initialize_token_with_value((token_template_t*)out, val, len); \
out->token = token; \
out->value = token->value; \
out->length = len; \
} while (0)
Expand All @@ -105,6 +107,7 @@
do { \
lf_set_present(out); \
lf_token_t* token = _lf_initialize_token_with_value((token_template_t*)out, val, len); \
out->token = token; \
out->value = static_cast<decltype(out->value)>(token->value); \
out->length = len; \
} while (0)
Expand Down
2 changes: 1 addition & 1 deletion lingua-franca-ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master
fix-concurrency
Loading