Commit 1caf1a53 authored by bernd's avatar bernd
Browse files

check ack stats from correct field

parent 6c895612

client-tests.fs

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ previous 
	    THEN

	THEN

    THEN

    >timing do-disconnect .packets profile( .times ) ;

    >timing do-disconnect [: .packets profile( .times ) ;] $err ;



: c:test ( -- )

    init-cache'

net2o.fs

+5 −4
Original line number Diff line number Diff line
@@ -1294,6 +1294,7 @@ reply buffer: dummy-reply 


: )stats ]] THEN [[ ;

: stats( ]] timing-stat @ IF [[ ['] )stats assert-canary ; immediate

: ack-stats( ]] ack-context @ .timing-stat @ IF [[ ['] )stats assert-canary ; immediate



: net2o:timing$ ( -- addr u )

    stats( timing-stat $@  EXIT ) ." no timing stats" cr s" " ;
@@ -1411,7 +1412,7 @@ slack-default# 2* 2* n>64 64Constant slack-ignore# \ above 80ms is ignored 
	msg( ." slack ignored: " 64dup 64. cr )

	64drop 64#0 lastslack 64@ min-slack 64!

    THEN

    64>n  stats( dup s>f stat-tuple ts-slack sf! )

    64>n  ack-stats( dup s>f stat-tuple ts-slack sf! )

    slack-bias# - slack-min# max slack# 2* 2* min

    s>f slack# fm/ 2e fswap f** ;
@@ -1435,12 +1436,12 @@ slack-default# 2* 2* n>64 64Constant slack-ignore# \ above 80ms is ignored 
    64dup extra-ns 64! 64+ ;



: rate-stat1 ( rate deltat -- )

    stats( recv-tick 64@ time-offset 64@ 64-

    ack-stats( recv-tick 64@ time-offset 64@ 64-

           64dup last-time 64!@ 64- 64>f stat-tuple ts-delta sf!

           64over 64>f stat-tuple ts-reqrate sf! ) ;



: rate-stat2 ( rate -- rate )

    stats( 64dup extra-ns 64@ 64+ 64>f stat-tuple ts-rate sf!

    ack-stats( 64dup extra-ns 64@ 64+ 64>f stat-tuple ts-rate sf!

           slackgrow 64@ 64>f stat-tuple ts-grow sf! 

           stat+ ) ;
@@ -2488,7 +2489,7 @@ forth-local-words: 
      "[ \t\n]" t name (font-lock-function-name-face . 3))

     (("debug:" "field:" "sffield:" "dffield:" "64field:") non-immediate (font-lock-type-face . 2)

      "[ \t\n]" t name (font-lock-variable-name-face . 3))

     ("[a-z0-9]+(" immediate (font-lock-comment-face . 1)

     ("[a-z\-0-9]+(" immediate (font-lock-comment-face . 1)

      ")" nil comment (font-lock-comment-face . 1))

    )

forth-local-indent-words: