File tree Expand file tree Collapse file tree 4 files changed +16
-11
lines changed Expand file tree Collapse file tree 4 files changed +16
-11
lines changed Original file line number Diff line number Diff line change @@ -326,7 +326,8 @@ func (c *conn) Invoke(
326326 return c .wrapError (err )
327327 }
328328
329- defer c .lastUsage .Touch ()()
329+ stop := c .lastUsage .Start ()
330+ defer stop ()
330331
331332 ctx , traceID , err := meta .TraceID (ctx )
332333 if err != nil {
@@ -411,7 +412,8 @@ func (c *conn) NewStream(
411412 return nil , c .wrapError (err )
412413 }
413414
414- defer c .lastUsage .Touch ()()
415+ stop := c .lastUsage .Start ()
416+ defer stop ()
415417
416418 ctx , traceID , err := meta .TraceID (ctx )
417419 if err != nil {
Original file line number Diff line number Diff line change @@ -32,7 +32,8 @@ func (s *grpcClientStream) CloseSend() (err error) {
3232 onDone (err )
3333 }()
3434
35- defer s .c .lastUsage .Touch ()()
35+ stop := s .c .lastUsage .Start ()
36+ defer stop ()
3637
3738 err = s .ClientStream .CloseSend ()
3839
@@ -65,7 +66,8 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
6566 onDone (err )
6667 }()
6768
68- defer s .c .lastUsage .Touch ()()
69+ stop := s .c .lastUsage .Start ()
70+ defer stop ()
6971
7072 err = s .ClientStream .SendMsg (m )
7173
@@ -106,7 +108,8 @@ func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
106108 onDone (err )
107109 }()
108110
109- defer s .c .lastUsage .Touch ()()
111+ stop := s .c .lastUsage .Start ()
112+ defer stop ()
110113
111114 defer func () {
112115 if err != nil {
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ func (l *lastUsage) Get() time.Time {
3535 return l .clock .Now ()
3636}
3737
38- func (l * lastUsage ) Touch () (releaseFunc func ()) {
38+ func (l * lastUsage ) Start () (stop func ()) {
3939 l .locks .Add (1 )
4040
4141 return sync .OnceFunc (func () {
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ func Test_lastUsage_Lock(t *testing.T) {
1818 lu .t .Store (& start )
1919 t1 := lu .Get ()
2020 require .Equal (t , start , t1 )
21- f := lu .Touch ()
21+ f := lu .Start ()
2222 clock .Advance (time .Hour )
2323 t2 := lu .Get ()
2424 require .Equal (t , start .Add (time .Hour ), t2 )
@@ -39,14 +39,14 @@ func Test_lastUsage_Lock(t *testing.T) {
3939 lu .t .Store (& start )
4040 t1 := lu .Get ()
4141 require .Equal (t , start , t1 )
42- f1 := lu .Touch ()
42+ f1 := lu .Start ()
4343 clock .Advance (time .Hour )
4444 t2 := lu .Get ()
4545 require .Equal (t , start .Add (time .Hour ), t2 )
46- f2 := lu .Touch ()
46+ f2 := lu .Start ()
4747 clock .Advance (time .Hour )
4848 f1 ()
49- f3 := lu .Touch ()
49+ f3 := lu .Start ()
5050 clock .Advance (time .Hour )
5151 t3 := lu .Get ()
5252 require .Equal (t , start .Add (3 * time .Hour ), t3 )
@@ -83,7 +83,7 @@ func Test_lastUsage_Lock(t *testing.T) {
8383 t2 := lu .Get ()
8484 require .Equal (t , start , t2 )
8585 clock .Advance (time .Hour )
86- defer lu .Touch ()()
86+ defer lu .Start ()()
8787 t3 := lu .Get ()
8888 require .Equal (t , start .Add (2 * time .Hour ), t3 )
8989 clock .Advance (time .Hour )
You can’t perform that action at this time.
0 commit comments