Skip to content

fix target jobs #6933#6937

Merged
waruqi merged 2 commits intodevfrom
jobgraph
Oct 17, 2025
Merged

fix target jobs #6933#6937
waruqi merged 2 commits intodevfrom
jobgraph

Conversation

@waruqi
Copy link
Member

@waruqi waruqi commented Oct 17, 2025

  • Before adding new features and new modules, please go to issues to submit the relevant feature description first.
  • Write good commit messages and use the same coding conventions as the rest of the project.
  • Please commit code to dev branch and we will merge into master branch in feature
  • Ensure your edited codes with four spaces instead of TAB.

  • 增加新特性和新模块之前,请先到issues提交相关特性说明,经过讨论评估确认后,再进行相应的代码提交,避免做无用工作。
  • 编写友好可读的提交信息,并使用与工程代码相同的代码规范,代码请用4个空格字符代替tab缩进。
  • 请提交代码到dev分支,如果通过,我们会在特定时间合并到master分支上。
  • 为了规范化提交日志的格式,commit消息,不要用中文,请用英文描述。

@waruqi waruqi added this to the v3.0.5 milestone Oct 17, 2025
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @waruqi, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces significant improvements to Xmake's build job scheduling, particularly for custom build scripts. By transitioning from batch-based job processing to individual job creation for each source file, the changes aim to unlock greater parallelism and optimize build times for projects utilizing on_build_file and scriptcmd_file functionalities. The refactoring ensures that the build system can leverage available resources more efficiently by distributing work at a finer granularity.

Highlights

  • Enhanced Parallelism for Custom Build Scripts: The jobgraph scheduling logic has been refactored to create individual jobs for each source file when custom on_build_file scripts are executed. Previously, a single job processed a batch of files, limiting parallel execution at the file level.
  • Improved scriptcmd_file Execution: Similar to on_build_file, when scriptcmd_file is used to execute build commands (rather than just generating them), the system now adds a separate job for each source file. This allows for finer-grained parallel processing of individual files.
  • Granular Job Naming: The naming convention for jobs added to the jobgraph has been updated to include the specific source file being processed. This provides better traceability and clarity within the build process.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors the build process to enable parallel execution of file-based jobs. By creating individual jobs for each source file instead of a single job for a batch, it allows the build system to leverage more parallelism, which should improve build times. The changes in both on_build_file and on_buildcmd_file handlers are consistent and correct. I have one minor suggestion to improve code maintainability by reducing some code duplication.

Comment on lines +519 to +539
if buildcmds then
-- only generate cmds and do not run them, use cases: e.g. project generator
if buildcmds then
local jobname = string.format("%s/%s", job_prefix, scriptcmd_file_name)
jobgraph:add(jobname, function (index, total, opt)
local sourcekind = sourcebatch.sourcekind
for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
scriptcmd_file(target, buildcmds, sourcefile, {progress = opt.progress, sourcekind = sourcekind})
end
else
local sourcekind = sourcebatch.sourcekind
for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
end)
else
-- fall back to using batchcmd to process sourcefiles in parallel
local sourcekind = sourcebatch.sourcekind
for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
local jobname = string.format("%s/%s/%s", job_prefix, scriptcmd_file_name, sourcefile)
jobgraph:add(jobname, function (index, total, opt)
local batchcmds_ = batchcmds.new({target = target})
scriptcmd_file(target, batchcmds_, sourcefile, {progress = opt.progress, sourcekind = sourcekind, distcc = distcc})
batchcmds_:runcmds({changed = target:is_rebuilt(), dryrun = option.get("dry-run")})
end
end)
end
end)
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The sourcekind variable is initialized in both branches of the if buildcmds statement (on lines 523 and 530). To avoid this duplication, you can define sourcekind once before this if block.

            local sourcekind = sourcebatch.sourcekind
            if buildcmds then
                -- only generate cmds and do not run them, use cases: e.g. project generator
                local jobname = string.format("%s/%s", job_prefix, scriptcmd_file_name)
                jobgraph:add(jobname, function (index, total, opt)
                    for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
                        scriptcmd_file(target, buildcmds, sourcefile, {progress = opt.progress, sourcekind = sourcekind})
                    end
                end)
            else
                -- fall back to using batchcmd to process sourcefiles in parallel
                for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
                    local jobname = string.format("%s/%s/%s", job_prefix, scriptcmd_file_name, sourcefile)
                    jobgraph:add(jobname, function (index, total, opt)
                        local batchcmds_ = batchcmds.new({target = target})
                        scriptcmd_file(target, batchcmds_, sourcefile, {progress = opt.progress, sourcekind = sourcekind, distcc = distcc})
                        batchcmds_:runcmds({changed = target:is_rebuilt(), dryrun = option.get("dry-run")})
                    end)
                end
            end

@waruqi waruqi merged commit 59e6cf0 into dev Oct 17, 2025
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant