status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Concurrent - try to use copy on access technique

This commit is contained in:
romanman 2014-08-11 14:45:10 +03:00
parent 0990a0717a
commit 8cb39f2599
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ethereumj-core/src/main/java/org/ethereum/core/Block.java
View File

@ -16,7 +16,9 @@ import org.spongycastle.util.encoders.Hex;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* The block in Ethereum is the collection of relevant pieces of information
@ -42,12 +44,12 @@ public class Block {
private BlockHeader header;
/* Transactions */
private List<TransactionReceipt> txReceiptList = new ArrayList<TransactionReceipt>();
private List<Transaction> transactionsList = new ArrayList<Transaction>();
/* Transactions */
private List<TransactionReceipt> txReceiptList = new CopyOnWriteArrayList <TransactionReceipt>() ;
private List<Transaction> transactionsList = new CopyOnWriteArrayList<Transaction>();
/* Uncles */
private List<Block> uncleList = new ArrayList<Block>();
private List<Block> uncleList = new CopyOnWriteArrayList<Block>();
/* Private */
@ -72,7 +74,16 @@ public class Block {
difficulty, number, minGasPrice, gasLimit, gasUsed,
timestamp, extraData, nonce);
this.transactionsList = transactionsList;
if (this.transactionsList == null){
this.transactionsList = new CopyOnWriteArrayList<Transaction>();
}
this.uncleList = uncleList;
if (this.uncleList == null){
this.uncleList = new CopyOnWriteArrayList<Block>();
}
this.parsed = true;
}
@ -188,22 +199,16 @@ public class Block {
public List<Transaction> getTransactionsList() {
if (!parsed) parseRLP();
if (transactionsList == null)
transactionsList = new ArrayList<>();
return transactionsList;
}
public List<TransactionReceipt> getTxReceiptList() {
if (!parsed) parseRLP();
if (txReceiptList == null)
txReceiptList = new ArrayList<>();
return txReceiptList;
}
public List<Block> getUncleList() {
if (!parsed) parseRLP();
if (uncleList == null)
uncleList = new ArrayList<>();
return uncleList;
}

3
ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java
View File

@ -6,6 +6,7 @@ import java.math.BigInteger;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import org.ethereum.core.AccountState;
import org.ethereum.core.Blockchain;
@ -40,7 +41,7 @@ public class WorldManager {
private Wallet wallet;
private PeerDiscovery peerDiscovery;
private List<PeerData> peers = Collections.synchronizedList(new ArrayList<PeerData>());
private List<PeerData> peers = new CopyOnWriteArrayList<PeerData>();
private ClientPeer activePeer;
// This map of transaction designed