Commit bfd4cf6

committed

VisualSortArray: Changed two counter variables to have less concurrency overhead.

1 parent f6345e8 commit bfd4cf6Copy full SHA for bfd4cf6

File tree

1 file changed

+10

-10

lines changed

src/io/nayuki/sortalgodemo/visual
- VisualSortArray.java

1 file changed

+10

-10

lines changed

`‎src/io/nayuki/sortalgodemo/visual/VisualSortArray.java‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`
`27`	`27`	`import java.util.Arrays;`
`28`	`28`	`import java.util.Objects;`
	`29`	`+import java.util.concurrent.atomic.AtomicLong;`
`29`	`30`	`import io.nayuki.sortalgodemo.core.AbstractSortArray;`
`30`	`31`
`31`	`32`
`@@ -44,8 +45,8 @@ final class VisualSortArray extends AbstractSortArray {`
`44`	`45`	`private volatile boolean isDone;`
`45`	`46`
`46`	`47`	`// Statistics`
`47`		`- private volatilelongcomparisonCount;`
`48`		`- private volatilelongswapCount;`
	`48`	`+ private AtomicLongcomparisonCount = newAtomicLong();`
	`49`	`+ private AtomicLongswapCount = newAtomicLong();`
`49`	`50`
`50`	`51`	`// Speed regulation`
`51`	`52`	`private final double stepsPerSecond;`
`@@ -68,18 +69,17 @@ public VisualSortArray(int size, double speed) {`
`68`	`69`	`stepsPerSecond = speed;`
`69`	`70`	`stepsPerCheck = (int)Math.max(Math.min(stepsPerSecond * CHECK_INTERVAL_NS / 1e9, 1_000_000), 1);`
`70`	`71`	`state = new int[size];`
`71`		`-`
`72`		`- // Initialize various numbers`
`73`		`- comparisonCount = 0;`
`74`		`- swapCount = 0;`
`75`	`72`	`}`
`76`	`73`
`77`	`74`
`78`	`75`	`public void finishInitialization() {`
`79`	`76`	`if (isInitialized)`
`80`	`77`	`throw new IllegalStateException();`
`81`	`78`	`isInitialized = true;`
	`79`	`+`
`82`	`80`	`isDone = false;`
	`81`	`+ comparisonCount.set(0);`
	`82`	`+ swapCount.set(0);`
`83`	`83`
`84`	`84`	`stepsRemaining = stepsPerCheck;`
`85`	`85`	`prevCheckTimeNs = System.nanoTime();`
`@@ -98,7 +98,7 @@ public int compare(int i, int j) {`
`98`	`98`	`setElement(i, ElementState.COMPARING);`
`99`	`99`	`setElement(j, ElementState.COMPARING);`
`100`	`100`	`regulateSpeed();`
`101`		`- comparisonCount++;`
	`101`	`+ comparisonCount.setOpaque(comparisonCount.getPlain() + 1);`
`102`	`102`
`103`	`103`	`setElement(i, ElementState.ACTIVE);`
`104`	`104`	`setElement(j, ElementState.ACTIVE);`
`@@ -113,7 +113,7 @@ public void swap(int i, int j) {`
`113`	`113`	`return;`
`114`	`114`	`if (Thread.interrupted())`
`115`	`115`	`throw new StopException();`
`116`		`- swapCount++;`
	`116`	`+ swapCount.setOpaque(swapCount.getPlain() + 1);`
`117`	`117`	`setElement(i, ElementState.ACTIVE);`
`118`	`118`	`setElement(j, ElementState.ACTIVE);`
`119`	`119`	`regulateSpeed();`
`@@ -147,11 +147,11 @@ public int getState(int index) {`
`147`	`147`	`/* After sorting */`
`148`	`148`
`149`	`149`	`public long getComparisonCount() {`
`150`		`- return comparisonCount;`
	`150`	`+ return comparisonCount.getOpaque();`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public long getSwapCount() {`
`154`		`- return swapCount;`
	`154`	`+ return swapCount.getOpaque();`
`155`	`155`	`}`
`156`	`156`
`157`	`157`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit bfd4cf6

File tree

1 file changed

1 file changed

`‎src/io/nayuki/sortalgodemo/visual/VisualSortArray.java‎`

0 commit comments