[no-relnote] Add collection of mountSpecs

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

internal/platform-support/tegra/csv.go

@@ -82,18 +82,21 @@ func (o options) newDiscovererFromMountSpecs(targetsByType MountSpecPathsByType)
 // MountSpecsFromCSVFiles returns a MountSpecPathsByTyper for the specified list
 // of CSV files.
 func MountSpecsFromCSVFiles(logger logger.Interface, csvFilePaths ...string) MountSpecPathsByType {
-	targetsByType := make(MountSpecPathsByType)
+	var mountSpecs mountSpecPathsByTypers
+
 	for _, filename := range csvFilePaths {
 		targets, err := loadCSVFile(logger, filename)
 		if err != nil {
 			logger.Warningf("Skipping CSV file %v: %v", filename, err)
 			continue
 		}
+		targetsByType := make(MountSpecPathsByType)
 		for _, t := range targets {
 			targetsByType[t.Type] = append(targetsByType[t.Type], t.Path)
 		}
+		mountSpecs = append(mountSpecs, targetsByType)
 	}
-	return targetsByType
+	return mountSpecs.MountSpecPathsByType()
 }
 
 // loadCSVFile loads the specified CSV file and returns the list of mount specs

internal/platform-support/tegra/mount_specs.go

@@ -25,13 +25,17 @@ type MountSpecPathsByTyper interface {
 	MountSpecPathsByType() MountSpecPathsByType
 }
 
+// moutSpecPathsByTypers represents a collection of MountSpecPathsByTyper
+type mountSpecPathsByTypers []MountSpecPathsByTyper
+
 // MountSpecPathsByType define the per-type paths that define the entities
 // (e.g. device nodes, directories, libraries, symlinks) that are required for
 // gpu use on Tegra-based systems.
 // These are typically populated from CSV files defined by the platform owner.
 type MountSpecPathsByType map[csv.MountSpecType][]string
 
 var _ MountSpecPathsByTyper = (MountSpecPathsByType)(nil)
+var _ MountSpecPathsByTyper = (mountSpecPathsByTypers)(nil)
 
 // MountSpecPathsByType for a variable of type MountSpecPathsByType returns the
 // underlying data structure.
@@ -40,6 +44,22 @@ func (m MountSpecPathsByType) MountSpecPathsByType() MountSpecPathsByType {
 	return m
 }
 
+// MountSpecPathsByType returns the combination of mount specs by type for the
+// collection.
+func (collection mountSpecPathsByTypers) MountSpecPathsByType() MountSpecPathsByType {
+	merged := make(MountSpecPathsByType)
+	for _, t := range collection {
+		if t == nil {
+			continue
+		}
+		for tType, targets := range t.MountSpecPathsByType() {
+			merged[tType] = append(merged[tType], targets...)
+		}
+	}
+	return merged
+
+}
+
 // A Transformer modifies a specified set of mount specs by type.
 // The output of a transformer is itself a set of mount specs by type.
 type Transformer interface {

internal/platform-support/tegra/options.go

@@ -86,8 +86,8 @@ func WithLibrarySearchPaths(librarySearchPaths ...string) Option {
 	}
 }
 
-func WithMountSpecs(mountSpecs MountSpecPathsByTyper) Option {
+func WithMountSpecs(mountSpecs ...MountSpecPathsByTyper) Option {
 	return func(o *options) {
-		o.mountSpecs = mountSpecs
+		o.mountSpecs = mountSpecPathsByTypers(mountSpecs)
 	}
 }