Skip to content
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.

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

PackageManager: Make lookup lazy again #2923

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Conversation

Geod24
Copy link
Member

@Geod24 Geod24 commented Jun 4, 2024

We want to avoid loading the whole cache whenever lookup is called, as most invocations of dub should result in a call to lookup, since dependency resolution is much rarer than building with an existing dub.selections.json.

Copy link

github-actions bot commented Jun 4, 2024

✅ PR OK, no changes in deprecations or warnings

Total deprecations: 0

Total warnings: 0

Build statistics:

 statistics (-before, +after)
 executable size=5259464 bin/dub
 rough build time=62s
Full build output
DUB version 1.37.0, built on May 11 2024
LDC - the LLVM D compiler (1.38.0):
  based on DMD v2.108.1 and LLVM 18.1.5
  built with LDC - the LLVM D compiler (1.38.0)
  Default target: x86_64-unknown-linux-gnu
  Host CPU: znver3
  http://dlang.org - http://wiki.dlang.org/LDC


  Registered Targets:
    aarch64     - AArch64 (little endian)
    aarch64_32  - AArch64 (little endian ILP32)
    aarch64_be  - AArch64 (big endian)
    amdgcn      - AMD GCN GPUs
    arm         - ARM
    arm64       - ARM64 (little endian)
    arm64_32    - ARM64 (little endian ILP32)
    armeb       - ARM (big endian)
    avr         - Atmel AVR Microcontroller
    bpf         - BPF (host endian)
    bpfeb       - BPF (big endian)
    bpfel       - BPF (little endian)
    hexagon     - Hexagon
    lanai       - Lanai
    loongarch32 - 32-bit LoongArch
    loongarch64 - 64-bit LoongArch
    mips        - MIPS (32-bit big endian)
    mips64      - MIPS (64-bit big endian)
    mips64el    - MIPS (64-bit little endian)
    mipsel      - MIPS (32-bit little endian)
    msp430      - MSP430 [experimental]
    nvptx       - NVIDIA PTX 32-bit
    nvptx64     - NVIDIA PTX 64-bit
    ppc32       - PowerPC 32
    ppc32le     - PowerPC 32 LE
    ppc64       - PowerPC 64
    ppc64le     - PowerPC 64 LE
    r600        - AMD GPUs HD2XXX-HD6XXX
    riscv32     - 32-bit RISC-V
    riscv64     - 64-bit RISC-V
    sparc       - Sparc
    sparcel     - Sparc LE
    sparcv9     - Sparc V9
    spirv       - SPIR-V Logical
    spirv32     - SPIR-V 32-bit
    spirv64     - SPIR-V 64-bit
    systemz     - SystemZ
    thumb       - Thumb
    thumbeb     - Thumb (big endian)
    ve          - VE
    wasm32      - WebAssembly 32-bit
    wasm64      - WebAssembly 64-bit
    x86         - 32-bit X86: Pentium-Pro and above
    x86-64      - 64-bit X86: EM64T and AMD64
    xcore       - XCore
   Upgrading project in /home/runner/work/dub/dub/
    Starting Performing "release" build using /opt/hostedtoolcache/dc/ldc2-1.38.0/x64/ldc2-1.38.0-linux-x86_64/bin/ldc2 for x86_64.
    Building dub 1.38.0+commit.35.g21c910fd: building configuration [application]
     Linking dub
STAT:statistics (-before, +after)
STAT:executable size=5259464 bin/dub
STAT:rough build time=62s

Copy link
Member

@s-ludwig s-ludwig left a comment

Choose a reason for hiding this comment

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

Looks like this shouldn't interfere with anything. I'd only suggest to replace the two bools by a three-stage InitializationState enum. As a bonus, the conditional refresh and refreshLocal calls could then be replaced by call to an initialize(InitializationState) to make it a little less repetitive and semantically clearer.

@Geod24
Copy link
Member Author

Geod24 commented Jun 5, 2024

I'd only suggest to replace [...]

I'd love to get rid of refresh entirely, but the value is in making lookup lazy, so I went with this half solution.
I'm not personally too convinced it adds much, but I've made the requested change, as I don't think they substract either.

bool m_initialized;
enum InitializationState {
/// No `refresh*` function has been called
None,
Copy link
Member

@s-ludwig s-ludwig Jun 5, 2024

Choose a reason for hiding this comment

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

Maybe a nit pick, but both style guides (D/vibe.d) want this to be camelCase.

edit: I didn't realize this is protected and PackageManager is now meant to be derived from. In this case we need to be a bit more careful here to not introduce too much surface for later breaking changes. Maybe this should just be in a private block instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

Always found it pretty ugly, but it's the D style. Fixed.

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't realize this is protected and PackageManager is now meant to be derived from.

Note that the main use case for this is currently for unittesting.

We want to avoid loading the whole cache whenever lookup is called,
as most invocations of dub should result in a call to lookup,
since dependency resolution is much rarer than building with an
existing dub.selections.json.
@Geod24 Geod24 enabled auto-merge (rebase) June 5, 2024 09:56
@Geod24 Geod24 merged commit 0c64803 into dlang:master Jun 5, 2024
31 checks passed
@Geod24 Geod24 deleted the mlang/NoScan branch June 12, 2024 17:15
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.

3 participants