Skip to content

Commit

Permalink
Showing 5 changed files with 23 additions and 21 deletions.
3 changes: 1 addition & 2 deletions src/libstore/build/local-derivation-goal.cc
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
#include "worker-protocol.hh"
#include "topo-sort.hh"
#include "callback.hh"
#include "json-utils.hh"

#include <regex>
#include <queue>
@@ -56,8 +57,6 @@
#include <pwd.h>
#include <grp.h>

#include <nlohmann/json.hpp>

namespace nix {

void handleDiffHook(
2 changes: 1 addition & 1 deletion src/libstore/build/worker.cc
Original file line number Diff line number Diff line change
@@ -350,7 +350,7 @@ void Worker::waitForInput()
become `available'. Note that `available' (i.e., non-blocking)
includes EOF. */
std::vector<struct pollfd> pollStatus;
std::map <int, int> fdToPollStatus;
std::map<int, size_t> fdToPollStatus;
for (auto & i : children) {
for (auto & j : i.fds) {
pollStatus.push_back((struct pollfd) { .fd = j, .events = POLLIN });
21 changes: 21 additions & 0 deletions src/libutil/json-utils.hh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#pragma once

#include <nlohmann/json.hpp>

namespace nix {

const nlohmann::json * get(const nlohmann::json & map, const std::string & key)
{
auto i = map.find(key);
if (i == map.end()) return nullptr;
return &*i;
}

nlohmann::json * get(nlohmann::json & map, const std::string & key)
{
auto i = map.find(key);
if (i == map.end()) return nullptr;
return &*i;
}

}
15 changes: 0 additions & 15 deletions src/libutil/util.cc
Original file line number Diff line number Diff line change
@@ -1586,23 +1586,8 @@ std::string stripIndentation(std::string_view s)
}


const nlohmann::json * get(const nlohmann::json & map, const std::string & key)
{
auto i = map.find(key);
if (i == map.end()) return nullptr;
return &*i;
}

nlohmann::json * get(nlohmann::json & map, const std::string & key)
{
auto i = map.find(key);
if (i == map.end()) return nullptr;
return &*i;
}

//////////////////////////////////////////////////////////////////////


static Sync<std::pair<unsigned short, unsigned short>> windowSize{{0, 0}};


3 changes: 0 additions & 3 deletions src/libutil/util.hh
Original file line number Diff line number Diff line change
@@ -558,9 +558,6 @@ typename T::mapped_type * get(T & map, const typename T::key_type & key)
return &i->second;
}

const nlohmann::json * get(const nlohmann::json & map, const std::string & key);
nlohmann::json * get(nlohmann::json & map, const std::string & key);

/* Get a value for the specified key from an associate container, or a default value if the key isn't present. */
template <class T>
const typename T::mapped_type & getOr(T & map,

0 comments on commit 470e27c

Please sign in to comment.