Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96e5e41b authored by Colin Cross's avatar Colin Cross
Browse files

Dist module_paths/files.db 

Help debugging finder issues by disting module_paths/files.db for
later analysis.

Bug: 157656545
Test: treehugger
Change-Id: Idfa4cffe7ef724b399a2667efd487f9c3c76bb6b
parent 0eeff82c

finder/finder.go

+6 −5
Original line number Diff line number Diff line
@@ -325,7 +325,12 @@ func (f *Finder) FindMatching(rootPath string, filter WalkFunc) []string { 
// Shutdown declares that the finder is no longer needed and waits for its cleanup to complete

// Currently, that only entails waiting for the database dump to complete.

func (f *Finder) Shutdown() {

	f.waitForDbDump()

	f.WaitForDbDump()

}



// WaitForDbDump returns once the database has been written to f.DbPath.

func (f *Finder) WaitForDbDump() {

	f.shutdownWaitgroup.Wait()

}



// End of public api
@@ -345,10 +350,6 @@ func (f *Finder) goDumpDb() { 
	}

}



func (f *Finder) waitForDbDump() {

	f.shutdownWaitgroup.Wait()

}



// joinCleanPaths is like filepath.Join but is faster because

// joinCleanPaths doesn't have to support paths ending in "/" or containing ".."

func joinCleanPaths(base string, leaf string) string {

ui/build/finder.go

+5 −0
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ func FindSources(ctx Context, config Config, f *finder.Finder) { 
	if err != nil {

		ctx.Fatalf("Could not find modules: %v", err)

	}



	if config.Dist() {

		f.WaitForDbDump()

		distFile(ctx, config, f.DbPath, "module_paths")

	}

}



func dumpListToFile(ctx Context, config Config, list []string, filePath string) (err error) {