From 57d5198c78f897b3306894d21a51a1010e7eeb59 Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 6 Nov 2009 14:02:46 +0000 Subject: [PATCH] google-log dependence removed git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@503 e16421f0-f15b-0410-abcd-98678b794739 --- datagram.cpp | 10 +++---- datagram.h | 2 +- ext/send_control.cpp | 6 ++--- sendrecv.cpp | 62 +++++++++++++++++++++---------------------- tests/connecttest.cpp | 1 - 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/datagram.cpp b/datagram.cpp index 068c0c2..333a14c 100644 --- a/datagram.cpp +++ b/datagram.cpp @@ -24,14 +24,14 @@ uint32_t Address::LOCALHOST = INADDR_LOOPBACK; uint64_t Datagram::dgrams_up=0, Datagram::dgrams_down=0, Datagram::bytes_up=0, Datagram::bytes_down=0; -char* Datagram::TimeStr (tint time) { - assert(!time || time>=epoch); +const char* tintstr (tint time) { + if (time==0) + time = Datagram::now; + assert(time>=Datagram::epoch); static char ret_str[4][32]; // wow static int i; i = (i+1) & 3; - if (time==0) - time = now; - time -= epoch; + time -= Datagram::epoch; assert(time>=0); int hours = time/TINT_HOUR; time %= TINT_HOUR; diff --git a/datagram.h b/datagram.h index 1f6ca2c..cbbdc4f 100644 --- a/datagram.h +++ b/datagram.h @@ -109,7 +109,6 @@ struct Datagram { static SOCKET Bind(Address address); static void Close(int port); static tint Time(); - static char* TimeStr(tint time=0); static SOCKET Wait (int sockcnt, SOCKET* sockets, tint usec=0); static tint now, epoch; static uint64_t dgrams_up, dgrams_down, bytes_up, bytes_down; @@ -198,6 +197,7 @@ struct Datagram { }; +const char* tintstr(tint t=0); std::string sock2str (struct sockaddr_in addr); #define dprintf(...) printf(__VA_ARGS__) #define eprintf(...) fprintf(stderr,__VA_ARGS__) diff --git a/ext/send_control.cpp b/ext/send_control.cpp index 593ef34..470119d 100644 --- a/ext/send_control.cpp +++ b/ext/send_control.cpp @@ -13,7 +13,7 @@ using namespace p2tp; void SendController::Swap (SendController* newctrl) { - dprintf("%s #%i sendctrl %s->%s\n",Datagram::TimeStr(),ch_->id,type(),newctrl->type()); + dprintf("%s #%i sendctrl %s->%s\n",tintstr(),ch_->id,type(),newctrl->type()); assert(this==ch_->cc_); ch_->cc_ = newctrl; delete this; @@ -66,8 +66,8 @@ void KeepAliveController::OnAckRcvd(bin64_t ackd) { bool CwndController::MaySendData() { - dprintf("%s #%i maysend %i < %f & %s (rtt %lli)\n",Datagram::TimeStr(), - ch_->id,(int)ch_->data_out_.size(),cwnd_,Datagram::TimeStr(NextSendTime()), + dprintf("%s #%i maysend %i < %f & %s (rtt %lli)\n",tintstr(), + ch_->id,(int)ch_->data_out_.size(),cwnd_,tintstr(NextSendTime()), ch_->rtt_avg_); return ch_->data_out_.size() < cwnd_ && NOW >= NextSendTime(); } diff --git a/sendrecv.cpp b/sendrecv.cpp index 14e427c..b4f95ec 100644 --- a/sendrecv.cpp +++ b/sendrecv.cpp @@ -33,7 +33,7 @@ void Channel::AddPeakHashes (Datagram& dgram) { dgram.Push32((uint32_t)peak); dgram.PushHash(file().peak_hash(i)); //DLOG(INFO)<<"#"<MaySendData()) data = AddData(dgram); else - dprintf("%s #%i no cwnd\n",Datagram::TimeStr(),id); + dprintf("%s #%i no cwnd\n",tintstr(),id); } else { AddHandshake(dgram); AddAck(dgram); } - dprintf("%s #%i sent %ib %s\n",Datagram::TimeStr(),id,dgram.size(),peer().str().c_str()); + dprintf("%s #%i sent %ib %s\n",tintstr(),id,dgram.size(),peer().str().c_str()); if (dgram.Send()==-1) print_error("can't send datagram"); if (dgram.size()==4) // only the channel id; bare keep-alive @@ -168,7 +168,7 @@ void Channel::AddHint (Datagram& dgram) { if (peer_cwnd<1) peer_cwnd = 1; dprintf("%s #%i hinted %lli peer_cwnd %lli/%lli=%f\n", - Datagram::TimeStr(),id,hinted,rtt_avg_,dip_avg_,((float)rtt_avg_/dip_avg_)); + tintstr(),id,hinted,rtt_avg_,dip_avg_,((float)rtt_avg_/dip_avg_)); if ( 4*peer_cwnd > hinted ) { //hinted*1024 < peer_cwnd*4 ) { @@ -182,7 +182,7 @@ void Channel::AddHint (Datagram& dgram) { hint_out_.push_back(hint); dgram.Push8(P2TP_HINT); dgram.Push32(hint); - dprintf("%s #%i +hint (%i,%lli)\n",Datagram::TimeStr(),id,hint.layer(),hint.offset()); + dprintf("%s #%i +hint (%i,%lli)\n",tintstr(),id,hint.layer(),hint.offset()); } } @@ -194,7 +194,7 @@ bin64_t Channel::AddData (Datagram& dgram) { return bin64_t::NONE; bin64_t tosend = DequeueHint(); if (tosend==bin64_t::NONE) { - dprintf("%s #%i out of hints\n",Datagram::TimeStr(),id); + dprintf("%s #%i out of hints\n",tintstr(),id); return bin64_t::NONE; } if (ack_in_.is_empty() && file().size()) @@ -211,7 +211,7 @@ bin64_t Channel::AddData (Datagram& dgram) { dgram.Push8(P2TP_DATA); dgram.Push32(tosend); dgram.Push(buf,r); - dprintf("%s #%i +data (%lli)\n",Datagram::TimeStr(),id,tosend.base_offset()); + dprintf("%s #%i +data (%lli)\n",tintstr(),id,tosend.base_offset()); data_out_.push_back(tosend); return tosend; } @@ -220,7 +220,7 @@ bin64_t Channel::AddData (Datagram& dgram) { void Channel::AddTs (Datagram& dgram) { dgram.Push8(P2TP_TS); dgram.Push64(data_in_.time); - dprintf("%s #%i +ts %lli\n",Datagram::TimeStr(),id,data_in_.time); + dprintf("%s #%i +ts %lli\n",tintstr(),id,data_in_.time); } @@ -232,8 +232,8 @@ void Channel::AddAck (Datagram& dgram) { dgram.Push32(pos); //dgram.Push64(data_in_.time); ack_out_.set(pos); - dprintf("%s #%i +ack (%i,%lli) %s\n",Datagram::TimeStr(),id, - pos.layer(),pos.offset(),Datagram::TimeStr(data_in_.time)); + dprintf("%s #%i +ack (%i,%lli) %s\n",tintstr(),id, + pos.layer(),pos.offset(),tintstr(data_in_.time)); data_in_ = tintbin(0,bin64_t::NONE); } for(int count=0; count<4; count++) { @@ -246,7 +246,7 @@ void Channel::AddAck (Datagram& dgram) { ack_out_.set(ack); dgram.Push8(P2TP_ACK); dgram.Push32(ack); - dprintf("%s #%i +ack (%i,%lli)\n",Datagram::TimeStr(),id,ack.layer(),ack.offset()); + dprintf("%s #%i +ack (%i,%lli)\n",tintstr(),id,ack.layer(),ack.offset()); } } @@ -257,7 +257,7 @@ void Channel::Recv (Datagram& dgram) { dev_avg_ = rtt_avg_; dip_avg_ = rtt_avg_; file_->hs_in_.push_back(id); - dprintf("%s #%i rtt init %lli\n",Datagram::TimeStr(),id,rtt_avg_); + dprintf("%s #%i rtt init %lli\n",tintstr(),id,rtt_avg_); } bin64_t data = dgram.size() ? bin64_t::NONE : bin64_t::ALL; while (dgram.size()) { @@ -287,7 +287,7 @@ void Channel::OnHash (Datagram& dgram) { Sha1Hash hash = dgram.PullHash(); file().OfferHash(pos,hash); //DLOG(INFO)<<"#"<file().size()) return; - dprintf("%s #%i -ack (%i,%lli)\n",Datagram::TimeStr(),id,ackd_pos.layer(),ackd_pos.offset()); + dprintf("%s #%i -ack (%i,%lli)\n",tintstr(),id,ackd_pos.layer(),ackd_pos.offset()); for (int i=0; i<8 && i> 2; dev_avg_ = ( dev_avg_*3 + abs(rtt-rtt_avg_) ) >> 2; dprintf("%s #%i rtt %lli dev %lli\n", - Datagram::TimeStr(),id,rtt_avg_,dev_avg_); + tintstr(),id,rtt_avg_,dev_avg_); cc_->OnAckRcvd(data_out_[i].bin); } ack_in_.set(ackd_pos); @@ -334,14 +334,14 @@ void Channel::OnAck (Datagram& dgram) { tint ts = dgram.Pull64(); // TODO sanity check dprintf("%s #%i -ackts (%i,%lli) %s\n", - Datagram::TimeStr(),id,pos.layer(),pos.offset(),Datagram::TimeStr(ts)); + tintstr(),id,pos.layer(),pos.offset(),tintstr(ts)); ack_in_.set(pos); cc_->OnAckRcvd(pos,ts); }*/ void Channel::OnTs (Datagram& dgram) { peer_send_time_ = dgram.Pull64(); - dprintf("%s #%i -ts %lli\n",Datagram::TimeStr(),id,peer_send_time_); + dprintf("%s #%i -ts %lli\n",tintstr(),id,peer_send_time_); } @@ -349,13 +349,13 @@ void Channel::OnHint (Datagram& dgram) { bin64_t hint = dgram.Pull32(); hint_in_.push_back(hint); //RequeueSend(cc_->OnHintRecvd(hint)); - dprintf("%s #%i -hint (%i,%lli)\n",Datagram::TimeStr(),id,hint.layer(),hint.offset()); + dprintf("%s #%i -hint (%i,%lli)\n",tintstr(),id,hint.layer(),hint.offset()); } void Channel::OnHandshake (Datagram& dgram) { peer_channel_id_ = dgram.Pull32(); - dprintf("%s #%i -hs %i\n",Datagram::TimeStr(),id,peer_channel_id_); + dprintf("%s #%i -hs %i\n",tintstr(),id,peer_channel_id_); // FUTURE: channel forking } @@ -364,7 +364,7 @@ void Channel::OnPex (Datagram& dgram) { uint32_t ipv4 = dgram.Pull32(); uint16_t port = dgram.Pull16(); Address addr(ipv4,port); - dprintf("%s #%i -pex %s\n",Datagram::TimeStr(),id,addr.str().c_str()); + dprintf("%s #%i -pex %s\n",tintstr(),id,addr.str().c_str()); file_->OnPexIn(addr); } @@ -377,7 +377,7 @@ void Channel::AddPex (Datagram& dgram) { dgram.Push8(P2TP_PEX_ADD); dgram.Push32(a.ipv4()); dgram.Push16(a.port()); - dprintf("%s #%i +pex %s\n",Datagram::TimeStr(),id,a.str().c_str()); + dprintf("%s #%i +pex %s\n",tintstr(),id,a.str().c_str()); } @@ -402,7 +402,7 @@ void Channel::Recv (int socket) { FileTransfer* file = FileTransfer::Find(hash); if (!file) RETLOG ("hash unknown, no such file"); - dprintf("%s #0 -hash ALL %s\n",Datagram::TimeStr(),hash.hex().c_str()); + dprintf("%s #0 -hash ALL %s\n",tintstr(),hash.hex().c_str()); for(binqueue::iterator i=file->hs_in_.begin(); i!=file->hs_in_.end(); i++) if (channels[*i] && channels[*i]->peer_==data.addr) RETLOG("have a channel already"); @@ -435,7 +435,7 @@ void Channel::RequeueSend (tint next_time) { next_send_time_ = next_time; send_queue.push_back(tintbin(next_time,id)); push_heap(send_queue.begin(),send_queue.end(),tblater); - dprintf("%s requeue #%i for %s\n",Datagram::TimeStr(),id,Datagram::TimeStr(next_time)); + dprintf("%s requeue #%i for %s\n",tintstr(),id,tintstr(next_time)); } @@ -459,14 +459,14 @@ void Channel::Loop (tint howlong) { if (send_time>limit) send_time = limit; if ( sender && send_time <= NOW ) { - dprintf("%s #%i sch_send %s\n",Datagram::TimeStr(),sender->id, - Datagram::TimeStr(send_time)); + dprintf("%s #%i sch_send %s\n",tintstr(),sender->id, + tintstr(send_time)); sender->Send(); pop_heap(send_queue.begin(), send_queue.end(), tblater); send_queue.pop_back(); } else { tint towait = send_time - NOW; - dprintf("%s waiting %lliusec\n",Datagram::TimeStr(),towait); + dprintf("%s waiting %lliusec\n",tintstr(),towait); int rd = Datagram::Wait(socket_count,sockets,towait); if (rd!=INVALID_SOCKET) Recv(rd); diff --git a/tests/connecttest.cpp b/tests/connecttest.cpp index 3d86fbf..37d0587 100644 --- a/tests/connecttest.cpp +++ b/tests/connecttest.cpp @@ -51,7 +51,6 @@ TEST(P2TP,CwndTest) { int main (int argc, char** argv) { - google::InitGoogleLogging(argv[0]); testing::InitGoogleTest(&argc, argv); int ret = RUN_ALL_TESTS(); return ret; -- 2.20.1