Skip to content

Reorder start() and subscribe() for possible thread race #404

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

Merged
cogmission merged 1 commit into from
Mar 26, 2016
Merged

Reorder start() and subscribe() for possible thread race #404

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
1 change: 1 addition & 0 deletions src/main/java/org/numenta/nupic/network/sensor/BatchedCsvStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,7 @@ public static void main(String[] args) {
"7/2/10 19:00,38.2",
"7/2/10 20:00,14.1");

@SuppressWarnings("resource")
BatchedCsvStream<String> csv = new BatchedCsvStream<>(stream, 3);
System.out.println("Header: " + csv.getHeader());
csv.continuation(false).forEach(l -> System.out.println("line: " + Arrays.toString(l)));
Expand Down
26 changes: 13 additions & 13 deletions src/test/java/org/numenta/nupic/network/LayerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@ public void testHalt() {
final Layer<int[]> l = new Layer<>(n);
l.add(htmSensor);

l.start();

l.subscribe(new Observer<Inference>() {
@Override public void onCompleted() {
assertTrue(l.isHalted());
Expand All @@ -225,6 +223,8 @@ public void testHalt() {
@Override public void onError(Throwable e) { e.printStackTrace(); }
@Override public void onNext(Inference output) {}
});

l.start();

try {
l.halt();
Expand Down Expand Up @@ -255,8 +255,6 @@ public void testReset() {
final Layer<int[]> l = new Layer<>(n);
l.add(htmSensor);

l.start();

l.subscribe(new Observer<Inference>() {
@Override public void onCompleted() {}
@Override public void onError(Throwable e) { e.printStackTrace(); }
Expand All @@ -266,6 +264,8 @@ public void testReset() {
}
}
});

l.start();

try {
l.getLayerThread().join();
Expand Down Expand Up @@ -295,8 +295,6 @@ public void testSequenceChangeReset() {
final Layer<int[]> l = new Layer<>(n);
l.add(htmSensor);

l.start();

l.subscribe(new Observer<Inference>() {
@Override public void onCompleted() {}
@Override public void onError(Throwable e) { e.printStackTrace(); }
Expand All @@ -306,6 +304,8 @@ public void testSequenceChangeReset() {
}
}
});

l.start();

try {
l.getLayerThread().join();
Expand Down Expand Up @@ -340,8 +340,6 @@ public void testLayerWithObservableInput() {
final Layer<int[]> l = new Layer<>(n);
l.add(htmSensor);

l.start();

l.subscribe(new Observer<Inference>() {
int idx = 0;
@Override public void onCompleted() {}
Expand All @@ -358,6 +356,8 @@ public void testLayerWithObservableInput() {
++idx;
}
});

l.start();

try {
String[] entries = {
Expand Down Expand Up @@ -401,8 +401,6 @@ public void testLayerWithObservableInputIntegerArray() {
final Layer<int[]> l = new Layer<>(n);
l.add(htmSensor);

l.start();

String input = "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, "
+ "1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, "
+ "0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "
Expand Down Expand Up @@ -431,6 +429,8 @@ public void testLayerWithObservableInputIntegerArray() {
assertEquals(input, Arrays.toString((int[])output.getLayerInput()));
}
});

l.start();

try {
String[] entries = {
Expand Down Expand Up @@ -1456,7 +1456,7 @@ public void isClosedAddSensorTest() {
p = p.union(NetworkTestHarness.getNetworkDemoTestEncoderParams());
p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42));

Layer l = Network.createLayer("l", p);
Layer<?> l = Network.createLayer("l", p);
l.close();

Sensor<File> sensor = Sensor.create(
Expand All @@ -1472,7 +1472,7 @@ public void isClosedAddMultiEncoderTest() {
p = p.union(NetworkTestHarness.getNetworkDemoTestEncoderParams());
p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42));

Layer l = Network.createLayer("l", p);
Layer<?> l = Network.createLayer("l", p);
l.close();

l.add(MultiEncoder.builder().name("").build());
Expand All @@ -1484,7 +1484,7 @@ public void isClosedAddSpatialPoolerTest() {
p = p.union(NetworkTestHarness.getNetworkDemoTestEncoderParams());
p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42));

Layer l = Network.createLayer("l", p);
Layer<?> l = Network.createLayer("l", p);
l.close();

l.add(new SpatialPooler());
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/numenta/nupic/network/NetworkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,11 +940,11 @@ public void closeTest() {
p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42));

Region region1 = Network.createRegion("region1");
Layer layer1 = Network.createLayer("layer1", p);
Layer<?> layer1 = Network.createLayer("layer1", p);
region1.add(layer1);

Region region2 = Network.createRegion("region2");
Layer layer2 = Network.createLayer("layer2", p);
Layer<?> layer2 = Network.createLayer("layer2", p);
region2.add(layer2);

Network network = Network.create("test network", p);
Expand Down