Skip to content

添加并行构建功能，添加依赖任务配置 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ahoo-Wang merged 8 commits into from
May 7, 2022
Merged

添加并行构建功能，添加依赖任务配置 #66

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
704734f
添加多少线程构建，添加WaitPre
Mar 11, 2022
b631dc0
单个任务内并行生成
XiaoHeitu Mar 13, 2022
724bf74
单任务多线程
Mar 13, 2022
c2a4da8
添加任务依赖
XiaoHeitu Mar 14, 2022
e65bb90
Merge branch '优化_多线程构建' of https://github.com/XiaoHeitu/SmartCode int…
XiaoHeitu Mar 14, 2022
96f10dc
提交
XiaoHeitu Mar 14, 2022
43eb0ad
完善任务依赖，移除单任务并行代码
Mar 15, 2022
f0cd498
为项目添加 AllowParallel 配置。当AllowParallel 为false 或者AllowParallel 不存在时，忽略D…
Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
提交
  • Loading branch information
@XiaoHeitu
XiaoHeitu committed Mar 14, 2022
commit 96f10dce0dcfafd53f0b16609ce2d075b010c44f
25 changes: 6 additions & 19 deletions src/SmartCode.Generator/GeneratorProjectBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,6 @@ public async Task Build()
var dataSource = _pluginManager.Resolve<IDataSource>(_project.DataSource.Name);
await dataSource.InitData();

//foreach (var buildKV in _project.BuildTasks)
//{
// _logger.LogInformation($"-------- BuildTask:{buildKV.Key} Start! ---------");
// var output = buildKV.Value.Output;
// var buildContext = new BuildContext
// {
// PluginManager = _pluginManager,
// Project = _project,
// DataSource = dataSource,
// BuildKey = buildKV.Key,
// Build = buildKV.Value,
// Output = output?.Copy()
// };
// await _pluginManager.Resolve<IBuildTask>(buildKV.Value.Type).Build(buildContext);
// _logger.LogInformation($"-------- BuildTask:{buildKV.Key} End! ---------");
//}
BuildContext[] contexts = _project.BuildTasks.Select(d => new BuildContext
{
PluginManager = _pluginManager,
Expand All @@ -57,21 +41,24 @@ public async Task Build()
}).ToArray();
foreach (var context in contexts)
{
context.DependOn = contexts.Where(d => d.Build.DependOn.Contains(d.BuildKey)).ToArray();
context.DependOn = contexts.Where(d => context.Build.DependOn != null && context.Build.DependOn.Contains(d.BuildKey)).ToArray();
}

countdown.Reset();
foreach (var context in contexts)
{
context.BuildTask = Task.Factory.StartNew(this.BuildTask, null, TaskCreationOptions.LongRunning);
context.BuildTask = Task.Factory.StartNew(this.BuildTask, context, TaskCreationOptions.LongRunning);
}

countdown.Signal();

await Task.WhenAll(contexts.Select(d => d.BuildTask).ToArray());
}
private async void BuildTask(object obj)
{
countdown.Wait();
var context = (BuildContext)obj;
_logger.LogInformation($"-------- BuildTask:{context.BuildKey} Wait! ---------");
countdown.Wait();
//�ȴ���������
if (context.DependOn != null)
{
Expand Down
1 change: 0 additions & 1 deletion src/SmartCode/BuildContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public void SetItem(string key, object item)
}

public IEnumerable<BuildContext> DependOn { get; set; }
public IEnumerable<BuildContext> Next { get; set; }
public Task BuildTask { get; set; }
}
}