gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Robert Kelly
2018-05-15 07:35:41 -04:00
parent 7b88b8d159
commit d42d024d9c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bank.rs
View File

@ -286,8 +286,8 @@ impl Bank {
.entry(tx_sig) .entry(tx_sig)
{ {
e.get_mut().apply_witness(&Witness::Signature(from)); e.get_mut().apply_witness(&Witness::Signature(from));
if let Some(ref payment) = e.get().final_payment() { if let Some(payment) = e.get().final_payment() {
apply_payment(&self.balances, payment); apply_payment(&self.balances, &payment);
e.remove_entry(); e.remove_entry();
} }
}; };

12
src/crdt.rs
View File

@ -3,7 +3,7 @@
//! repair partitions. //! repair partitions.
//! //!
//! This CRDT only supports a very limited set of types. A map of PublicKey -> Versioned Struct. //! This CRDT only supports a very limited set of types. A map of PublicKey -> Versioned Struct.
//! The last version is always picked durring an update. //! The last version is always picked during an update.
//! //!
//! The network is arranged in layers: //! The network is arranged in layers:
//! //!
@ -89,7 +89,7 @@ pub struct Crdt {
/// should respond with all the identities that are greater then the /// should respond with all the identities that are greater then the
/// request's `update_index` in this list /// request's `update_index` in this list
local: HashMap<PublicKey, u64>, local: HashMap<PublicKey, u64>,
/// The value of the remote update index that i have last seen /// The value of the remote update index that I have last seen
/// This Node will ask external nodes for updates since the value in this list /// This Node will ask external nodes for updates since the value in this list
pub remote: HashMap<PublicKey, u64>, pub remote: HashMap<PublicKey, u64>,
pub update_index: u64, pub update_index: u64,
@ -169,7 +169,7 @@ impl Crdt {
transmit_index: &mut u64, transmit_index: &mut u64,
) -> Result<()> { ) -> Result<()> {
let (me, table): (ReplicatedData, Vec<ReplicatedData>) = { let (me, table): (ReplicatedData, Vec<ReplicatedData>) = {
// copy to avoid locking durring IO // copy to avoid locking during IO
let robj = obj.read().expect("'obj' read lock in pub fn broadcast"); let robj = obj.read().expect("'obj' read lock in pub fn broadcast");
info!("broadcast table {}", robj.table.len()); info!("broadcast table {}", robj.table.len());
let cloned_table: Vec<ReplicatedData> = robj.table.values().cloned().collect(); let cloned_table: Vec<ReplicatedData> = robj.table.values().cloned().collect();
@ -197,7 +197,7 @@ impl Crdt {
info!("nodes table {}", nodes.len()); info!("nodes table {}", nodes.len());
info!("blobs table {}", blobs.len()); info!("blobs table {}", blobs.len());
// enumerate all the blobs, those are the indecies // enumerate all the blobs, those are the indices
// transmit them to nodes, starting from a different node // transmit them to nodes, starting from a different node
let orders: Vec<_> = blobs let orders: Vec<_> = blobs
.iter() .iter()
@ -245,7 +245,7 @@ impl Crdt {
/// We need to avoid having obj locked while doing any io, such as the `send_to` /// We need to avoid having obj locked while doing any io, such as the `send_to`
pub fn retransmit(obj: &Arc<RwLock<Self>>, blob: &SharedBlob, s: &UdpSocket) -> Result<()> { pub fn retransmit(obj: &Arc<RwLock<Self>>, blob: &SharedBlob, s: &UdpSocket) -> Result<()> {
let (me, table): (ReplicatedData, Vec<ReplicatedData>) = { let (me, table): (ReplicatedData, Vec<ReplicatedData>) = {
// copy to avoid locking durring IO // copy to avoid locking during IO
let s = obj.read().expect("'obj' read lock in pub fn retransmit"); let s = obj.read().expect("'obj' read lock in pub fn retransmit");
(s.table[&s.me].clone(), s.table.values().cloned().collect()) (s.table[&s.me].clone(), s.table.values().cloned().collect())
}; };
@ -439,7 +439,7 @@ impl Crdt {
Protocol::RequestUpdates(v, reqdata) => { Protocol::RequestUpdates(v, reqdata) => {
trace!("RequestUpdates {}", v); trace!("RequestUpdates {}", v);
let addr = reqdata.gossip_addr; let addr = reqdata.gossip_addr;
// only lock for this call, dont lock durring IO `sock.send_to` or `sock.recv_from` // only lock for this call, dont lock during IO `sock.send_to` or `sock.recv_from`
let (from, ups, data) = obj.read() let (from, ups, data) = obj.read()
.expect("'obj' read lock in RequestUpdates") .expect("'obj' read lock in RequestUpdates")
.get_updates_since(v); .get_updates_since(v);