Commit 776d66c

author

Luca Bianconi

committed

refactor: new interface

1 parent 3b11d67 commit 776d66cCopy full SHA for 776d66c

File tree

4 files changed

+23

-15

lines changed

buildcache
- build_cache.go
- build_cache_test.go
commands/compile
- compile.go
legacy/builder/phases
- core_builder.go

4 files changed

+23

-15

lines changed

`‎buildcache/build_cache.go‎`

Lines changed: 17 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,26 +25,29 @@ import (`
`25`	`25`
`26`	`26`	`const lastUsedFileName = ".last-used"`
`27`	`27`
	`28`	`+type buildCache struct {`
	`29`	`+ baseDir *paths.Path`
	`30`	`+}`
	`31`	`+`
`28`	`32`	`// GetOrCreate retrieves or creates the cache directory at the given path`
`29`	`33`	`// If the cache already exists the lifetime of the cache is extended.`
`30`		`-func GetOrCreate(dir paths.Path) (paths.Path, error) {`
`31`		`- if !dir.Exist() {`
`32`		`- if err := dir.MkdirAll(); err != nil {`
`33`		`- return nil, err`
`34`		`- }`
	`34`	`+func (bc buildCache) GetOrCreate(key string) (paths.Path, error) {`
	`35`	`+ keyDir := bc.baseDir.Join(key)`
	`36`	`+ if err := keyDir.MkdirAll(); err != nil {`
	`37`	`+ return nil, err`
`35`	`38`	`}`
`36`	`39`
`37`		`- if err := dir.Join(lastUsedFileName).WriteFile([]byte{}); err != nil {`
	`40`	`+ if err := keyDir.Join(lastUsedFileName).WriteFile([]byte{}); err != nil {`
`38`	`41`	`return nil, err`
`39`	`42`	`}`
`40`		`- return dir, nil`
	`43`	`+ return keyDir, nil`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`// Purge removes all cache directories within baseDir that have expired`
`44`	`47`	`// To know how long ago a directory has been last used`
`45`	`48`	`// it checks into the .last-used file.`
`46`		`-func Purge(baseDir*paths.Path, ttl time.Duration) {`
`47`		`- files, err := baseDir.ReadDir()`
	`49`	`+func (bc*buildCache) Purge(ttl time.Duration) {`
	`50`	`+ files, err := bc.baseDir.ReadDir()`
`48`	`51`	`if err != nil {`
`49`	`52`	`return`
`50`	`53`	`}`
`@@ -55,6 +58,11 @@ func Purge(baseDir *paths.Path, ttl time.Duration) {`
`55`	`58`	`}`
`56`	`59`	`}`
`57`	`60`
	`61`	`+// New instantiates a build cache`
	`62`	`+func New(baseDir paths.Path) buildCache {`
	`63`	`+ return &buildCache{baseDir}`
	`64`	`+}`
	`65`	`+`
`58`	`66`	`func removeIfExpired(dir *paths.Path, ttl time.Duration) {`
`59`	`67`	`fileInfo, err := dir.Join().Stat()`
`60`	`68`	`if err != nil {`

`‎buildcache/build_cache_test.go‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func Test_UpdateLastUsedFileExisting(t *testing.T) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func requireCorrectUpdate(t testing.T, dir paths.Path, prevModTime time.Time) {`
`46`		`- _, err := GetOrCreate(dir)`
	`46`	`+ _, err := New(dir.Parent()).GetOrCreate(dir.Base())`
`47`	`47`	`require.NoError(t, err)`
`48`	`48`	`expectedFile := dir.Join(lastUsedFileName)`
`49`	`49`	`fileInfo, err := expectedFile.Stat()`
`@@ -71,7 +71,7 @@ func TestPurge(t *testing.T) {`
`71`	`71`	`require.NoError(t, infoFilePath.Chtimes(accesstime, lastUsedTime))`
`72`	`72`	`}`
`73`	`73`
`74`		`- Purge(dirToPurge, ttl)`
	`74`	`+ New(dirToPurge).Purge(ttl)`
`75`	`75`
`76`	`76`	`files, err := dirToPurge.Join("fresh").Stat()`
`77`	`77`	`require.Nil(t, err)`

`‎commands/compile/compile.go‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`138`	`138`	`return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build directory"), Cause: err}`
`139`	`139`	`}`
`140`	`140`
`141`		`- buildcache.GetOrCreate(builderCtx.BuildPath)`
	`141`	`+ buildcache.New(builderCtx.BuildPath.Parent()).GetOrCreate(builderCtx.BuildPath.Base())`
`142`	`142`	`// cache is purged after compilation to not remove entries that might be required`
`143`	`143`	`defer maybePurgeBuildCache()`
`144`	`144`
`@@ -312,6 +312,6 @@ func maybePurgeBuildCache() {`
`312`	`312`	`}`
`313`	`313`	`inventory.Store.Set("build_cache.compilation_count_since_last_purge", 0)`
`314`	`314`	`cacheTTL := configuration.Settings.GetDuration("build_cache.ttl").Abs()`
`315`		`- buildcache.Purge(paths.TempDir().Join("arduino", "cores"), cacheTTL)`
`316`		`- buildcache.Purge(paths.TempDir().Join("arduino", "sketches"), cacheTTL)`
	`315`	`+ buildcache.New(paths.TempDir().Join("arduino", "cores")).Purge(cacheTTL)`
	`316`	`+ buildcache.New(paths.TempDir().Join("arduino", "sketches")).Purge(cacheTTL)`
`317`	`317`	`}`

`‎legacy/builder/phases/core_builder.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func compileCore(ctx types.Context, buildPath paths.Path, buildCachePath *path`
`98`	`98`	`archivedCoreName := GetCachedCoreArchiveDirName(buildProperties.Get(constants.BUILD_PROPERTIES_FQBN),`
`99`	`99`	`buildProperties.Get("compiler.optimization_flags"), realCoreFolder)`
`100`	`100`	`targetArchivedCore = buildCachePath.Join(archivedCoreName, "core.a")`
`101`		`- _, buildCacheErr = buildcache.GetOrCreate(targetArchivedCore.Parent())`
	`101`	`+ _, buildCacheErr = buildcache.New(buildCachePath).GetOrCreate(archivedCoreName)`
`102`	`102`
`103`	`103`	`canUseArchivedCore := !ctx.OnlyUpdateCompilationDatabase &&`
`104`	`104`	`!ctx.Clean &&`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 776d66c

File tree

4 files changed

4 files changed

`‎buildcache/build_cache.go‎`

`‎buildcache/build_cache_test.go‎`

`‎commands/compile/compile.go‎`

`‎legacy/builder/phases/core_builder.go‎`

0 commit comments