colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce the number of allocations a bit

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-28 05:23:10 +01:00
parent 40913958a2
commit 9769671260
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/modules.nix
View File

@ -85,15 +85,15 @@ rec {
(pushDownProperties (getAttr name m.config))) (pushDownProperties (getAttr name m.config)))
) configs); ) configs);
nrOptions = count (m: isOption m.options) decls; nrOptions = count (m: isOption m.options) decls;
# Process mkMerge and mkIf properties.
defns2 = concatMap (m: defns' = concatMap (m:
optional (hasAttr name m.config) optionals (hasAttr name m.config)
{ inherit (m) file; config = getAttr name m.config; } (map (m': { inherit (m) file; value = m'; }) (dischargeProperties (getAttr name m.config)))
) configs; ) configs;
in in
if nrOptions == length decls then if nrOptions == length decls then
let opt = fixupOptionType loc' (mergeOptionDecls loc' decls); let opt = fixupOptionType loc' (mergeOptionDecls loc' decls);
in evalOptionValue loc' opt defns2 in evalOptionValue loc' opt defns'
else if nrOptions != 0 then else if nrOptions != 0 then
let let
firstOption = findFirst (m: isOption m.options) "" decls; firstOption = findFirst (m: isOption m.options) "" decls;
@ -129,13 +129,11 @@ rec {
/* Merge all the definitions of an option to produce the final /* Merge all the definitions of an option to produce the final
config value. */ config value. */
evalOptionValue = loc: opt: cfgs: evalOptionValue = loc: opt: defs:
let let
# Process mkMerge and mkIf properties.
defs' = concatMap (m: map (config: { inherit (m) file; inherit config; }) (dischargeProperties m.config)) cfgs;
# Process mkOverride properties, adding in the default # Process mkOverride properties, adding in the default
# value specified in the option declaration (if any). # value specified in the option declaration (if any).
defsFinal = filterOverrides (optional (opt ? default) ({ file = head opt.declarations; config = mkOptionDefault opt.default; }) ++ defs'); defsFinal = filterOverrides (optional (opt ? default) ({ file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs);
# Type-check the remaining definitions, and merge them if # Type-check the remaining definitions, and merge them if
# possible. # possible.
merged = merged =
@ -143,9 +141,9 @@ rec {
throw "The option `${showOption loc}' is used but not defined." throw "The option `${showOption loc}' is used but not defined."
else else
fold (def: res: fold (def: res:
if opt.type.check def.config then res if opt.type.check def.value then res
else throw "The option value `${showOption loc}' in `${def.file}' is not a ${opt.type.name}.") else throw "The option value `${showOption loc}' in `${def.file}' is not a ${opt.type.name}.")
(opt.type.merge (map (m: m.config) defsFinal)) defsFinal; (opt.type.merge (map (m: m.value) defsFinal)) defsFinal;
# Finally, apply the ‘apply’ function to the merged # Finally, apply the ‘apply’ function to the merged
# value. This allows options to yield a value computed # value. This allows options to yield a value computed
# from the definitions. # from the definitions.
@ -223,10 +221,10 @@ rec {
filterOverrides = defs: filterOverrides = defs:
let let
defaultPrio = 100; defaultPrio = 100;
getPrio = def: if def.config._type or "" == "override" then def.config.priority else defaultPrio; getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
min = x: y: if x < y then x else y; min = x: y: if x < y then x else y;
highestPrio = fold (def: prio: min (getPrio def) prio) 9999 defs; highestPrio = fold (def: prio: min (getPrio def) prio) 9999 defs;
strip = def: if def.config._type or "" == "override" then def // { config = def.config.content; } else def; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs; in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
/* Hack for backward compatibility: convert options of type /* Hack for backward compatibility: convert options of type