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: race conditions when using the same grammar concurrently #850

Merged
merged 1 commit into from
Dec 18, 2024
Merged

fix: race conditions when using the same grammar concurrently #850

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
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/Grammar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public ITokenizeLineResult<int[]> tokenizeLine2(final String lineText, final @Nu
}

@SuppressWarnings("unchecked")
private <T> T _tokenize(
private synchronized <T> T _tokenize(
String lineText,
@Nullable StateStack prevState,
final boolean emitBinaryTokens,
Expand Down
43 changes: 39 additions & 4 deletions org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,21 @@
import static org.junit.jupiter.api.Assertions.*;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import org.eclipse.tm4e.core.Data;
import org.eclipse.tm4e.core.internal.utils.ResourceUtils;
import org.eclipse.tm4e.core.registry.IGrammarSource;
import org.eclipse.tm4e.core.registry.Registry;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -71,6 +76,36 @@ class GrammarTest {
"Token from 11 to 14 with scopes [source.js, meta.function.js, meta.decl.block.js]",
"Token from 14 to 15 with scopes [source.js, meta.function.js, meta.decl.block.js, meta.brace.curly.js]" };

@Test
void testTokenizeConcurrent() throws Exception {
final var registry = new Registry();
final var grammar = registry.addGrammar(fromFile(Paths.get("../org.eclipse.tm4e.language_pack/syntaxes/xml/xml.tmLanguage.json")));
final String content = Files.readString(Paths.get("../org.eclipse.tm4e.language_pack/syntaxes/xml/xml.example.xml"));

final int numThreads = 4;
final int numIterations = 10;

final var executor = Executors.newFixedThreadPool(numThreads);
final Runnable tokenizationTask = () -> {
for (int i = 0; i < numIterations; i++) {
final var r = TokenizationUtils.tokenizeText(content, grammar);
assertTrue(r.count() > 10);
}
};

final List<Future<?>> futures = new ArrayList<>();
for (int i = 0; i < numThreads; i++) {
futures.add(executor.submit(tokenizationTask));
}

for (final Future<?> future : futures) {
future.get();
}

executor.shutdown();
executor.awaitTermination(1, TimeUnit.MINUTES);
}

@Test
void testTokenizeSingleLineExpression() throws Exception {
final var registry = new Registry();
Expand All @@ -80,7 +115,7 @@ void testTokenizeSingleLineExpression() throws Exception {
for (int i = 0; i < lineTokens.getTokens().length; i++) {
final IToken token = lineTokens.getTokens()[i];
final String s = "Token from " + token.getStartIndex() + " to " + token.getEndIndex() + " with scopes " + token.getScopes();
Assertions.assertEquals(EXPECTED_SINGLE_LINE_TOKENS[i], s);
assertEquals(EXPECTED_SINGLE_LINE_TOKENS[i], s);
}
}

Expand All @@ -100,7 +135,7 @@ void testTokenizeMultilineExpression() throws Exception {
for (i = 0; i < lineTokens.getTokens().length; i++) {
final IToken token = lineTokens.getTokens()[i];
final String s = "Token from " + token.getStartIndex() + " to " + token.getEndIndex() + " with scopes " + token.getScopes();
Assertions.assertEquals(EXPECTED_MULTI_LINE_TOKENS[i + j], s);
assertEquals(EXPECTED_MULTI_LINE_TOKENS[i + j], s);
}
j = i;
}
Expand Down Expand Up @@ -220,7 +255,7 @@ void testTokenizeTypeScriptFile() throws Exception {
for (int i = 0; i < lineTokens.getTokens().length; i++) {
tokenIndex++;
final var token = lineTokens.getTokens()[i];
Assertions.assertEquals(
assertEquals(
expectedTokens.get(tokenIndex),
"Token from " + token.getStartIndex() + " to " + token.getEndIndex() + " with scopes " + token.getScopes());
}
Expand Down
Loading