ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/ForkJoinWorkerThread.java
(Generate patch)

Comparing jsr166/src/jsr166e/ForkJoinWorkerThread.java (file contents):
Revision 1.3 by dl, Mon Nov 19 18:12:28 2012 UTC vs.
Revision 1.6 by jsr166, Sun Jan 18 20:17:33 2015 UTC

# Line 6 | Line 6
6  
7   package jsr166e;
8  
9 – import java.util.concurrent.atomic.AtomicInteger;
10 –
9   /**
10   * A thread managed by a {@link ForkJoinPool}, which executes
11   * {@link ForkJoinTask}s.
# Line 16 | Line 14 | import java.util.concurrent.atomic.Atomi
14   * scheduling or execution.  However, you can override initialization
15   * and termination methods surrounding the main task processing loop.
16   * If you do create such a subclass, you will also need to supply a
17 < * custom {@link ForkJoinPool.ForkJoinWorkerThreadFactory} to use it
18 < * in a {@code ForkJoinPool}.
17 > * custom {@link ForkJoinPool.ForkJoinWorkerThreadFactory} to
18 > * {@linkplain ForkJoinPool#ForkJoinPool use it} in a {@code ForkJoinPool}.
19   *
20   * @since 1.7
21   * @author Doug Lea
# Line 29 | Line 27 | public class ForkJoinWorkerThread extend
27       * of class ForkJoinPool.
28       *
29       * This class just maintains links to its pool and WorkQueue.  The
30 <     * pool field is set upon construction, but the workQueue field is
31 <     * not set until the thread has started (unless forced early by a
32 <     * subclass constructor call to poolIndex()).  This provides
33 <     * better memory placement (because this thread allocates queue
34 <     * and bookkeeping fields) but because the field is non-final, we
37 <     * require that it never be accessed except by the owning thread.
30 >     * pool field is set immediately upon construction, but the
31 >     * workQueue field is not set until a call to registerWorker
32 >     * completes. This leads to a visibility race, that is tolerated
33 >     * by requiring that the workQueue field is only accessed by the
34 >     * owning thread.
35       */
36  
37      final ForkJoinPool pool;                // the pool this thread works in
38 <    ForkJoinPool.WorkQueue workQueue;       // Work-stealing mechanics
42 <
43 <    /**
44 <     * Sequence number for creating worker Names
45 <     */
46 <    private static final AtomicInteger threadNumber = new AtomicInteger();
38 >    final ForkJoinPool.WorkQueue workQueue; // work-stealing mechanics
39  
40      /**
41       * Creates a ForkJoinWorkerThread operating in the given pool.
# Line 52 | Line 44 | public class ForkJoinWorkerThread extend
44       * @throws NullPointerException if pool is null
45       */
46      protected ForkJoinWorkerThread(ForkJoinPool pool) {
47 <        super(pool.workerNamePrefix.concat(Integer.toString(threadNumber.incrementAndGet())));
48 <        setDaemon(true);
47 >        // Use a placeholder until a useful name can be set in registerWorker
48 >        super("aForkJoinWorkerThread");
49          this.pool = pool;
50 <        Thread.UncaughtExceptionHandler ueh = pool.ueh;
59 <        if (ueh != null)
60 <            setUncaughtExceptionHandler(ueh);
50 >        this.workQueue = pool.registerWorker(this);
51      }
52  
53      /**
# Line 70 | Line 60 | public class ForkJoinWorkerThread extend
60      }
61  
62      /**
63 <     * Returns the index number of this thread in its pool.  The
64 <     * returned value ranges from zero to the maximum number of
65 <     * threads (minus one) that have ever been created in the pool.
66 <     * This method may be useful for applications that track status or
67 <     * collect results per-worker rather than per-task.
63 >     * Returns the unique index number of this thread in its pool.
64 >     * The returned value ranges from zero to the maximum number of
65 >     * threads (minus one) that may exist in the pool, and does not
66 >     * change during the lifetime of the thread.  This method may be
67 >     * useful for applications that track status or collect results
68 >     * per-worker-thread rather than per-task.
69       *
70       * @return the index number
71       */
72      public int getPoolIndex() {
73 <        // force early registration if called before started
83 <        ForkJoinPool.WorkQueue q;
84 <        if ((q = workQueue) == null) {
85 <            pool.registerWorker(this);
86 <            q = workQueue;
87 <        }
88 <        return q.poolIndex;
73 >        return workQueue.poolIndex >>> 1; // ignore odd/even tag bit
74      }
75  
76      /**
# Line 119 | Line 104 | public class ForkJoinWorkerThread extend
104      public void run() {
105          Throwable exception = null;
106          try {
122 –            pool.registerWorker(this);
107              onStart();
108              pool.runWorker(workQueue);
109          } catch (Throwable ex) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines