Skip to content

Commit

Permalink
Revert "[Truffle] Synchronize data access in EncodingManager"
Browse files Browse the repository at this point in the history
This reverts commit 8ca1751.
  • Loading branch information
Brandon Fish committed Sep 19, 2016
1 parent 3ff74fb commit 4222dc8
Showing 1 changed file with 6 additions and 6 deletions.
Expand Up @@ -57,12 +57,12 @@ public static DynamicObject newRubyEncoding(RubyContext context, Encoding encodi
return Layouts.ENCODING.createEncoding(context.getCoreLibrary().getEncodingFactory(), encoding, string, dummy);
}

public synchronized List<DynamicObject> getUnsafeEncodingList() {
public List<DynamicObject> getUnsafeEncodingList() {
return ENCODING_LIST_BY_ENCODING_LIST_INDEX;
}

@TruffleBoundary
public synchronized DynamicObject getRubyEncoding(Encoding encoding) {
public DynamicObject getRubyEncoding(Encoding encoding) {
DynamicObject rubyEncoding = ENCODING_LIST_BY_ENCODING_INDEX.get(encoding.getIndex());

if (rubyEncoding == null) {
Expand All @@ -77,17 +77,17 @@ public synchronized DynamicObject getRubyEncoding(Encoding encoding) {
}

@TruffleBoundary
public synchronized DynamicObject getRubyEncoding(String name) {
public DynamicObject getRubyEncoding(String name) {
return LOOKUP.get(name.toLowerCase(Locale.ENGLISH));
}

@TruffleBoundary
public synchronized DynamicObject getRubyEncoding(int encodingListIndex) {
public DynamicObject getRubyEncoding(int encodingListIndex) {
return ENCODING_LIST_BY_ENCODING_LIST_INDEX.get(encodingListIndex);
}

@TruffleBoundary
public synchronized void defineEncoding(EncodingDB.Entry encodingEntry, byte[] name, int p, int end) {
public void defineEncoding(EncodingDB.Entry encodingEntry, byte[] name, int p, int end) {
final DynamicObject rubyEncoding = newRubyEncoding(context, null, name, p, end, encodingEntry.isDummy());

assert ENCODING_LIST_BY_ENCODING_LIST_INDEX.size() == encodingEntry.getIndex();
Expand All @@ -96,7 +96,7 @@ public synchronized void defineEncoding(EncodingDB.Entry encodingEntry, byte[] n
}

@TruffleBoundary
public synchronized void defineAlias(int encodingListIndex, String name) {
public void defineAlias(int encodingListIndex, String name) {
final DynamicObject rubyEncoding = getRubyEncoding(encodingListIndex);

LOOKUP.put(name.toLowerCase(Locale.ENGLISH), rubyEncoding);
Expand Down

0 comments on commit 4222dc8

Please sign in to comment.