From 7404d5b54debd7c8cd06f8c4251671259001c5fc Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 15 May 2010 00:00:18 +0000 Subject: [PATCH] better bandwidth tracking git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4863 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/lib/enet.lib | Bin 33718 -> 33854 bytes source/src/server.cpp | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/lib/enet.lib b/source/lib/enet.lib index b6f745f5849a7120ff98ae21b0c9e884b1cc5eb8..879f50284a2814cf78141b281a928e2284d7dc11 100644 GIT binary patch delta 6207 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 delta 6086 zcmbW54RBM}mB;UsC4Ye63F8`LY>?prb}R=Qu(4v(+VTeuHekRX1RHF?Rw$b#X^srzx#ym9?t41C-SqM{Q+K+#Ah)34sf-3+FCpWwG2CJ^!jBx^&TBs?owoHdGhQ^-H^x+6(?m)^(;n)?179AG7)UqjKO~i4c8@VpqZEBzkU4vb3At7_*=LHE}Aa zKk<-sh8`F@W5f%$qtT`7q;*p5&l2-f&^=OdCmO|&4aSIhH<+j{RFqUC`8LKAl7eZH z$QeO>f^G;h!*t#*QIK6wCMd}mr4=;Rp!J~d8MIN54oWm+zvPsHZZ8PoYl7aUqmn{e*SK=@10meCZK;3`3f|} zpj(0};s&(~KwRq;v`uKA2Te8lz9qCD3vIv9renYOC^JBq*N2H~fV}gMgxb&5&^{xy zZwu{*g1!*#;;J43)`>7=5hVGcgNOb%7F|;u)k;auiVI=u%Bgyk-=I7?x*@snJGg|jS2inlBz7JA@GSbZ^(07zu2vOgX)zw&y zzJ!jNKQZ|hO1fTIs2-8k9$@4&zTDl^HQ!TOh+PXBlWCaNX^~`EhdJLj)7}fx4ipE0M?|T>9CEy9<72 znsl3b7j7T*UtdR~-OeqFLk{e?MMo@}CT*g5i|i@$Fb&&xeUW3B4PEQ$4;K|mPtxZW zxuvr-q1NR~x%ik^kpAmKe4m}yJgbMKWmTA2J>vNw8n4^bzk1(;N_ges(X115?=C8G z^OmtIieBl^D(WKBuzBGMb_x^yz*&5&H#~I*VHt^JVbAfLuzf-YQ`W%H#Y$w%Ks4Gh zAWt_u6xm5Xs+}%bskC^?wAXG%quQyg6G!`EvU;^sT74^HlT^_bSqE<1^({%pg zNsGURr@HGK8gf zbCn!;iiVeDDqcP_HrU@!D{@k+u`31g8%K}!Px7BP1p}7V%pc`SW;bse ze8NIMTZ)*c*>y7(V~;npEF6g%6?mA12lGPY7f7A%;Nic4oyNBuD1?YrIggUUA3e1) z_O!%Sk`7gvr7ZT2?ybw3nhyaC8W{3$fE78BsOT3tLcgvnlHRBJ^?8z)K3JcZv>sDq zy$)?tRd`-4Mk9I!-CJKN?WNc1ACP`Z7c^8#74+u~nZCqJhHD&pquoCcD+jjYK=Tj8 z$pM!ECa(kGC##P#!+315Xl};=hI-=&mkf`}GBcC0bsS?US+3-6EhMtmgB!Phi&6l- zhZ~QIo-6mbVr%IS8k2KWH1PMw%YpL;ts3v0%hi z9K`;C7&$PL_BJk_P|2qA+Vy%x1WC|(-1)BTchGy6rMpxX65h||SKRd01Jjddp>??H z8MaMmtXEi>2S-rn@{Cc*P<5bQBMZ9zK_6Vc*5CTJqbazgaAD_z(!Ub;%xwxrd+|4$YVI3aT7mrEsHG%{uXVTgzM^F`cpf0_sV zc}lAL-+b9YKWdpUu^oNZ5hJd7^7G7B@4z>aDw^0jbbZ{|UTmjdv|1I@ z71lDr+Z&k#;(=A+(0a4$ls5hVv9Xq>uF9M-RIm}7>faIigN^-%loJR<aKO_!?a$yLjJ`B%SHO&TyBKe3pnacYIjtSlSgTj8U~ zJ}icn7YloUM7%hhos4Almr!V@EbJt7cCv3-?SjbPm*VVXIU=i@*ewd~K6V!3#TAu} zJy%9rA*cIRPd1V3^gmZ;WPXDCyG1V2YxJ>3H>DXXMMfYR97Uy%p%&6fYf_UMkxZ{d zG19B7&NIvUcF+ZD_W5{~Lum_{77fUTB*rCD7RRh1MW)IQSHM(}>{Bp*=-WUtnEvwJd zSKW`~?8ckklX#bzf!D1q__O4VBtoii9ZSQ8;o5>X$7;M~Ucx(KJZ*gNOCNhSnF7Bg zk!C!_@z-niQa#y_Z3AIQ5=*9_I&y6-NHMe>pbUd{fq0LvLDLLbH@2Sl*aPA{W+K-3 z>uC<2K&JD52fV;cJ`9Kt^G6Wxd>q6lnT3N8U0`Yxh!6NXki(GKP`G)IpMdxz&x5$O z1Y2r1+N}ri*VBbqnUAk-Gk&=6JrG`CF^L6!vU*@5-NvH{>7V?fkAf1mdseAAtB9ejK)uuVg%k|DkZ7perCW#Z{C%I7&5$w`&lz zO3=fCetefO|9&7w!Z5vp2%ZeN)f$KocoM|je@@V45IUjnZ9!JV9hXfIlq0BEP&Ff; z(b)||e+;t=#HR}hx&-1IF&3fAwON9S1w97hM*mq*HXMoW7`YMzG3XB<-tL=J%+IkJ ze&$0r3R)xRVL>+q#Uh`04>yR9@-&D~_h%5F?uyV(L36Gx0vTE#`4y1wdjiJb5&Q!X zk6Rxo+pzjcAq#_eh?b!v_sk9uEW_%~f_OrYvkz*^LEO|9LB9n}BrUAVO9nFfhft>? z=XjSaL9YmkfcV5&$X8CU2^s+LbuJD4`k`zoX%DhgB7^_#d`R&3%4qiYie)^yZXNu4 aHB`I)Mf1@ADxuU3rIK-*A8PgdUH)&# clients; vector worldstates; @@ -87,7 +87,6 @@ void sendpacket(int n, int chan, ENetPacket *packet, int exclude) case ST_TCPIP: { enet_peer_send(clients[n]->peer, chan, packet); - bsend += (int)packet->dataLength; break; } @@ -3209,17 +3208,17 @@ void serverslice(uint timeout) // main server update, called from cube main lo { laststatus = servmillis; rereadcfgs(); - if(nonlocalclients || bsend || brec) + if(nonlocalclients || serverhost->totalSentData || serverhost->totalReceivedData) { if(nonlocalclients) loggamestatus(NULL); logline(ACLOG_INFO, "Status at %s: %d remote clients, %.1f send, %.1f rec (K/sec);" " Ping: #%d|%d|%d; CSL: #%d|%d|%d (bytes)", - timestring(true, "%d-%m-%Y %H:%M:%S"), nonlocalclients, bsend/60.0f/1024, brec/60.0f/1024, + timestring(true, "%d-%m-%Y %H:%M:%S"), nonlocalclients, serverhost->totalSentData/60.0f/1024, totalReceivedData/60.0f/1024, mnum, msend, mrec, cnum, csend, crec); mnum = msend = mrec = cnum = csend = crec = 0; linequalitystats(0); } - bsend = brec = 0; + serverhost->totalSentData = serverhost->totalReceivedData = 0; } ENetEvent event; @@ -3251,7 +3250,6 @@ void serverslice(uint timeout) // main server update, called from cube main lo case ENET_EVENT_TYPE_RECEIVE: { - brec += (int)event.packet->dataLength; int cn = (int)(size_t)event.peer->data; if(valid_client(cn)) process(event.packet, cn, event.channelID); if(event.packet->referenceCount==0) enet_packet_destroy(event.packet);