Merged R9433

src/libexpr/primops.cc

@@ -903,36 +903,37 @@ static Expr prim_hasAttr(EvalState & state, const ATermVector & args)
 }
 
 
-/* takes 
+/* Builds an attribute set from a list specifying (name, value)
- * param: list of { attr="attr"; value=value } 
+   pairs.  To be precise, a list [{name = "name1"; value = value1;}
- * returns an attribute set
+   ... {name = "nameN"; value = valueN;}] is transformed to {name1 =
- * */
+   value1; ... nameN = valueN;}. */
 static Expr prim_listToAttrs(EvalState & state, const ATermVector & args)
 {
-  try {
+    try {
-    ATermMap res = ATermMap();
+        ATermMap res = ATermMap();
+        ATermList list;
+        list = evalList(state, args[0]);
+        for (ATermIterator i(list); i; ++i){
+            // *i should now contain a pointer to the list item expression
+            ATermList attrs;
+            Expr evaledExpr = evalExpr(state, *i);
+            if (matchAttrs(evaledExpr, attrs)){
+                Expr e = evalExpr(state, makeSelect(evaledExpr, toATerm("name")));
+                string attr = evalStringNoCtx(state,e);
+                Expr r = makeSelect(evaledExpr, toATerm("value"));
+                res.set(toATerm(attr), makeAttrRHS(r, makeNoPos()));
+            }
+            else
+                throw TypeError(format("list element in `listToAttrs' is %s, expected a set { name = \"<name>\"; value = <value>; }")
+                    % showType(evaledExpr));
+        }
     
-    ATermList list;
+        return makeAttrs(res);
-    list = evalList(state, args[0]);
+    
-    for (ATermIterator i(list); i; ++i){
+    } catch (Error & e) {
-      // *i should now contain a pointer to the list item expression
+        e.addPrefix(format("in `listToAttrs':\n"));
-      ATermList attrs;
+        throw;
-      Expr evaledExpr = evalExpr(state, *i);
+    }
-      if (matchAttrs(evaledExpr, attrs)){
-        Expr e = evalExpr(state, makeSelect(evaledExpr, toATerm("attr")));
-        string attr = evalStringNoCtx(state,e);
-        Expr r = makeSelect(evaledExpr, toATerm("value"));
-        res.set(toATerm(attr), makeAttrRHS(r, makeNoPos()));
-      }
-      else {
-        throw EvalError(format("passed list item is a %s (value: %s). Set { attr=\"name\"; value=nix expr; } expected.") % showType(evaledExpr) % showValue(evaledExpr)); 
-      }
-    } // for
-    return makeAttrs(res);
-  } catch (Error & e) {
-    e.addPrefix(format("in `listToAttrs':\n"));
-    throw;
-  }
 }
 
 static Expr prim_removeAttrs(EvalState & state, const ATermVector & args)

src/libstore/gc.cc

@@ -456,12 +456,13 @@ void LocalStore::collectGarbage(GCAction action, const PathSet & pathsToDelete,
 
     /* Find the roots.  Since we've grabbed the GC lock, the set of
        permanent roots cannot increase now. */
-    Roots rootMap = ignoreLiveness ? Roots() : nix::findRoots(true);					//TODO Also find state roots? TODO include sharing of state.
+    Roots rootMap = ignoreLiveness ? Roots() : nix::findRoots(true);					//TODO Also find state roots --> nah ? TODO include sharing of state.
 
     PathSet roots;
     for (Roots::iterator i = rootMap.begin(); i != rootMap.end(); ++i)
         roots.insert(i->second);
         
+
     /* Add additional roots returned by the program specified by the
        NIX_ROOT_FINDER environment variable.  This is typically used
        to add running programs to the set of roots (to prevent them
@@ -479,7 +480,7 @@ void LocalStore::collectGarbage(GCAction action, const PathSet & pathsToDelete,
     PathSet livePaths;
     for (PathSet::const_iterator i = roots.begin(); i != roots.end(); ++i){
     	printMsg(lvlError, format("CHECK '%1%'") % *i);
-        computeFSClosure(canonPath(*i), livePaths, true, false, 0);							//TODO !!!!!!!!!!!!!!!!!!!!!!!!!!! WE (MAY) ALSO NEED TO DELETE STATE??
+        computeFSClosure(canonPath(*i), livePaths, true, false, 0);							//TODO !!!!!!!!!! ALSO STATEPATHS TRUE???
     }
 	
 
@@ -487,16 +488,37 @@ void LocalStore::collectGarbage(GCAction action, const PathSet & pathsToDelete,
         for (PathSet::iterator i = livePaths.begin();
              i != livePaths.end(); ++i)
         {
-            printMsg(lvlError, format("CHECK2 '%1%'") % *i);
+        	if (store->isStateComponent(*i)){
-            /* Note that the deriver need not be valid (e.g., if we
+        		printMsg(lvlError, format("CHECK-STATE-STORE '%1%'") % *i);
+        		//we select ALL state Derivations here
+        		PathSet derivers = store->queryDerivers(*i, "*", "*");
+        		
+        		for (PathSet::const_iterator j = derivers.begin(); j != derivers.end(); ++j)
+					// We send each drv to computeFSClosure
+        			if (*j != "" && store->isValidPath(*j))
+                		computeFSClosure(*j, livePaths, true, false, 0);					//TODO !!!!!!!!!! ALSO STATEPATHS TRUE???
+        	}
+			else if (store->isValidPath(*i)){
+				printMsg(lvlError, format("CHECK-STORE '%1%'") % *i);
+            	Path deriver = store->queryDeriver(*i);
+            	printMsg(lvlError, format("CHECK-STORE DRV '%1%'") % deriver);
+				
+               /* Note that the deriver need not be valid (e.g., if we
                previously ran the collector with `gcKeepDerivations'
                turned off). */
-            Path deriver = store->queryDeriver(*i);
+				if (deriver != "" && store->isValidPath(deriver))
-            if (deriver != "" && store->isValidPath(deriver))
+                	computeFSClosure(deriver, livePaths, true, false, 0);					//TODO !!!!!!!!!! ALSO STATEPATHS TRUE???
-                computeFSClosure(deriver, livePaths, true, false, 0);							//TODO !!!!!!!!!!!!!!!!!!!!!!!!!!! WE (MAY) ALSO NEED TO KEEP STATE
+            }
+			
+			//else if (store->isValidStatePath(*i)){
+			            
+			else 
+				throw Error(format("path `%1%' is not a valid state/store path") % *i);    
         }
     }
     
+    printMsg(lvlError, format("STAGE X"));
+
     if (gcKeepOutputs) {
         /* Hmz, identical to storePathRequisites in nix-store. */
         for (PathSet::iterator i = livePaths.begin();
@@ -619,7 +641,7 @@ void LocalStore::collectGarbage(GCAction action, const PathSet & pathsToDelete,
             /* Okay, it's safe to delete. */
             try {
                 unsigned long long freed;
-                deleteFromStore(*i, freed);
+                //deleteFromStore(*i, freed);											//TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PUT BACK ON
                 bytesFreed += freed;
             } catch (PathInUse & e) {
                 printMsg(lvlError, format("warning: %1%") % e.msg());

src/libstore/local-store.cc

@@ -745,9 +745,18 @@ static Path queryDeriver(const Transaction & txn, const Path & storePath)
     
     bool b = nixDB.queryString(txn, dbDerivers, storePath, deriver);
     
-    Derivation drv = derivationFromPathTxn(txn, deriver);		
+    /* Note that the deriver need not be valid (e.g., if we
-    if (isStateDrv(drv))
+       previously ran the garbage collector with `gcKeepDerivations'
-    	throw Error(format("This deriver `%1%' is a state deriver, u should use queryDerivers instead of queryDeriver") % deriver);
+       turned off). */ 
+    if(deriver == ""){
+    	printMsg(lvlTalkative, format("WARNING: Path '%1%' has no deriver anymore") % storePath);
+    	return "";
+    }
+    
+    //TODO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    //Derivation drv = derivationFromPathTxn(txn, deriver);		//We cant do this (at this point) since the drv might not exist ....
+    //if (isStateDrv(drv))
+    //	throw Error(format("This deriver `%1%' is a state deriver, u should use queryDerivers instead of queryDeriver") % deriver);
     	    
     if (b)
         return deriver;
@@ -876,9 +885,9 @@ Hash LocalStore::queryPathHash(const Path & path)
     return queryHash(noTxn, path);
 }
 
-Path queryStatePathDrvTxn(const Transaction & txn, const Path & statePath)
+Path queryStatePathDrvTxn(const Transaction & txn, const Path & statePath)		//TODO !!!!!!!!!!!!!!!!!!!!!! A STATEPATH CAN HAVE MORE THEN JUST ONE DRV!!!!!!!!!!!!!!!!!!!!!!!
-{
+{																				//SOLUTION: make dbValidStatePaths :: statepath --> storepath
-	string s;
+	string s;																	//query includes username and identifier ....??
     nixDB.queryString(txn, dbValidStatePaths, statePath, s);
     return s;
 }

src/libutil/util.cc

@@ -371,9 +371,8 @@ void writeStringToFile(const Path & path, const string & s)
 
 
 LogType logType = ltPretty;
-Verbosity verbosity = lvlInfo;
+Verbosity verbosity = lvlInfo;			//Default
-//Verbosity verbosity = lvlDebug;
+//Verbosity verbosity = lvlVomit;		//Debugging
-//Verbosity verbosity = lvlVomit;
 
 static int nestingLevel = 0;