0fdc9cafb5
* fix(all): introduce and use iox.ReadAllContext This improvement over the ioutil.ReadAll utility returns early if the context expires. This enables us to unblock stuck code in case there's censorship confounding the TCP stack. See https://github.com/ooni/probe/issues/1417. Compared to the functionality postulated in the above mentioned issue, I choose to be more generic and separate limiting the maximum body size (not implemented here) from using the context to return early when reading a body (or any other reader). After implementing iox.ReadAllContext, I made sure we always use it everywhere in the tree instead of ioutil.ReadAll. This includes many parts of the codebase where in theory we don't need iox.ReadAllContext. Though, changing all the places makes checking whether we're not using ioutil.ReadAll where we should not be using it easy: `git grep` should return no lines. * Update internal/iox/iox_test.go * fix(ndt7): treat context errors as non-errors The rationale is explained by the comment documenting reduceErr. * Update internal/engine/experiment/ndt7/download.go
99 lines
2.6 KiB
Go
99 lines
2.6 KiB
Go
// Code generated by go generate; DO NOT EDIT.
|
|
// 2021-06-15 10:55:56.587245 +0200 CEST m=+0.000218959
|
|
|
|
package ooapi
|
|
|
|
//go:generate go run ./internal/generator -file caching.go
|
|
|
|
import (
|
|
"context"
|
|
"reflect"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
|
)
|
|
|
|
// withCacheMeasurementMetaAPI implements caching for simpleMeasurementMetaAPI.
|
|
type withCacheMeasurementMetaAPI struct {
|
|
API callerForMeasurementMetaAPI // mandatory
|
|
GobCodec GobCodec // optional
|
|
KVStore KVStore // mandatory
|
|
}
|
|
|
|
type cacheEntryForMeasurementMetaAPI struct {
|
|
Req *apimodel.MeasurementMetaRequest
|
|
Resp *apimodel.MeasurementMetaResponse
|
|
}
|
|
|
|
// Call calls the API and implements caching.
|
|
func (c *withCacheMeasurementMetaAPI) Call(ctx context.Context, req *apimodel.MeasurementMetaRequest) (*apimodel.MeasurementMetaResponse, error) {
|
|
if resp, _ := c.readcache(req); resp != nil {
|
|
return resp, nil
|
|
}
|
|
resp, err := c.API.Call(ctx, req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if err := c.writecache(req, resp); err != nil {
|
|
return nil, err
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
func (c *withCacheMeasurementMetaAPI) gobCodec() GobCodec {
|
|
if c.GobCodec != nil {
|
|
return c.GobCodec
|
|
}
|
|
return &defaultGobCodec{}
|
|
}
|
|
|
|
func (c *withCacheMeasurementMetaAPI) getcache() ([]cacheEntryForMeasurementMetaAPI, error) {
|
|
data, err := c.KVStore.Get("MeasurementMeta.cache")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var out []cacheEntryForMeasurementMetaAPI
|
|
if err := c.gobCodec().Decode(data, &out); err != nil {
|
|
return nil, err
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (c *withCacheMeasurementMetaAPI) setcache(in []cacheEntryForMeasurementMetaAPI) error {
|
|
data, err := c.gobCodec().Encode(in)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.KVStore.Set("MeasurementMeta.cache", data)
|
|
}
|
|
|
|
func (c *withCacheMeasurementMetaAPI) readcache(req *apimodel.MeasurementMetaRequest) (*apimodel.MeasurementMetaResponse, error) {
|
|
cache, err := c.getcache()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, cur := range cache {
|
|
if reflect.DeepEqual(req, cur.Req) {
|
|
return cur.Resp, nil
|
|
}
|
|
}
|
|
return nil, errCacheNotFound
|
|
}
|
|
|
|
func (c *withCacheMeasurementMetaAPI) writecache(req *apimodel.MeasurementMetaRequest, resp *apimodel.MeasurementMetaResponse) error {
|
|
cache, _ := c.getcache()
|
|
out := []cacheEntryForMeasurementMetaAPI{{Req: req, Resp: resp}}
|
|
const toomany = 64
|
|
for idx, cur := range cache {
|
|
if reflect.DeepEqual(req, cur.Req) {
|
|
continue // we already updated the cache
|
|
}
|
|
if idx > toomany {
|
|
break
|
|
}
|
|
out = append(out, cur)
|
|
}
|
|
return c.setcache(out)
|
|
}
|
|
|
|
var _ callerForMeasurementMetaAPI = &withCacheMeasurementMetaAPI{}
|