about summary refs log tree commit diff
path: root/src/libutil/json.hh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-07-26T15·21+0200
committerEelco Dolstra <edolstra@gmail.com>2017-07-26T15·29+0200
commit57b95057311d4dafb948c78889693a98ec349460 (patch)
tree7757591822f2e1a7bc053fbb27badfa35c5aa5fe /src/libutil/json.hh
parent4c9ff89c261d84dcc4f88a79654daff2f4790e66 (diff)
nix search: Add a cache
The package list is now cached in
~/.cache/nix/package-search.json. This gives a substantial speedup to
"nix search" queries. For example (on an SSD):

First run: (no package search cache, cold page cache)

  $ time nix search blender
  Attribute name: nixpkgs.blender
  Package name: blender
  Version: 2.78c
  Description: 3D Creation/Animation/Publishing System

  real    0m6.516s

Second run: (package search cache populated)

  $ time nix search blender
  Attribute name: nixpkgs.blender
  Package name: blender
  Version: 2.78c
  Description: 3D Creation/Animation/Publishing System

  real    0m0.143s
Diffstat (limited to 'src/libutil/json.hh')
-rw-r--r--src/libutil/json.hh14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/libutil/json.hh b/src/libutil/json.hh
index 595e9bbe3491..02a39917fb5c 100644
--- a/src/libutil/json.hh
+++ b/src/libutil/json.hh
@@ -21,11 +21,11 @@ protected:
         std::ostream & str;
         bool indent;
         size_t depth = 0;
-        std::vector<JSONWriter *> stack;
+        size_t stack = 0;
         JSONState(std::ostream & str, bool indent) : str(str), indent(indent) { }
         ~JSONState()
         {
-            assert(stack.empty());
+            assert(stack == 0);
         }
     };
 
@@ -41,7 +41,7 @@ protected:
 
     void assertActive()
     {
-        assert(!state->stack.empty() && state->stack.back() == this);
+        assert(state->stack != 0);
     }
 
     void comma();
@@ -117,6 +117,14 @@ public:
         open();
     }
 
+    JSONObject(const JSONObject & obj) = delete;
+
+    JSONObject(JSONObject && obj)
+        : JSONWriter(obj.state)
+    {
+        obj.state = 0;
+    }
+
     ~JSONObject();
 
     template<typename T>