Cleanup
This commit is contained in:
		
							parent
							
								
									c8bb2371eb
								
							
						
					
					
						commit
						cb4320c1a0
					
				
					 2 changed files with 13 additions and 18 deletions
				
			
		|  | @ -261,14 +261,9 @@ EvalState::EvalState(const Strings & _searchPath) | |||
|     , sLine(symbols.create("line")) | ||||
|     , sColumn(symbols.create("column")) | ||||
|     , sFunctor(symbols.create("__functor")) | ||||
|     , repair(false) | ||||
|     , baseEnv(allocEnv(128)) | ||||
|     , staticBaseEnv(false, 0) | ||||
|     , baseEnvDispl(0) | ||||
| { | ||||
|     nrEnvs = nrValuesInEnvs = nrValues = nrListElems = 0; | ||||
|     nrAttrsets = nrAttrsInAttrsets = nrOpUpdates = nrOpUpdateValuesCopied = 0; | ||||
|     nrListConcats = nrPrimOpCalls = nrFunctionCalls = 0; | ||||
|     countCalls = getEnv("NIX_COUNT_CALLS", "0") != "0"; | ||||
| 
 | ||||
|     restricted = settings.get("restrict-eval", false); | ||||
|  |  | |||
|  | @ -74,7 +74,7 @@ public: | |||
| 
 | ||||
|     /* If set, force copying files to the Nix store even if they
 | ||||
|        already exist there. */ | ||||
|     bool repair; | ||||
|     bool repair = false; | ||||
| 
 | ||||
|     /* If set, don't allow access to files outside of the Nix search
 | ||||
|        path or to environment variables. */ | ||||
|  | @ -183,7 +183,7 @@ public: | |||
| 
 | ||||
| private: | ||||
| 
 | ||||
|     unsigned int baseEnvDispl; | ||||
|     unsigned int baseEnvDispl = 0; | ||||
| 
 | ||||
|     void createBaseEnv(); | ||||
| 
 | ||||
|  | @ -240,17 +240,17 @@ public: | |||
| 
 | ||||
| private: | ||||
| 
 | ||||
|     unsigned long nrEnvs; | ||||
|     unsigned long nrValuesInEnvs; | ||||
|     unsigned long nrValues; | ||||
|     unsigned long nrListElems; | ||||
|     unsigned long nrAttrsets; | ||||
|     unsigned long nrAttrsInAttrsets; | ||||
|     unsigned long nrOpUpdates; | ||||
|     unsigned long nrOpUpdateValuesCopied; | ||||
|     unsigned long nrListConcats; | ||||
|     unsigned long nrPrimOpCalls; | ||||
|     unsigned long nrFunctionCalls; | ||||
|     unsigned long nrEnvs = 0; | ||||
|     unsigned long nrValuesInEnvs = 0; | ||||
|     unsigned long nrValues = 0; | ||||
|     unsigned long nrListElems = 0; | ||||
|     unsigned long nrAttrsets = 0; | ||||
|     unsigned long nrAttrsInAttrsets = 0; | ||||
|     unsigned long nrOpUpdates = 0; | ||||
|     unsigned long nrOpUpdateValuesCopied = 0; | ||||
|     unsigned long nrListConcats = 0; | ||||
|     unsigned long nrPrimOpCalls = 0; | ||||
|     unsigned long nrFunctionCalls = 0; | ||||
| 
 | ||||
|     bool countCalls; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue