blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Little more trace! logging

This commit is contained in:
Michael Vines 2018-07-18 12:44:59 -07:00
parent 39df087902
commit 5deb34e5bd
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/crdt.rs
View File

@ -458,9 +458,11 @@ impl Crdt {
/// challenging part is that we are on a permissionless network /// challenging part is that we are on a permissionless network
pub fn purge(&mut self, now: u64) { pub fn purge(&mut self, now: u64) {
if self.table.len() <= MIN_TABLE_SIZE { if self.table.len() <= MIN_TABLE_SIZE {
trace!("purge: skipped: table too small: {}", self.table.len());
return; return;
} }
if self.leader_data().is_none() { if self.leader_data().is_none() {
trace!("purge: skipped: no leader_data");
return; return;
} }
let leader_id = self.leader_data().unwrap().id; let leader_id = self.leader_data().unwrap().id;
@ -995,8 +997,8 @@ impl Crdt {
match deserialize(&blob.data[..blob.meta.size]) { match deserialize(&blob.data[..blob.meta.size]) {
// TODO sigverify these // TODO sigverify these
Ok(Protocol::RequestUpdates(v, from_rd)) => { Ok(Protocol::RequestUpdates(v, from_rd)) => {
trace!("RequestUpdates {}", v);
let addr = from_rd.contact_info.ncp; let addr = from_rd.contact_info.ncp;
trace!("RequestUpdates {} from {}", v, addr);
let me = obj.read().unwrap(); let me = obj.read().unwrap();
// only lock for these two calls, dont lock during IO `sock.send_to` or `sock.recv_from` // only lock for these two calls, dont lock during IO `sock.send_to` or `sock.recv_from`
let (from, ups, data) = me.get_updates_since(v); let (from, ups, data) = me.get_updates_since(v);
@ -1029,16 +1031,16 @@ impl Crdt {
None None
} }
} }
Ok(Protocol::ReceiveUpdates(from, ups, data, external_liveness)) => { Ok(Protocol::ReceiveUpdates(from, update_index, data, external_liveness)) => {
trace!( trace!(
"ReceivedUpdates {:x} {} {}", "ReceivedUpdates from={:x} update_index={} len={}",
make_debug_id(&from), make_debug_id(&from),
ups, update_index,
data.len() data.len()
); );
obj.write() obj.write()
.expect("'obj' write lock in ReceiveUpdates") .expect("'obj' write lock in ReceiveUpdates")
.apply_updates(from, ups, &data, &external_liveness); .apply_updates(from, update_index, &data, &external_liveness);
None None
} }
Ok(Protocol::RequestWindowIndex(from, ix)) => { Ok(Protocol::RequestWindowIndex(from, ix)) => {

2
src/packet.rs
View File

@ -212,6 +212,7 @@ impl Packets {
Ok((nrecv, from)) => { Ok((nrecv, from)) => {
p.meta.size = nrecv; p.meta.size = nrecv;
p.meta.set_addr(&from); p.meta.set_addr(&from);
trace!("got {} bytes from {}", nrecv, from);
if i == 0 { if i == 0 {
socket.set_nonblocking(true)?; socket.set_nonblocking(true)?;
} }
@ -405,6 +406,7 @@ impl Blob {
Ok((nrecv, from)) => { Ok((nrecv, from)) => {
p.meta.size = nrecv; p.meta.size = nrecv;
p.meta.set_addr(&from); p.meta.set_addr(&from);
trace!("got {} bytes from {}", nrecv, from);
if i == 0 { if i == 0 {
socket.set_nonblocking(true)?; socket.set_nonblocking(true)?;
} }

2
src/streamer.rs
View File

@ -126,7 +126,7 @@ pub fn responder(
//TODO, we would need to stick block authentication before we create the //TODO, we would need to stick block authentication before we create the
//window. //window.
fn recv_blobs(recycler: &BlobRecycler, sock: &UdpSocket, s: &BlobSender) -> Result<()> { fn recv_blobs(recycler: &BlobRecycler, sock: &UdpSocket, s: &BlobSender) -> Result<()> {
trace!("receiving on {}", sock.local_addr().unwrap()); trace!("recv_blobs: receiving on {}", sock.local_addr().unwrap());
let dq = Blob::recv_from(recycler, sock)?; let dq = Blob::recv_from(recycler, sock)?;
if !dq.is_empty() { if !dq.is_empty() {
s.send(dq)?; s.send(dq)?;