Skip to content

Rename ConfigEntry to PackageConfigs and avoid GC allocation. #1384

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
dlang-bot merged 1 commit into from
Feb 14, 2018
Merged

Rename ConfigEntry to PackageConfigs and avoid GC allocation. #1384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions source/dub/dependencyresolver.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,22 @@ class DependencyResolver(CONFIGS, CONFIG) {
}
}

private static struct ConfigEntry
private static struct PackageConfigs
{
static struct Depender
{
TreeNode origin;
TreeNodes dependency;
}

// all possible configurations to test for this package
CONFIG[] allConfigs;

// determines whether this package has any dependencies, may be
// different from allConfigs.length > 0 after certain configurations
// have been filtered out
bool anyConfig;

Depender[] origins;
}

Expand All @@ -74,7 +80,7 @@ class DependencyResolver(CONFIGS, CONFIG) {
// find all possible configurations of each possible dependency
size_t[string] package_indices;
string[size_t] package_names;
ConfigEntry[] configs;
PackageConfigs[] configs;
bool[string] maybe_optional_deps;
bool[TreeNode] visited;

Expand All @@ -89,7 +95,7 @@ class DependencyResolver(CONFIGS, CONFIG) {

if (ch.depType != DependencyType.required) maybe_optional_deps[ch.pack] = true;

ConfigEntry config;
PackageConfigs config;
if (auto pi = basepack in package_indices) {
pidx = *pi;
config = configs[*pi];
Expand All @@ -109,7 +115,7 @@ class DependencyResolver(CONFIGS, CONFIG) {
config.anyConfig = true;

// store package depending on this for better error messages
config.origins ~= ConfigEntry.Depender(parent, ch);
config.origins ~= PackageConfigs.Depender(parent, ch);

// eliminate configurations from which we know that they can't satisfy
// the uniquely defined root dependencies (==version or ~branch style dependencies)
Expand Down Expand Up @@ -157,7 +163,8 @@ class DependencyResolver(CONFIGS, CONFIG) {
// get the current config/version of the current dependency
sizediff_t childidx = package_indices[basepack];
auto child = configs[childidx];
if (child.allConfigs == [CONFIG.invalid]) {

if (child.allConfigs.length == 1 && child.allConfigs[0] == CONFIG.invalid) {
// ignore invalid optional dependencies
if (ch.depType != DependencyType.required)
continue;
Expand Down