hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

minor refactoring

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@925 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Tom Copeland
2002-09-12 14:01:30 +00:00
parent ac61ff5d2d
commit 356279a78c
10 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmd-dcpd/etc/changelog.txt
View File

@ -1,3 +1,6 @@
???? 2002 - 0.3:
Faster still - now the workers can being working before all the batches are written to the space.
September 11 2001 - 0.2:
Much, much faster now. java.lang on my basic farm of 3 machines takes 21 minutes.

6
pmd-dcpd/src/net/sourceforge/pmd/dcpd/Batch.java
View File

@ -18,13 +18,13 @@ public class Batch implements Entry {
// payload
public List tileWrappers;
public Integer jobID;
public Job job;
public Integer sequenceID;
public Batch() {}
public Batch(Integer jobID, List tileWrappers, Integer isDone, Integer sequenceID) {
this.jobID = jobID;
public Batch(Job job, List tileWrappers, Integer isDone, Integer sequenceID) {
this.job = job;
this.tileWrappers = tileWrappers;
this.isDone = isDone;
this.sequenceID = sequenceID;

4
pmd-dcpd/src/net/sourceforge/pmd/dcpd/BatchBuilder.java
View File

@ -35,7 +35,7 @@ public class BatchBuilder {
currentBatchSize++;
if (wrappers.size() > maxBatchSize) {
Batch batch = new Batch(job.id, wrappers, Batch.NOT_DONE, new Integer(batches.size()));
Batch batch = new Batch(job, wrappers, Batch.NOT_DONE, new Integer(batches.size()));
batches.add(batch);
currentBatchSize = 0;
@ -44,7 +44,7 @@ public class BatchBuilder {
}
if (currentBatchSize > 0) {
Batch batch = new Batch(job.id, wrappers, Batch.NOT_DONE, new Integer(batches.size()));
Batch batch = new Batch(job, wrappers, Batch.NOT_DONE, new Integer(batches.size()));
batches.add(batch);
}

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPD.java
View File

@ -36,7 +36,7 @@ public class DCPD {
System.out.println("Tokenizing");
job = new Job("java_lang", new Integer(1));
tokenSetWrapper = new TokenSetsWrapper(loadTokens("C:\\j2sdk1.4.0_01\\src\\java\\lang", true), job.id);
tokenSetWrapper = new TokenSetsWrapper(loadTokens("C:\\j2sdk1.4.0_01\\src\\java\\lang\\ref", true), job);
System.out.println("Tokenizing complete, " + (System.currentTimeMillis()-start) + " elapsed ms");
System.out.println("Writing the TokenSetsWrapper to the space");

16
pmd-dcpd/src/net/sourceforge/pmd/dcpd/DCPDWorker.java
View File

@ -21,9 +21,8 @@ import java.util.*;
public class DCPDWorker {
private Job currentJob;
private TokenSetsWrapper tsw;
private JavaSpace space;
private Map jobs = new HashMap();
public DCPDWorker(JavaSpace space) {
try {
@ -42,14 +41,17 @@ public class DCPDWorker {
public void jobAdded(Job job) {
try {
currentJob = job;
System.out.println("Received a job " + currentJob.name + ", id is " + currentJob.id.intValue());
System.out.println("Received a job " + job.name + ", id is " + job.id.intValue());
if (!jobs.containsKey(job)) {
TokenSetsWrapper tsw = (TokenSetsWrapper)space.read(new TokenSetsWrapper(null, job), null, 100);
System.out.println("Read a TokenSetsWrapper with " + tsw.tokenSets.size() + " token lists");
jobs.put(job, tsw);
}
tsw = (TokenSetsWrapper)space.read(new TokenSetsWrapper(null, currentJob.id), null, 100);
System.out.println("Read a TokenSetsWrapper with " + tsw.tokenSets.size() + " token lists");
while (true) {
TileExpander te = new TileExpander(space, tsw);
TileExpander te = new TileExpander(space, jobs);
te.expandAvailableTiles();
Thread.currentThread().yield();
}

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/DGST.java
View File

@ -32,11 +32,11 @@ public class DGST {
public Results crunch(CPDListener listener) {
Occurrences occ = new Occurrences(tokenSets, listener);
try {
space.write(job, null, Lease.FOREVER);
BatchBuilder builder = new BatchBuilder(occ, job);
List batches = builder.buildBatches();
TilePlanter planter = new TilePlanter(space, job);
planter.plant(batches);
space.write(job, null, Lease.FOREVER);
expand(occ, batches.size());
System.out.println("Done");
} catch (Exception e) {

13
pmd-dcpd/src/net/sourceforge/pmd/dcpd/Job.java
View File

@ -17,4 +17,17 @@ public class Job implements Entry {
this.id = id;
this.name = name;
}
public boolean equals(Object o) {
Job other = (Job)o;
return other.id.equals(id);
}
public int hashCode() {
return id.hashCode();
}
public String toString() {
return id + ":" + name;
}
}

16
pmd-dcpd/src/net/sourceforge/pmd/dcpd/TileExpander.java
View File

@ -16,29 +16,31 @@ import java.rmi.RemoteException;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
public class TileExpander {
private JavaSpace space;
private TokenSetsWrapper tsw;
private Map jobs;
public TileExpander(JavaSpace space, TokenSetsWrapper tsw) {
public TileExpander(JavaSpace space, Map jobs) {
this.space = space;
this.tsw = tsw;
this.jobs = jobs;
}
public void expandAvailableTiles() throws RemoteException, UnusableEntryException, TransactionException, InterruptedException{
Entry twQuery = space.snapshot(new Batch(tsw.jobID, null, Batch.NOT_DONE, null));
Entry twQuery = space.snapshot(new Batch(null, null, Batch.NOT_DONE, null));
Batch batch = null;
int total = 0;
while ((batch = (Batch)space.take(twQuery, null, 250)) != null) {
TokenSetsWrapper tsw = (TokenSetsWrapper)jobs.get(batch.job);
total++;
List wrappers = new ArrayList();
for (int j=0; j<batch.tileWrappers.size(); j++) {
TileWrapper tileWrapperToExpand = (TileWrapper)batch.tileWrappers.get(j);
//System.out.println("Expanding " + tileWrapperToExpand.tile.getImage());
Occurrences results = expand(tileWrapperToExpand, j);
Occurrences results = expand(tsw, tileWrapperToExpand, j);
int expansionIndex = 0;
for (Iterator i = results.getTiles();i.hasNext();) {
Tile tile = (Tile)i.next();
@ -48,13 +50,13 @@ public class TileExpander {
expansionIndex++;
}
}
Batch batchToWrite = new Batch(tsw.jobID, wrappers, Batch.DONE, batch.sequenceID);
Batch batchToWrite = new Batch(batch.job, wrappers, Batch.DONE, batch.sequenceID);
space.write(batchToWrite, null, Lease.FOREVER);
}
if (total>0) System.out.println("Expanded " + total + " tiles");
}
private Occurrences expand(TileWrapper tileWrapper, int sequenceID) throws RemoteException, UnusableEntryException, TransactionException, InterruptedException{
private Occurrences expand(TokenSetsWrapper tsw, TileWrapper tileWrapper, int sequenceID) throws RemoteException, UnusableEntryException, TransactionException, InterruptedException{
Occurrences newOcc = new Occurrences(new CPDNullListener());
for (Iterator i = tileWrapper.occurrences.iterator(); i.hasNext();) {
TokenEntry tok = (TokenEntry)i.next();

2
pmd-dcpd/src/net/sourceforge/pmd/dcpd/TileHarvester.java
View File

@ -29,7 +29,7 @@ public class TileHarvester {
public Occurrences harvest(int batchesToHarvest) throws RemoteException, UnusableEntryException, TransactionException, InterruptedException {
Occurrences occ = new Occurrences(new CPDNullListener());
for (int i=0;i<batchesToHarvest; i++) {
Batch batch = (Batch)space.take(new Batch(job.id, null, Batch.DONE, new Integer(i)), null, Lease.FOREVER);
Batch batch = (Batch)space.take(new Batch(job, null, Batch.DONE, new Integer(i)), null, Lease.FOREVER);
for (int j=0; j<batch.tileWrappers.size(); j++) {
addTileWrapperToOccurrences((TileWrapper)batch.tileWrappers.get(j), occ);
}

6
pmd-dcpd/src/net/sourceforge/pmd/dcpd/TokenSetsWrapper.java
View File

@ -12,13 +12,13 @@ import java.util.Iterator;
public class TokenSetsWrapper implements Entry {
public TokenSets tokenSets;
public Integer jobID;
public Job job;
public TokenSetsWrapper() {}
public TokenSetsWrapper(TokenSets tss, Integer jobID) {
public TokenSetsWrapper(TokenSets tss, Job job) {
this.tokenSets = tss;
this.jobID = jobID;
this.job = job;
}
}