Skip to content

Commit ad221d9

Browse files
vaclavvaclav
committed
Moved groups
1 parent df7b55c commit ad221d9

File tree

57 files changed

+104
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+104
-88
lines changed

‎grails-doc/src/guide/5.2 Special Actors.gdoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ h3. Reactive Actor
8383
The _ReactiveActor_ class, constructed typically by calling _Actors.reactor()_ or _DefaultPGroup.reactor()_, allow for more event-driven like approach. When a reactive actor receives a message, the supplied block of code, which makes up the reactive actor's body, is run with the message as a parameter. The result returned from the code is sent in reply.
8484

8585
{code}
86-
import groovyx.gpars.actor.DefaultPGroup
86+
import groovyx.gpars.group.DefaultPGroup
8787

8888
final def group = new DefaultPGroup()
8989

@@ -115,7 +115,7 @@ Here's an example of an actor, which submits a batch of numbers to a _ReactiveAc
115115

116116
{code}
117117
import groovyx.gpars.actor.Actor
118-
import groovyx.gpars.actor.dActors
118+
import groovyx.gpars.actor.Actors
119119

120120
final def doubler = Actors.reactor {
121121
2 * it

‎grails-doc/src/guide/5.4 Classic Examples using Actors.gdoc

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ h2. Sleeping Barber
1111

1212
"Problem description":http://en.wikipedia.org/wiki/Sleeping_barber_problem
1313

14-
{code}import groovyx.gpars.actor.DefaultPGroup
14+
{code}import groovyx.gpars.group.DefaultPGroup
1515
import groovyx.gpars.actor.AbstractPooledActor
16+
import groovyx.gpars.group.DefaultPGroup
1617
import groovyx.gpars.actor.Actor
1718

1819
final def group = new DefaultPGroup()

‎grails-doc/src/guide/7.1 Dataflow tasks.gdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Dataflow tasks can be organized into groups to allow for performance fine-tuning
5656
to create tasks attached to the groups.
5757

5858
{code}
59-
import groovyx.gpars.actor.DefaultPGroup
59+
import groovyx.gpars.group.DefaultPGroup
6060

6161
def group = new DefaultPGroup()
6262

‎grails-doc/src/guide/7.2 Dataflow operators.gdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Dataflow operators can be organized into groups to allow for performance fine-tu
8686
to create tasks attached to the groups.
8787

8888
{code}
89-
import groovyx.gpars.actor.DefaultPGroup
89+
import groovyx.gpars.group.DefaultPGroup
9090

9191
def group = new DefaultPGroup()
9292

‎src/main/groovy/groovyx/gpars/actor/Actors.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package groovyx.gpars.actor
1818

1919
import groovyx.gpars.scheduler.ResizeablePool
20+
import groovyx.gpars.group.DefaultPGroup
2021

2122
/**
2223
* Provides handy helper methods to create pooled actors and customize the underlying thread pool.

‎src/main/groovy/groovyx/gpars/actor/impl/SequentialProcessingActor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import groovy.lang.GroovyRuntimeException;
2121
import groovy.time.Duration;
2222
import groovyx.gpars.actor.Actor;
23-
import groovyx.gpars.actor.PGroup;
23+
import groovyx.gpars.group.PGroup;
2424
import groovyx.gpars.actor.ActorMessage;
2525
import groovyx.gpars.actor.Actors;
2626
import org.codehaus.groovy.runtime.CurriedClosure;

‎src/main/groovy/groovyx/gpars/agent/AgentCore.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.agent;
1818

19-
import groovyx.gpars.actor.PGroup;
19+
import groovyx.gpars.group.PGroup;
2020
import groovyx.gpars.actor.Actors;
2121
import groovyx.gpars.scheduler.Pool;
2222
import org.codehaus.groovy.runtime.NullObject;

‎src/main/groovy/groovyx/gpars/dataflow/DataFlowPGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.dataflow;
1818

19-
import groovyx.gpars.actor.PGroup;
19+
import groovyx.gpars.group.PGroup;
2020
import groovyx.gpars.scheduler.ResizeablePool;
2121

2222
/**

‎src/main/groovy/groovyx/gpars/dataflow/operator/DataFlowOperator.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package groovyx.gpars.dataflow.operator
1818

1919
import groovyx.gpars.actor.AbstractPooledActor
20-
import groovyx.gpars.actor.PGroup
20+
import groovyx.gpars.group.PGroup
2121
import java.util.concurrent.Semaphore
2222

2323
/**

‎src/main/groovy/groovyx/gpars/actor/ActorGroup.groovy ‎src/main/groovy/groovyx/gpars/group/ActorGroup.groovy

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17-
package groovyx.gpars.actor
17+
package groovyx.gpars.group
1818

1919
import groovyx.gpars.actor.impl.RunnableBackedPooledActor
2020
import groovyx.gpars.agent.Safe
2121
import groovyx.gpars.dataflow.operator.DataFlowOperator
2222
import groovyx.gpars.scheduler.Pool
23+
import groovyx.gpars.actor.AbstractPooledActor
24+
import groovyx.gpars.actor.ReactiveActor
25+
import groovyx.gpars.actor.DynamicDispatchActor
2326

2427
/**
2528
* Provides a common super class of pooled actor groups.

‎src/main/groovy/groovyx/gpars/actor/DefaultPGroup.groovy ‎src/main/groovy/groovyx/gpars/group/DefaultPGroup.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17-
package groovyx.gpars.actor
17+
package groovyx.gpars.group
1818

1919
import groovyx.gpars.scheduler.DefaultPool
2020
import groovyx.gpars.scheduler.Pool

‎src/main/groovy/groovyx/gpars/actor/NonDaemonPGroup.groovy ‎src/main/groovy/groovyx/gpars/group/NonDaemonPGroup.groovy

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17-
package groovyx.gpars.actor
17+
package groovyx.gpars.group
1818

1919
import groovyx.gpars.scheduler.DefaultPool
20-
import groovyx.gpars.scheduler.Pool
2120

2221
/**
2322
* Provides logical grouping for actors, agents and dataflow tasks and operators. Each group has an underlying thread pool, which will perform actions

‎src/main/groovy/groovyx/gpars/remote/LocalNode.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import groovy.lang.Closure;
2020
import groovyx.gpars.actor.Actor;
21-
import groovyx.gpars.actor.DefaultPGroup;
22-
import groovyx.gpars.actor.PGroup;
21+
import groovyx.gpars.group.DefaultPGroup;
22+
import groovyx.gpars.group.PGroup;
2323
import groovyx.gpars.scheduler.DefaultPool;
2424
import groovyx.gpars.scheduler.Pool;
2525
import groovyx.gpars.serial.SerialHandles;

‎src/test/groovy/groovyx/gpars/actor/blocking/ArraySumTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package groovyx.gpars.actor.blocking
1818

1919
import groovyx.gpars.actor.AbstractPooledActor
2020
import groovyx.gpars.actor.Actor
21-
import groovyx.gpars.actor.PGroup
22-
import groovyx.gpars.actor.DefaultPGroup
21+
import groovyx.gpars.group.PGroup
22+
import groovyx.gpars.group.DefaultPGroup
2323
import java.util.concurrent.CountDownLatch
2424
import java.util.concurrent.TimeUnit
2525
import java.util.concurrent.atomic.AtomicInteger

‎src/test/groovy/groovyx/gpars/actor/blocking/MergeSortTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package groovyx.gpars.actor.blocking
1818

1919
import groovyx.gpars.actor.Actors
20-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import groovyx.gpars.scheduler.ResizeablePool
2222
import java.util.concurrent.CountDownLatch
2323
import java.util.concurrent.TimeUnit

‎src/test/groovy/groovyx/gpars/actor/blocking/MultiMessageTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package groovyx.gpars.actor.blocking
1818

1919
import groovyx.gpars.actor.Actor
2020
import groovyx.gpars.actor.Actors
21-
import groovyx.gpars.actor.DefaultPGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import java.util.concurrent.CountDownLatch
2323
import java.util.concurrent.CyclicBarrier
2424
import java.util.concurrent.TimeUnit

‎src/test/groovy/groovyx/gpars/actor/blocking/NestedClosureTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package groovyx.gpars.actor.blocking
1818

1919
import groovyx.gpars.actor.Actor
20-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import groovyx.gpars.dataflow.DataFlowVariable
2222

2323
public class NestedClosureTest extends GroovyTestCase {

‎src/test/groovy/groovyx/gpars/actor/blocking/ReplyTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package groovyx.gpars.actor.blocking
1818

1919
import groovyx.gpars.actor.Actor
2020
import groovyx.gpars.actor.Actors
21-
import groovyx.gpars.actor.DefaultPGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import groovyx.gpars.actor.impl.ActorReplyException
2323
import groovyx.gpars.dataflow.DataFlowVariable
2424
import java.util.concurrent.CountDownLatch

‎src/test/groovy/groovyx/gpars/actor/blocking/SendAndWaitTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package groovyx.gpars.actor.blocking
1818

1919
import groovyx.gpars.actor.Actor
2020
import groovyx.gpars.actor.Actors
21-
import groovyx.gpars.actor.DefaultPGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import java.util.concurrent.CountDownLatch
2323
import java.util.concurrent.CyclicBarrier
2424
import java.util.concurrent.TimeUnit

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/DynamicDispatchActorTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package groovyx.gpars.actor.nonBlocking
1919
import groovyx.gpars.actor.Actor
2020
import groovyx.gpars.actor.Actors
2121
import groovyx.gpars.actor.DynamicDispatchActor
22-
import groovyx.gpars.actor.DefaultPGroup
22+
import groovyx.gpars.group.DefaultPGroup
2323
import org.codehaus.groovy.runtime.NullObject
2424

2525
public class DynamicDispatchActorTest extends GroovyTestCase {

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/LifeCycleTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.AbstractPooledActor
20-
import groovyx.gpars.actor.PGroup
21-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.PGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import groovyx.gpars.dataflow.DataFlows
2323
import java.util.concurrent.CountDownLatch
2424
import java.util.concurrent.CyclicBarrier

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/LifecycleErrorTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.AbstractPooledActor
20-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import java.util.concurrent.CountDownLatch
2222
import java.util.concurrent.TimeUnit
2323

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/LoopTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.AbstractPooledActor
20-
import groovyx.gpars.actor.PGroup
21-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.PGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import java.util.concurrent.CyclicBarrier
2323
import java.util.concurrent.atomic.AtomicInteger
2424
import java.util.concurrent.atomic.AtomicReference

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/MessagingTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.AbstractPooledActor
20-
import groovyx.gpars.actor.PGroup
21-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.PGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import java.util.concurrent.CyclicBarrier
2323
import java.util.concurrent.atomic.AtomicInteger
2424

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/MultiMessageTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.Actor
2020
import groovyx.gpars.actor.Actors
21-
import groovyx.gpars.actor.DefaultPGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import java.util.concurrent.CountDownLatch
2323
import java.util.concurrent.CyclicBarrier
2424
import java.util.concurrent.TimeUnit

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/NestedClosureTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.actor.nonBlocking
1818

19-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.DefaultPGroup
2020
import groovyx.gpars.dataflow.DataFlowVariable
2121

2222
public class NestedClosureTest extends GroovyTestCase {

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/PooledMergeSortTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package groovyx.gpars.actor.nonBlocking
1818

19-
import groovyx.gpars.actor.PGroup
20-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.PGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import java.util.concurrent.CountDownLatch
2222
import java.util.concurrent.TimeUnit
2323

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/ReactorTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.Actors
20-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import groovyx.gpars.actor.ReactiveActor
2222
import java.util.concurrent.CountDownLatch
2323
import java.util.concurrent.TimeUnit

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/SendAndWaitTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.Actor
2020
import groovyx.gpars.actor.Actors
21-
import groovyx.gpars.actor.DefaultPGroup
21+
import groovyx.gpars.group.DefaultPGroup
2222
import java.util.concurrent.CountDownLatch
2323
import java.util.concurrent.CyclicBarrier
2424
import java.util.concurrent.TimeUnit

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/SharedMemoryTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package groovyx.gpars.actor.nonBlocking
1818

1919
import groovyx.gpars.actor.Actor
20-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import java.util.concurrent.CountDownLatch
2222

2323
public class SharedMemoryTest extends GroovyTestCase {

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/SingleThreadLoopTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.actor.nonBlocking
1818

19-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.DefaultPGroup
2020

2121
/**
2222
*

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/SingleThreadedLifeCycleTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.actor.nonBlocking
1818

19-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.DefaultPGroup
2020

2121
/**
2222
*

‎src/test/groovy/groovyx/gpars/actor/nonBlocking/SingleThreadedMessagingTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.actor.nonBlocking
1818

19-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.DefaultPGroup
2020

2121
/**
2222
*

‎src/test/groovy/groovyx/gpars/benchmark/BenchmarkActors.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package groovyx.gpars.benchmark
22

3-
import groovyx.gpars.actor.DefaultPGroup
3+
import groovyx.gpars.group.DefaultPGroup
44

55
class Foo {
66
static final def iterations = 4000000

‎src/test/groovy/groovyx/gpars/benchmark/BenchmarkActors2.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package groovyx.gpars.benchmark
66
* Copyright © 2009 Russel Winder. All rights reserved.
77
*/
88

9-
import groovyx.gpars.actor.DefaultPGroup
9+
import groovyx.gpars.group.DefaultPGroup
1010

1111
def execute(int actorCount) {
1212
final long n = 100000000l // 10 times fewer due to speed issues.

‎src/test/groovy/groovyx/gpars/dataflow/operator/DataFlowOperatorTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.dataflow.operator
1818

19-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.DefaultPGroup
2020
import groovyx.gpars.dataflow.DataFlow
2121
import groovyx.gpars.dataflow.DataFlowStream
2222
import groovyx.gpars.dataflow.DataFlowVariable

‎src/test/groovy/groovyx/gpars/dataflow/operator/InternallyParallelDataFlowOperatorTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package groovyx.gpars.dataflow.operator
1818

19-
import groovyx.gpars.actor.DefaultPGroup
19+
import groovyx.gpars.group.DefaultPGroup
2020
import groovyx.gpars.dataflow.DataFlow
2121
import groovyx.gpars.dataflow.DataFlowStream
2222
import groovyx.gpars.dataflow.DataFlowVariable

‎src/test/groovy/groovyx/gpars/actor/groups/FJGroupTest.groovy ‎src/test/groovy/groovyx/gpars/groups/FJGroupTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17-
package groovyx.gpars.actor.groups
17+
package groovyx.gpars.groups
1818

1919
import groovyx.gpars.actor.Actor
20-
import groovyx.gpars.actor.DefaultPGroup
20+
import groovyx.gpars.group.DefaultPGroup
2121
import groovyx.gpars.scheduler.DefaultPool
2222
import groovyx.gpars.scheduler.FJPool
2323
import java.util.concurrent.CountDownLatch

0 commit comments

Comments
 (0)