X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmaven-sal-api-gen-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fmaven%2Fapi%2Fgen%2Fplugin%2FCodeGeneratorImpl.java;h=cd531e6089cbc7f8b37696ce453d7ea34e2acb1e;hb=30f027bad99700f436fd63a1d572f0c572a70477;hp=2e4af3c5b3eb312ee14ff8ddde7edce0ae978d8c;hpb=ec4a495e61bcbbeabd132ca2fdaeb6e4915f047c;p=mdsal.git diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java index 2e4af3c5b3..cd531e6089 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java @@ -10,11 +10,15 @@ package org.opendaylight.mdsal.binding.maven.api.gen.plugin; import static java.util.Objects.requireNonNull; import com.google.common.base.Joiner; +import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Table; import com.google.common.collect.Table.Cell; -import com.google.common.io.Files; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -22,16 +26,20 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.ServiceLoader; import java.util.Set; +import java.util.concurrent.ForkJoinPool; import java.util.function.Function; import java.util.function.Supplier; +import java.util.stream.Collectors; import org.apache.maven.project.MavenProject; -import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile.FileKind; import org.opendaylight.mdsal.binding.java.api.generator.YangModuleInfoTemplate; @@ -40,7 +48,6 @@ import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator; import org.opendaylight.yangtools.yang2sources.spi.BuildContextAware; import org.opendaylight.yangtools.yang2sources.spi.MavenProjectAware; @@ -54,6 +61,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext private static final Logger LOG = LoggerFactory.getLogger(CodeGeneratorImpl.class); private static final String FS = File.separator; + private BuildContext buildContext; private File projectBaseDir; private Map additionalConfig; @@ -68,7 +76,13 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext outputBaseDir = outputDir == null ? getDefaultOutputBaseDir() : outputDir; - final List types = new BindingGeneratorImpl().generateTypes(context, yangModules); + // Step one: determine binding types which we are generating + final Stopwatch sw = Stopwatch.createStarted(); + final List types = ServiceLoader.load(BindingGenerator.class) + .findFirst().orElseThrow(() -> new IllegalStateException("No BindingGenerator implementation found")) + .generateTypes(context, yangModules); + LOG.info("Found {} Binding types in {}", types.size(), sw); + final GeneratorJavaFile generator = new GeneratorJavaFile(types); File persistentSourcesDir = null; @@ -89,7 +103,9 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext final Table> generatedFiles = generator.generateFileContent( ignoreDuplicateFiles); - final List result = new ArrayList<>(generatedFiles.size()); + + // Step two: create generation tasks for each target file and group them by parent directory + final ListMultimap dirs = MultimapBuilder.hashKeys().arrayListValues().build(); for (Cell> cell : generatedFiles.cellSet()) { final File target; switch (cell.getRowKey()) { @@ -107,27 +123,36 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext throw new IllegalStateException("Unsupported file type in " + cell); } - Files.createParentDirs(target); - try (OutputStream stream = buildContext.newFileOutputStream(target)) { - try (Writer fw = new OutputStreamWriter(stream, StandardCharsets.UTF_8)) { - try (BufferedWriter bw = new BufferedWriter(fw)) { - bw.write(cell.getValue().get()); - } - } catch (IOException e) { - LOG.error("Failed to write generate output into {}", target.getPath(), e); - throw e; - } - } - - result.add(target); + dirs.put(target.getParentFile().toPath(), new GenerationTask(buildContext, target, cell.getValue())); } - + LOG.info("Generating {} Binding source files into {} directories", dirs.size(), dirs.keySet().size()); + + // Step three: submit parent directory creation tasks (via parallelStream()) and wait for them to complete + sw.reset().start(); + dirs.keySet().parallelStream().forEach(path -> { + try { + Files.createDirectories(path); + } catch (IOException e) { + throw new IllegalStateException("Failed to create " + path, e); + } + }); + LOG.debug("Parent directories created in {}", sw); + + // Step four: submit all code generation tasks (via parallelStream()) and wait for them to complete + final ListeningExecutorService service = MoreExecutors.listeningDecorator(ForkJoinPool.commonPool()); + sw.reset().start(); + final List result = dirs.values().parallelStream() + .map(GenerationTask::generateFile) + .collect(Collectors.toList()); + LOG.debug("{} Binding source type files generated in {}", result.size(), sw); + + // Step five: generate auxiliary files result.addAll(generateModuleInfos(outputBaseDir, yangModules, context, moduleResourcePathResolver)); return result; } private Collection generateModuleInfos(final File outputBaseDir, final Set yangModules, - final SchemaContext context, final Function> moduleResourcePathResolver) { + final EffectiveModelContext context, final Function> moduleResourcePathResolver) { Builder result = ImmutableSet.builder(); Builder bindingProviders = ImmutableSet.builder(); for (Module module : yangModules) { @@ -163,7 +188,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext File outputBaseDir; outputBaseDir = new File(DEFAULT_OUTPUT_BASE_DIR_PATH); setOutputBaseDirAsSourceFolder(outputBaseDir, mavenProject); - LOG.debug("Adding " + outputBaseDir.getPath() + " as compile source root"); + LOG.debug("Adding {} as compile source root", outputBaseDir.getPath()); return outputBaseDir; } @@ -193,8 +218,8 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext this.buildContext = requireNonNull(buildContext); } - private Set generateYangModuleInfo(final File outputBaseDir, final Module module, final SchemaContext ctx, - final Function> moduleResourcePathResolver, + private Set generateYangModuleInfo(final File outputBaseDir, final Module module, + final EffectiveModelContext ctx, final Function> moduleResourcePathResolver, final Builder providerSourceSet) { Builder generatedFiles = ImmutableSet.builder(); @@ -234,11 +259,38 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext bw.write(source); } } catch (Exception e) { - LOG.error("Could not write file: {}",file,e); + LOG.error("Could not write file: {}", file, e); } } catch (Exception e) { - LOG.error("Could not create file: {}",file,e); + LOG.error("Could not create file: {}", file, e); } return file; } + + private static final class GenerationTask { + private final BuildContext buildContext; + private final Supplier contentSupplier; + private final File target; + + GenerationTask(final BuildContext buildContext, final File target, final Supplier contentSupplier) { + this.buildContext = requireNonNull(buildContext); + this.target = requireNonNull(target); + this.contentSupplier = requireNonNull(contentSupplier); + } + + File generateFile() { + try { + try (OutputStream stream = buildContext.newFileOutputStream(target)) { + try (Writer fw = new OutputStreamWriter(stream, StandardCharsets.UTF_8)) { + try (BufferedWriter bw = new BufferedWriter(fw)) { + bw.write(contentSupplier.get()); + } + } + } + } catch (IOException e) { + throw new IllegalStateException("Failed to generate file " + target, e); + } + return target; + } + } }