introduce locking mechanism for SeqStorage

qunaibit · qunaibit · commit 990d6526a55d · 2020-06-08T11:32:33.000-07:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java
@@ -40,9 +40,20 @@ public final int length() {
 
     @Override
     public void setNewLength(int length) {
+        checkLock();
         this.length = length;
     }
 
+    protected final void incLength() {
+        checkLock();
+        this.length++;
+    }
+
+    protected final void decLength() {
+        checkLock();
+        this.length--;
+    }
+
     public final int capacity() {
         return capacity;
     }
@@ -76,4 +87,5 @@ public void ensureCapacity(int newCapacity) throws ArithmeticException {
     public void minimizeCapacity() {
         capacity = length;
     }
+
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java
@@ -136,7 +136,7 @@ public void insertIntItem(int idx, int value) {
         }
 
         values[idx] = value;
-        length++;
+        incLength();
     }
 
     @Override
@@ -166,7 +166,7 @@ public void setIntSliceInBound(int start, int stop, int step, IntSequenceStorage
         // range is the whole sequence?
         if (sameLengthProfile.profile(start == 0 && stop == length && step == 1)) {
             values = Arrays.copyOf(sequence.values, otherLength);
-            length = otherLength;
+            setNewLength(length);
             minimizeCapacity();
             return;
         }
@@ -177,12 +177,12 @@ public void setIntSliceInBound(int start, int stop, int step, IntSequenceStorage
             values[i] = sequence.values[j];
         }
 
-        length = length > stop ? length : stop;
+        setNewLength(length > stop ? length : stop);
     }
 
     public int popInt() {
         int pop = values[length - 1];
-        length--;
+        decLength();
         return pop;
     }
 
@@ -199,7 +199,7 @@ public int indexOfInt(int value) {
     public void appendInt(int value) {
         ensureCapacity(length + 1);
         values[length] = value;
-        length++;
+        incLength();
     }
 
     public void extendWithIntStorage(IntSequenceStorage other) {
@@ -211,7 +211,7 @@ public void extendWithIntStorage(IntSequenceStorage other) {
             values[i] = otherValues[j];
         }
 
-        length = extendedLength;
+        setNewLength(extendedLength);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java
@@ -146,7 +146,7 @@ public void insertLongItem(int idx, long value) {
         }
 
         values[idx] = value;
-        length++;
+        incLength();
     }
 
     @Override
@@ -176,7 +176,7 @@ public void setLongSliceInBound(int start, int stop, int step, LongSequenceStora
         // range is the whole sequence?
         if (sameLengthProfile.profile(start == 0 && stop == length)) {
             values = Arrays.copyOf(sequence.values, otherLength);
-            length = otherLength;
+            setNewLength(otherLength);
             minimizeCapacity();
             return;
         }
@@ -187,12 +187,12 @@ public void setLongSliceInBound(int start, int stop, int step, LongSequenceStora
             values[i] = sequence.values[j];
         }
 
-        length = length > stop ? length : stop;
+        setNewLength(length > stop ? length : stop);
     }
 
     public long popLong() {
         long pop = values[length - 1];
-        length--;
+        decLength();
         return pop;
     }
 
@@ -209,7 +209,7 @@ public int indexOfLong(long value) {
     public void appendLong(long value) {
         ensureCapacity(length + 1);
         values[length] = value;
-        length++;
+        incLength();
     }
 
     public void extendWithLongStorage(LongSequenceStorage other) {
@@ -221,7 +221,7 @@ public void extendWithLongStorage(LongSequenceStorage other) {
             values[i] = otherValues[j];
         }
 
-        length = extendedLength;
+        setNewLength(extendedLength);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java
@@ -72,7 +72,7 @@ public void insertItem(int idx, Object value) {
         }
 
         values[idx] = value;
-        length++;
+        incLength();
     }
 
     @Override
@@ -102,7 +102,7 @@ public void setObjectSliceInBound(int start, int stop, int step, ObjectSequenceS
         // range is the whole sequence?
         if (sameLengthProfile.profile(start == 0 && stop == length && step == 1)) {
             values = Arrays.copyOf(sequence.values, otherLength);
-            length = otherLength;
+            setNewLength(otherLength);
             minimizeCapacity();
             return;
         }
@@ -113,7 +113,7 @@ public void setObjectSliceInBound(int start, int stop, int step, ObjectSequenceS
             values[i] = sequence.values[j];
         }
 
-        length = length > stop ? length : stop;
+        setNewLength(length > stop ? length : stop);
     }
 
     @Override
@@ -150,7 +150,7 @@ public void increaseCapacityExact(int newCapacity) {
 
     public Object popObject() {
         Object pop = values[length - 1];
-        length--;
+        decLength();
         return pop;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java
@@ -25,8 +25,17 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+
 public abstract class SequenceStorage {
 
+    // Mutations lock
+    protected boolean lock;
+    @CompilationFinal private boolean lockingEnabled = false;
+
     public enum ListStorageType {
         Uninitialized,
         Empty,
@@ -62,6 +71,26 @@ public boolean generalizesFrom(ListStorageType other) {
         }
     }
 
+    public final void setLock() {
+        if (!lockingEnabled) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            lockingEnabled = true;
+        }
+        this.lock = true;
+    }
+
+    public final void releaseLock() {
+        this.lock = false;
+    }
+
+    protected final void checkLock() {
+        if (lockingEnabled) {
+            if (lock) {
+                PRaiseNode.getUncached().raise(PythonBuiltinClassType.ValueError);
+            }
+        }
+    }
+
     public abstract int length();
 
     public abstract void setNewLength(int length);

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,20 @@ public final int length() {`
`40`	`40`
`41`	`41`	`@Override`
`42`	`42`	`public void setNewLength(int length) {`
	`43`	`+ checkLock();`
`43`	`44`	`this.length = length;`
`44`	`45`	`}`
`45`	`46`
	`47`	`+ protected final void incLength() {`
	`48`	`+ checkLock();`
	`49`	`+ this.length++;`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ protected final void decLength() {`
	`53`	`+ checkLock();`
	`54`	`+ this.length--;`
	`55`	`+ }`
	`56`	`+`
`46`	`57`	`public final int capacity() {`
`47`	`58`	`return capacity;`
`48`	`59`	`}`
`@@ -76,4 +87,5 @@ public void ensureCapacity(int newCapacity) throws ArithmeticException {`
`76`	`87`	`public void minimizeCapacity() {`
`77`	`88`	`capacity = length;`
`78`	`89`	`}`
	`90`	`+`
`79`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public void insertIntItem(int idx, int value) {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`values[idx] = value;`
`139`		`- length++;`
	`139`	`+ incLength();`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`@Override`
`@@ -166,7 +166,7 @@ public void setIntSliceInBound(int start, int stop, int step, IntSequenceStorage`
`166`	`166`	`// range is the whole sequence?`
`167`	`167`	`if (sameLengthProfile.profile(start == 0 && stop == length && step == 1)) {`
`168`	`168`	`values = Arrays.copyOf(sequence.values, otherLength);`
`169`		`- length = otherLength;`
	`169`	`+ setNewLength(length);`
`170`	`170`	`minimizeCapacity();`
`171`	`171`	`return;`
`172`	`172`	`}`
`@@ -177,12 +177,12 @@ public void setIntSliceInBound(int start, int stop, int step, IntSequenceStorage`
`177`	`177`	`values[i] = sequence.values[j];`
`178`	`178`	`}`
`179`	`179`
`180`		`- length = length > stop ? length : stop;`
	`180`	`+ setNewLength(length > stop ? length : stop);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public int popInt() {`
`184`	`184`	`int pop = values[length - 1];`
`185`		`- length--;`
	`185`	`+ decLength();`
`186`	`186`	`return pop;`
`187`	`187`	`}`
`188`	`188`
`@@ -199,7 +199,7 @@ public int indexOfInt(int value) {`
`199`	`199`	`public void appendInt(int value) {`
`200`	`200`	`ensureCapacity(length + 1);`
`201`	`201`	`values[length] = value;`
`202`		`- length++;`
	`202`	`+ incLength();`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`public void extendWithIntStorage(IntSequenceStorage other) {`
`@@ -211,7 +211,7 @@ public void extendWithIntStorage(IntSequenceStorage other) {`
`211`	`211`	`values[i] = otherValues[j];`
`212`	`212`	`}`
`213`	`213`
`214`		`- length = extendedLength;`
	`214`	`+ setNewLength(extendedLength);`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public void insertLongItem(int idx, long value) {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`values[idx] = value;`
`149`		`- length++;`
	`149`	`+ incLength();`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`@Override`
`@@ -176,7 +176,7 @@ public void setLongSliceInBound(int start, int stop, int step, LongSequenceStora`
`176`	`176`	`// range is the whole sequence?`
`177`	`177`	`if (sameLengthProfile.profile(start == 0 && stop == length)) {`
`178`	`178`	`values = Arrays.copyOf(sequence.values, otherLength);`
`179`		`- length = otherLength;`
	`179`	`+ setNewLength(otherLength);`
`180`	`180`	`minimizeCapacity();`
`181`	`181`	`return;`
`182`	`182`	`}`
`@@ -187,12 +187,12 @@ public void setLongSliceInBound(int start, int stop, int step, LongSequenceStora`
`187`	`187`	`values[i] = sequence.values[j];`
`188`	`188`	`}`
`189`	`189`
`190`		`- length = length > stop ? length : stop;`
	`190`	`+ setNewLength(length > stop ? length : stop);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`public long popLong() {`
`194`	`194`	`long pop = values[length - 1];`
`195`		`- length--;`
	`195`	`+ decLength();`
`196`	`196`	`return pop;`
`197`	`197`	`}`
`198`	`198`
`@@ -209,7 +209,7 @@ public int indexOfLong(long value) {`
`209`	`209`	`public void appendLong(long value) {`
`210`	`210`	`ensureCapacity(length + 1);`
`211`	`211`	`values[length] = value;`
`212`		`- length++;`
	`212`	`+ incLength();`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`public void extendWithLongStorage(LongSequenceStorage other) {`
`@@ -221,7 +221,7 @@ public void extendWithLongStorage(LongSequenceStorage other) {`
`221`	`221`	`values[i] = otherValues[j];`
`222`	`222`	`}`
`223`	`223`
`224`		`- length = extendedLength;`
	`224`	`+ setNewLength(extendedLength);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void insertItem(int idx, Object value) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`values[idx] = value;`
`75`		`- length++;`
	`75`	`+ incLength();`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Override`
`@@ -102,7 +102,7 @@ public void setObjectSliceInBound(int start, int stop, int step, ObjectSequenceS`
`102`	`102`	`// range is the whole sequence?`
`103`	`103`	`if (sameLengthProfile.profile(start == 0 && stop == length && step == 1)) {`
`104`	`104`	`values = Arrays.copyOf(sequence.values, otherLength);`
`105`		`- length = otherLength;`
	`105`	`+ setNewLength(otherLength);`
`106`	`106`	`minimizeCapacity();`
`107`	`107`	`return;`
`108`	`108`	`}`
`@@ -113,7 +113,7 @@ public void setObjectSliceInBound(int start, int stop, int step, ObjectSequenceS`
`113`	`113`	`values[i] = sequence.values[j];`
`114`	`114`	`}`
`115`	`115`
`116`		`- length = length > stop ? length : stop;`
	`116`	`+ setNewLength(length > stop ? length : stop);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@Override`
`@@ -150,7 +150,7 @@ public void increaseCapacityExact(int newCapacity) {`
`150`	`150`
`151`	`151`	`public Object popObject() {`
`152`	`152`	`Object pop = values[length - 1];`
`153`		`- length--;`
	`153`	`+ decLength();`
`154`	`154`	`return pop;`
`155`	`155`	`}`
`156`	`156`