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=5aa8d58489e0d294ef59b899c6ad09869842761c;hb=a6fb0b3903e8630df18b7c63a116bfd06a716bdf;hp=5ed142fba3d7c96dc736f3c0537e0df9bbf45043;hpb=0f351bbc28ddf2cddfe30c8d018646d81953fa17;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 5ed142fba3..5aa8d58489 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 @@ -7,13 +7,21 @@ */ 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.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.base.Throwables; 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.Futures; +import com.google.common.util.concurrent.ListenableFuture; +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; @@ -21,14 +29,21 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +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.java.api.generator.GeneratorJavaFile; @@ -37,8 +52,8 @@ import org.opendaylight.mdsal.binding.java.api.generator.YangModuleInfoTemplate; import org.opendaylight.mdsal.binding.model.api.Type; 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; @@ -59,14 +74,18 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext private File resourceBaseDir; @Override - public Collection generateSources(final SchemaContext context, final File outputDir, + public Collection generateSources(final EffectiveModelContext context, final File outputDir, final Set yangModules, final Function> moduleResourcePathResolver) throws IOException { final File outputBaseDir; outputBaseDir = outputDir == null ? getDefaultOutputBaseDir() : outputDir; + // Step one: determine binding types which we are generating + final Stopwatch sw = Stopwatch.createStarted(); final List types = new BindingGeneratorImpl().generateTypes(context, yangModules); + LOG.info("Found {} Binding types in {}", types.size(), sw); + final GeneratorJavaFile generator = new GeneratorJavaFile(types); File persistentSourcesDir = null; @@ -87,7 +106,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()) { @@ -105,27 +126,68 @@ 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; + 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: wrap common FJ pool, submit parent directory creation tasks and wait for them to complete + sw.reset().start(); + final ListeningExecutorService service = MoreExecutors.listeningDecorator(ForkJoinPool.commonPool()); + final List> parentFutures = new ArrayList<>(dirs.keySet().size()); + for (Entry> entry : dirs.asMap().entrySet()) { + parentFutures.add(service.submit(() -> { + Files.createDirectories(entry.getKey()); + return null; + })); + } + + try { + Futures.whenAllComplete(parentFutures).call(() -> { + for (ListenableFuture future : parentFutures) { + Futures.getDone(future); } - } + return null; + }, MoreExecutors.directExecutor()).get(); + } catch (InterruptedException e) { + throw new IOException("Interrupted while creating parent directories", e); + } catch (ExecutionException e) { + LOG.debug("Failed to create parent directories", e); + Throwables.throwIfInstanceOf(e.getCause(), IOException.class); + throw new IOException("Failed to create parent directories", e); + } + LOG.debug("Parent directories created in {}", sw); + + // Step four: submit all code generation tasks and wait for them to complete + sw.reset().start(); + final List> futureFiles = dirs.values().stream() + .map(service::submit) + .collect(Collectors.toList()); - result.add(target); + final List result; + try { + result = Futures.whenAllComplete(futureFiles).call(() -> { + List ret = new ArrayList<>(futureFiles.size()); + for (ListenableFuture future : futureFiles) { + ret.add(Futures.getDone(future)); + } + return ret; + }, MoreExecutors.directExecutor()).get(); + } catch (InterruptedException e) { + throw new IOException("Interrupted while generating files", e); + } catch (ExecutionException e) { + LOG.error("Failed to create generated files", e); + Throwables.throwIfInstanceOf(e.getCause(), IOException.class); + throw new IOException("Failed to create generated files", e); } + 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) { @@ -161,12 +223,12 @@ 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; } private static void setOutputBaseDirAsSourceFolder(final File outputBaseDir, final MavenProject mavenProject) { - Preconditions.checkNotNull(mavenProject, "Maven project needs to be set in this phase"); + requireNonNull(mavenProject, "Maven project needs to be set in this phase"); mavenProject.addCompileSourceRoot(outputBaseDir.getPath()); } @@ -188,11 +250,11 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext @Override public void setBuildContext(final BuildContext buildContext) { - this.buildContext = Preconditions.checkNotNull(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(); @@ -232,11 +294,35 @@ 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 implements Callable { + 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); + } + + @Override + public File call() throws IOException { + 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()); + } + } + } + return target; + } + } }