aboutsummaryrefslogtreecommitdiff
path: root/src/libutil/json.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-07-26 17:21:46 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-07-26 17:29:10 +0200
commit57b95057311d4dafb948c78889693a98ec349460 (patch)
tree7757591822f2e1a7bc053fbb27badfa35c5aa5fe /src/libutil/json.cc
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.cc')
-rw-r--r--src/libutil/json.cc20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/libutil/json.cc b/src/libutil/json.cc
index b8b8ef9c8..813b25701 100644
--- a/src/libutil/json.cc
+++ b/src/libutil/json.cc
@@ -50,20 +50,22 @@ template<> void toJSON<std::nullptr_t>(std::ostream & str, const std::nullptr_t
JSONWriter::JSONWriter(std::ostream & str, bool indent)
: state(new JSONState(str, indent))
{
- state->stack.push_back(this);
+ state->stack++;
}
JSONWriter::JSONWriter(JSONState * state)
: state(state)
{
- state->stack.push_back(this);
+ state->stack++;
}
JSONWriter::~JSONWriter()
{
- assertActive();
- state->stack.pop_back();
- if (state->stack.empty()) delete state;
+ if (state) {
+ assertActive();
+ state->stack--;
+ if (state->stack == 0) delete state;
+ }
}
void JSONWriter::comma()
@@ -121,9 +123,11 @@ void JSONObject::open()
JSONObject::~JSONObject()
{
- state->depth--;
- if (state->indent && !first) indent();
- state->str << "}";
+ if (state) {
+ state->depth--;
+ if (state->indent && !first) indent();
+ state->str << "}";
+ }
}
void JSONObject::attr(const std::string & s)